Merge pull request #347 from keepassxreboot/feature/optimize-message-…

…widget Feature/optimize message widget
keepassxreboot · Feb 25, 2017 · 0f1c518 · 0f1c518
2 parents 1f6f7b6 + 9ba8883
commit 0f1c518
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 2 deletions.
diff --git a/share/icons/application/16x16/actions/message-close.png b/share/icons/application/16x16/actions/message-close.png
diff --git a/share/icons/application/22x22/actions/message-close.png b/share/icons/application/22x22/actions/message-close.png
diff --git a/share/icons/svg/message-close.svg b/share/icons/svg/message-close.svg
diff --git a/src/gui/KMessageWidget.cpp b/src/gui/KMessageWidget.cpp
@@ -20,6 +20,8 @@
  */
 #include "KMessageWidget.h"
 
+#include "core/FilePath.h"
+
 #include <QAction>
 #include <QEvent>
 #include <QGridLayout>
@@ -89,13 +91,19 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
     QAction *closeAction = new QAction(q);
     closeAction->setText(KMessageWidget::tr("&Close"));
     closeAction->setToolTip(KMessageWidget::tr("Close message"));
-    closeAction->setIcon(q->style()->standardIcon(QStyle::SP_DialogCloseButton));
+    closeAction->setIcon(FilePath::instance()->icon("actions", "message-close", false));
 
     QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(animatedHide()));
 
     closeButton = new QToolButton(content);
     closeButton->setAutoRaise(true);
     closeButton->setDefaultAction(closeAction);
+#ifdef Q_OS_MAC
+    closeButton->setStyleSheet("QToolButton { background: transparent;"
+                                   "border-radius: 2px; padding: 3px; }"
+                               "QToolButton::hover, QToolButton::focus {"
+                                   "border: 1px solid rgb(90, 200, 250); }");
+#endif
 
     q->setMessageType(KMessageWidget::Information);
 }
@@ -285,7 +293,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
     }
 
     // Colors
-    fg = palette().highlightedText().color();
+    fg = palette().light().color();
     bg0 = bg1.lighter(110);
     bg2 = bg1.darker(110);
     border = darkShade(bg1);
@@ -299,6 +307,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type)
         "border-radius: 5px;"
         "border: 1px solid %4;"
         "margin: %5px;"
+        "padding: 5px;"
         "}"
         ".QLabel { color: %6; }"
         ))