From b073108701ee64eb8e0417d7520dd573c05c0e32 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Mon, 31 Oct 2016 14:59:48 +0300
Subject: [PATCH] ui: fix "Tip of the Day" dialog scaling under non-retina
 HiDPI

---
 .../platform-impl/src/com/intellij/ide/util/TipPanel.java   | 3 ++-
 .../platform-impl/src/com/intellij/ide/util/TipUIUtil.java  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
index b2221f632a89..cda9375bb82c 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
@@ -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() {
diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java b/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
index 7af4f3735f61..ba6db4bfa33d 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
@@ -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) {