From 58a9de5c7edfc7e1a102ca4e2583990b46755c65 Mon Sep 17 00:00:00 2001 From: Vassiliy Date: Tue, 18 Mar 2014 15:04:17 +0400 Subject: [PATCH] Tooltip is bigger than need in case of lack of space. UIUtil: CSS update (it works but has some mistakes) --- .../platform-impl/src/com/intellij/ui/BalloonImpl.java | 1 - platform/util/src/com/intellij/util/ui/UIUtil.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index 1897cd54dc7a..2c6eac9d9252 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -501,7 +501,6 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui { myComp.removeAll(); myLayeredPane.remove(myComp); - myForcedBounds = rec; createComponent(); } diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index 6903c6bcca14..740975eaeedf 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -1739,14 +1739,14 @@ public class UIUtil { public static String getCssFontDeclaration(final Font font, @Nullable Color fgColor, @Nullable Color linkColor, @Nullable String liImg) { URL resource = liImg != null ? SystemInfo.class.getResource(liImg) : null; - @NonNls String fontFamilyAndSize = "font-family:" + font.getFamily() + "; font-size:" + font.getSize() + ";"; + @NonNls String fontFamilyAndSize = "font-family:'" + font.getFamily() + "'; font-size:" + font.getSize() + "pt;"; @NonNls @Language("HTML") - String body = "body, div, td, p {" + fontFamilyAndSize + " " + (fgColor != null ? "color:" + ColorUtil.toHex(fgColor) : "") + "}"; + String body = "body, div, td, p {" + fontFamilyAndSize + " " + (fgColor != null ? "color:#" + ColorUtil.toHex(fgColor)+";" : "") + "}\n"; if (resource != null) { - body += "ul {list-style-image: " + resource.toExternalForm() + "}"; + body += "ul {list-style-image:url('" + resource.toExternalForm() + "');}\n"; } - @NonNls String link = linkColor != null ? "a {" + fontFamilyAndSize + " color:" + ColorUtil.toHex(linkColor) + "}" : ""; - return ""; + @NonNls String link = linkColor != null ? "a {" + fontFamilyAndSize + " color:#"+ColorUtil.toHex(linkColor) + ";}\n" : ""; + return ""; } public static boolean isWinLafOnVista() {