Skip to content

8326428: [Linux] UI scaling factor cannot be fractional when using KDE #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −12
Open

8326428: [Linux] UI scaling factor cannot be fractional when using KDE #1994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions modules/javafx.graphics/src/main/native-glass/gtk/glass_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,26 @@ jfloat getUIScale(GdkScreen* screen) {
if (OverrideUIScale > 0.0f) {
uiScale = OverrideUIScale;
} else {
char *scale_str = getenv("GDK_SCALE");
int gdk_scale = (scale_str == NULL) ? -1 : atoi(scale_str);
if (gdk_scale > 0) {
uiScale = (jfloat) gdk_scale;
} else {
uiScale = (jfloat) glass_settings_get_guint_opt("org.gnome.desktop.interface",
"scaling-factor", 0);
if (uiScale < 1) {
uiScale = (jfloat) (gdk_screen_get_resolution(screen) / DEFAULT_DPI);
}
if (uiScale < 1) {
uiScale = 1;
gdouble resolution = gdk_screen_get_resolution(screen);
uiScale = (jfloat) (resolution / DEFAULT_DPI);
if (int(resolution) == DEFAULT_DPI) {
// These legacy settings should only be consulted if the DPI is
// 96. They are global and affect all monitors and only allow
// integers. And they are not reliable when scaling is
// fractional. KDE in Ubuntu 22 sets GDK_SCALE to the floor of
// the actual scaling factor. KDE in Ubuntu 24 sets the
// Gnome "scaling-factor" instead. Both settings are obsolete in
// their respective toolkits and are not trustworthy.
char *scale_str = getenv("GDK_SCALE");
int gdk_scale = (scale_str == NULL) ? -1 : atoi(scale_str);
if (gdk_scale > 0) {
uiScale = (jfloat) gdk_scale;
} else {
guint gnome_scale = glass_settings_get_guint_opt("org.gnome.desktop.interface",
"scaling-factor", 0);
if (gnome_scale > 0) {
uiScale = (jfloat) gnome_scale;
}
}
}
}
Expand Down