forked from dorkbox/SystemTray
WIP windows menu scaling
This commit is contained in:
parent
cd51b756dd
commit
430309a3f9
@ -68,8 +68,8 @@ class ImageUtils {
|
|||||||
|
|
||||||
public static
|
public static
|
||||||
void determineIconSize() {
|
void determineIconSize() {
|
||||||
int trayScalingFactor = 0;
|
double trayScalingFactor = 0;
|
||||||
int menuScalingFactor = 0;
|
double menuScalingFactor = 0;
|
||||||
|
|
||||||
if (SystemTray.AUTO_TRAY_SIZE) {
|
if (SystemTray.AUTO_TRAY_SIZE) {
|
||||||
if (OS.isWindows()) {
|
if (OS.isWindows()) {
|
||||||
@ -138,7 +138,7 @@ class ImageUtils {
|
|||||||
// casting around for rounding/math stuff
|
// casting around for rounding/math stuff
|
||||||
// *2 because we want a 2x scale to be 64, not 32.
|
// *2 because we want a 2x scale to be 64, not 32.
|
||||||
trayScalingFactor = (int) (((double) dpiX) / ((double) 96)) * 2;
|
trayScalingFactor = (int) (((double) dpiX) / ((double) 96)) * 2;
|
||||||
menuScalingFactor = trayScalingFactor;
|
menuScalingFactor = (int) (((double) dpiX) / ((double) 96));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -276,13 +276,13 @@ class ImageUtils {
|
|||||||
|
|
||||||
// the DEFAULT scale is 16
|
// the DEFAULT scale is 16
|
||||||
if (trayScalingFactor > 1) {
|
if (trayScalingFactor > 1) {
|
||||||
TRAY_SIZE = SystemTray.DEFAULT_TRAY_SIZE * trayScalingFactor;
|
TRAY_SIZE = (int) (SystemTray.DEFAULT_TRAY_SIZE * trayScalingFactor);
|
||||||
} else {
|
} else {
|
||||||
TRAY_SIZE = SystemTray.DEFAULT_TRAY_SIZE;
|
TRAY_SIZE = SystemTray.DEFAULT_TRAY_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (menuScalingFactor > 1) {
|
if (menuScalingFactor > 1) {
|
||||||
ENTRY_SIZE = SystemTray.DEFAULT_MENU_SIZE * menuScalingFactor;
|
ENTRY_SIZE = (int) (SystemTray.DEFAULT_MENU_SIZE * menuScalingFactor);
|
||||||
} else {
|
} else {
|
||||||
ENTRY_SIZE = SystemTray.DEFAULT_MENU_SIZE;
|
ENTRY_SIZE = SystemTray.DEFAULT_MENU_SIZE;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user