From a1cca3d3765d74b281b2241f7129df8a0b6bb090 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Wed, 3 Feb 2016 12:33:54 +0300
Subject: [PATCH] IDEA-149210 Rework IDE notifications

---
 .../impl/ui/NotificationsUtil.java            | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
index 1c513a8a74fe..97478d31b083 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.notification.impl.ui;
 
+import com.intellij.ide.ui.UISettings;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.diagnostic.Logger;
@@ -85,12 +86,12 @@ public class NotificationsUtil {
 
   @NotNull
   public static String buildHtml(@Nullable String title,
-                                  @Nullable String subtitle,
-                                  @Nullable String content,
-                                  @Nullable String style,
-                                  @Nullable String titleColor,
-                                  @Nullable String contentColor,
-                                  @Nullable String contentStyle) {
+                                 @Nullable String subtitle,
+                                 @Nullable String content,
+                                 @Nullable String style,
+                                 @Nullable String titleColor,
+                                 @Nullable String contentColor,
+                                 @Nullable String contentStyle) {
     if (StringUtil.isEmpty(title) && !StringUtil.isEmpty(subtitle)) {
       title = subtitle;
       subtitle = null;
@@ -121,8 +122,18 @@ public class NotificationsUtil {
 
   @Nullable
   public static String getFontStyle() {
-    Pair<String, Integer> systemFontData = UIUtil.getSystemFontData();
-    return systemFontData == null ? null : "font-family:" + systemFontData.first + ";";
+    String fontName = null;
+    UISettings uiSettings = UISettings.getInstance();
+    if (uiSettings.OVERRIDE_NONIDEA_LAF_FONTS) {
+      fontName = uiSettings.FONT_FACE;
+    }
+    else {
+      Pair<String, Integer> systemFontData = UIUtil.getSystemFontData();
+      if (systemFontData != null) {
+        fontName = systemFontData.first;
+      }
+    }
+    return StringUtil.isEmpty(fontName) ? null : "font-family:" + fontName + ";";
   }
 
   @Nullable
@@ -151,10 +162,13 @@ public class NotificationsUtil {
   @NotNull
   public static MessageType getMessageType(@NotNull Notification notification) {
     switch (notification.getType()) {
-      case WARNING: return MessageType.WARNING;
-      case ERROR: return MessageType.ERROR;
+      case WARNING:
+        return MessageType.WARNING;
+      case ERROR:
+        return MessageType.ERROR;
       case INFORMATION:
-      default: return MessageType.INFO;
+      default:
+        return MessageType.INFO;
     }
   }