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

1. Convert all insets and sizes into JBXXX at start

Browse Source 
2. JBXxxUIResource may not extend XxxUIResource, but UIResource. Fix instanceof checks
This commit is contained in:
Konstantin Bulenkov
2016-03-29 15:00:09 +02:00
parent aa66ea3a35
commit c0913f741e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+7 -8
View File
@@ -61,9 +61,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.EventListenerList;
import javax.swing.plaf.ColorUIResource;
import javax.swing.plaf.DimensionUIResource;
import javax.swing.plaf.FontUIResource;
import javax.swing.plaf.InsetsUIResource;
import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.DefaultMetalTheme;
import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.plaf.synth.Region;
@@ -538,19 +537,19 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
private static void patchHiDPI(UIDefaults defaults) {
Object prevScaleVal = defaults.get("hidpi.scaleFactor");
float prevScale = prevScaleVal != null ? (Float)prevScaleVal : 1f;
float prevScale = prevScaleVal != null ? (Float)prevScaleVal : JBUI.scale(1f);
if (prevScale == JBUI.scale(1f)) return;
if (prevScale == JBUI.scale(1f) && prevScaleVal != null) return;
List<String> myIntKeys = Arrays.asList("Tree.leftChildIndent",
"Tree.rightChildIndent");
for (Map.Entry<Object, Object> entry : defaults.entrySet()) {
Object value = entry.getValue();
String key = entry.getKey().toString();
if (value instanceof DimensionUIResource) {
entry.setValue(JBUI.size((DimensionUIResource)value).asUIResource());
} else if (value instanceof InsetsUIResource) {
entry.setValue(JBUI.insets(((InsetsUIResource)value)).asUIResource());
if (value instanceof Dimension && value instanceof UIResource) {
entry.setValue(JBUI.size((Dimension)value).asUIResource());
} else if (value instanceof Insets && value instanceof UIResource) {
entry.setValue(JBUI.insets(((Insets)value)).asUIResource());
} else if (value instanceof Integer) {
if (key.endsWith(".maxGutterIconWidth") || myIntKeys.contains(key)) {
int normValue = (int)((Integer)value / prevScale);