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

ui: fix "Tip of the Day" dialog scaling under non-retina HiDPI

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-10-31 19:43:46 +03:00
committed by Aleksey Pivovarov
parent 95757b8dc6
commit b073108701
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.JBDimension;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -83,7 +84,7 @@ public class TipPanel extends JPanel {
@Override
public Dimension getPreferredSize() {
return new Dimension(DEFAULT_WIDTH, DEFAULT_HEIGHT);
return new JBDimension(DEFAULT_WIDTH, DEFAULT_HEIGHT);
}
public void prevTip() {
platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
+3 -3
View File
@@ -21,7 +21,6 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.ui.LafManager;
import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.actionSystem.KeyboardShortcut;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.application.ApplicationInfo;
@@ -32,10 +31,10 @@ import com.intellij.openapi.keymap.Keymap;
import com.intellij.openapi.keymap.KeymapManager;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.keymap.impl.DefaultKeymap;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.ResourceUtil;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -144,12 +143,13 @@ public class TipUIUtil {
private static void updateImages(StringBuffer text, ClassLoader tipLoader) {
final boolean dark = UIUtil.isUnderDarcula();
final boolean retina = UIUtil.isRetina();
final boolean hidpi = retina || JBUI.scale(1f) > 1.5f;
// if (!dark && !retina) {
// return;
// }
String suffix = "";
if (retina) suffix += "@2x";
if (hidpi) suffix += "@2x";
if (dark) suffix += "_dark";
int index = text.indexOf("<img", 0);
while (index != -1) {