MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-149337 [follow-up] UI fonts are too big

Browse Source 
Additionally check if GTK LaF is supported, otherwise fallback to default behavior.
This commit is contained in:
Anton Tarasov
2016-03-25 16:22:00 +03:00
parent dc443718e5
commit 62d3e1df5e
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/ui/UIUtil.java
+19 -4
View File
@@ -30,6 +30,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.containers.JBTreeTraverser;
import com.intellij.util.containers.WeakHashMap;
import com.sun.java.swing.plaf.gtk.GTKLookAndFeel;
import org.intellij.lang.annotations.Language;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -2544,11 +2545,25 @@ public class UIUtil {
}
}
private static String systemLaFClassName;
public static String getSystemLookAndFeelClassName() {
// Force GTK LaF on Linux to let it retrieve system font settings
// with proper font scale based on Xft.dpi
return SystemInfo.isLinux ? "com.sun.java.swing.plaf.gtk.GTKLookAndFeel" :
UIManager.getSystemLookAndFeelClassName();
if (systemLaFClassName != null) {
return systemLaFClassName;
}
else if (SystemInfo.isLinux) {
// Normally, GTK LaF is considered "system" when:
// 1) Gnome session is run
// 2) gtk lib is available
// Here we weaken the requirements to only 2) and force GTK LaF
// installation in order to let it properly scale default font
// based on Xft.dpi value.
LookAndFeel laf = new GTKLookAndFeel();
if (laf.isSupportedLookAndFeel()) { // if gtk lib is available
return systemLaFClassName = laf.getClass().getName();
}
}
return systemLaFClassName = UIManager.getSystemLookAndFeelClassName();
}
public static void initDefaultLAF() {