Merge lp:~agateau/unity-2d/themed-window-buttons into lp:unity-2d

[Aurélien Gâteau]

This branch gets the window button pixmaps from the active window manager theme instead of using the hardcoded Ambiance theme. It also provides a fallback in case the theme is not Ambiance or Radiance.

[lp:~agateau/unity-2d/themed-window-buttons]

700. By Aurélien Gâteau on 2011-07-28

Sync with unity-2d/4.0

Unmerged revisions

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-07-27 15:51:45 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-07-27 15:51:45 +0000
@@ -25,6 +25,7 @@
 // Local
 #include "croppedlabel.h"
 #include "menubarwidget.h"
+#include "panelstyle.h"
 #include "windowhelper.h"
 
 // Unity-2d
@@ -46,8 +47,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-static const char* METACITY_DIR = "/usr/share/themes/Ambiance/metacity-1";
-
 static const int WINDOW_BUTTONS_RIGHT_MARGIN = 4;
 
 static const int APPNAME_LABEL_LEFT_MARGIN = 6;
@@ -58,13 +57,11 @@
 class WindowButton : public QAbstractButton
 {
 public:
-    WindowButton(const QString& prefix, QWidget* parent = 0)
+    WindowButton(const PanelStyle::WindowButtonType& buttonType, QWidget* parent = 0)
     : QAbstractButton(parent)
-    , m_prefix(prefix)
-    , m_normalPix(loadPix("normal"))
-    , m_hoverPix(loadPix("prelight"))
-    , m_downPix(loadPix("pressed"))
+    , m_buttonType(buttonType)
     {
+        loadPixmaps();
         setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
         setAttribute(Qt::WA_Hover);
     }
@@ -75,6 +72,14 @@
     }
 
 protected:
+    bool event(QEvent* ev)
+    {
+        if (ev->type() == QEvent::PaletteChange) {
+            loadPixmaps();
+        }
+        return QAbstractButton::event(ev);
+    }
+
     void paintEvent(QPaintEvent*)
     {
         QPainter painter(this);
@@ -90,18 +95,17 @@
     }
 
 private:
-    QString m_prefix;
+    PanelStyle::WindowButtonType m_buttonType;
     QPixmap m_normalPix;
     QPixmap m_hoverPix;
     QPixmap m_downPix;
 
-    QPixmap loadPix(const QString& name)
+    void loadPixmaps()
     {
-        QString path = QString("%1/%2_focused_%3.png")
-            .arg(METACITY_DIR)
-            .arg(m_prefix)
-            .arg(name);
-        return QPixmap(path);
+        PanelStyle* style = PanelStyle::instance();
+        m_normalPix = style->windowButtonPixmap(m_buttonType, PanelStyle::NormalState);
+        m_hoverPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PrelightState);
+        m_downPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PressedState);
     }
 };
 
@@ -135,9 +139,9 @@
         QHBoxLayout* layout = new QHBoxLayout(m_windowButtonWidget);
         layout->setContentsMargins(0, 0, WINDOW_BUTTONS_RIGHT_MARGIN, 0);
         layout->setSpacing(0);
-        m_closeButton = new WindowButton("close");
-        m_minimizeButton = new WindowButton("minimize");
-        m_maximizeButton = new WindowButton("unmaximize");
+        m_closeButton = new WindowButton(PanelStyle::CloseWindowButton);
+        m_minimizeButton = new WindowButton(PanelStyle::MinimizeWindowButton);
+        m_maximizeButton = new WindowButton(PanelStyle::UnmaximizeWindowButton);
         layout->addWidget(m_closeButton);
         layout->addWidget(m_minimizeButton);
         layout->addWidget(m_maximizeButton);

=== modified file 'panel/applets/common/panelstyle.cpp'
--- panel/applets/common/panelstyle.cpp	2011-07-27 15:51:45 +0000
+++ panel/applets/common/panelstyle.cpp	2011-07-27 15:51:45 +0000
@@ -30,10 +30,13 @@
 // Qt
 #include <QApplication>
 #include <QPalette>
+#include <QStyle>
 
 // GTK
 #include <gtk/gtk.h>
 
+static const char* METACITY_THEME_DIR = "/usr/share/themes/%1/metacity-1";
+
 class PanelStylePrivate
 {
 public:
@@ -41,6 +44,8 @@
     GObjectScopedPointer<GtkStyleContext> m_styleContext;
     GConnector m_gConnector;
 
+    QString m_themeName;
+
     static void onThemeChanged(GObject*, GParamSpec*, gpointer data)
     {
         PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
@@ -49,6 +54,11 @@
 
     void updatePalette()
     {
+        gchar* themeName = 0;
+        g_object_get(gtk_settings_get_default(), "gtk-theme-name", &themeName, NULL);
+        m_themeName = QString::fromUtf8(themeName);
+        g_free(themeName);
+
         GtkStyleContext* context = m_styleContext.data();
         gtk_style_context_invalidate(context);
 
@@ -71,6 +81,71 @@
         gtk_render_background(m_styleContext.data(), cr.data(), 0, 0, image.width(), image.height());
         return QBrush(image);
     }
+
+    QPixmap windowButtonPixmapFromWMTheme(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
+    {
+        QString dir = QString(METACITY_THEME_DIR).arg(m_themeName);
+
+        QString typeString, stateString;
+        switch (type) {
+        case PanelStyle::CloseWindowButton:
+            typeString = "close";
+            break;
+        case PanelStyle::MinimizeWindowButton:
+            typeString = "minimize";
+            break;
+        case PanelStyle::UnmaximizeWindowButton:
+            typeString = "unmaximize";
+            break;
+        }
+
+        switch (state) {
+        case PanelStyle::NormalState:
+            stateString = "";
+            break;
+        case PanelStyle::PrelightState:
+            stateString = "_focused_prelight";
+            break;
+        case PanelStyle::PressedState:
+            stateString = "_focused_pressed";
+            break;
+        }
+
+        QString path = QString("%1/%2%3.png")
+            .arg(dir)
+            .arg(typeString)
+            .arg(stateString);
+        return QPixmap(path);
+    }
+
+    QPixmap genericWindowButtonPixmap(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
+    {
+        QStyle::StandardPixmap standardIcon;
+        switch (type) {
+        case PanelStyle::CloseWindowButton:
+            standardIcon = QStyle::SP_TitleBarCloseButton;
+            break;
+        case PanelStyle::MinimizeWindowButton:
+            standardIcon = QStyle::SP_TitleBarMinButton;
+            break;
+        case PanelStyle::UnmaximizeWindowButton:
+            standardIcon = QStyle::SP_TitleBarNormalButton;
+            break;
+        }
+
+        QIcon icon = QApplication::style()->standardIcon(standardIcon);
+        const int extent = 22;
+        switch (state) {
+        case PanelStyle::NormalState:
+            return icon.pixmap(extent);
+        case PanelStyle::PrelightState:
+            return icon.pixmap(extent, QIcon::Active);
+        case PanelStyle::PressedState:
+            return icon.pixmap(extent, QIcon::Active, QIcon::On);
+        }
+        // Silence compiler
+        return QPixmap();
+    }
 };
 
 PanelStyle::PanelStyle(QObject* parent)
@@ -111,4 +186,16 @@
     return d->m_styleContext.data();
 }
 
+QPixmap PanelStyle::windowButtonPixmap(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
+{
+    // According to Unity PanelStyle code, the buttons of some WM themes do not
+    // match well with the panel background. So except for themes we provide,
+    // fallback to generic button pixmaps.
+    if (d->m_themeName == "Ambiance" || d->m_themeName == "Radiance") {
+        return d->windowButtonPixmapFromWMTheme(type, state);
+    } else {
+        return d->genericWindowButtonPixmap(type, state);
+    }
+}
+
 #include "panelstyle.moc"

=== modified file 'panel/applets/common/panelstyle.h'
--- panel/applets/common/panelstyle.h	2011-07-27 15:51:45 +0000
+++ panel/applets/common/panelstyle.h	2011-07-27 15:51:45 +0000
@@ -26,6 +26,8 @@
 // Qt
 #include <QObject>
 
+class QPixmap;
+
 struct _GtkStyleContext;
 
 class PanelStylePrivate;
@@ -43,10 +45,24 @@
     PanelStyle(QObject* parent = 0);
     ~PanelStyle();
 
+    enum WindowButtonType {
+        CloseWindowButton,
+        MinimizeWindowButton,
+        UnmaximizeWindowButton
+    };
+
+    enum WindowButtonState {
+        NormalState,
+        PrelightState,
+        PressedState
+    };
+
     static PanelStyle* instance();
 
     struct _GtkStyleContext* styleContext() const;
 
+    QPixmap windowButtonPixmap(WindowButtonType, WindowButtonState);
+
 private:
     friend class PanelStylePrivate;
     // Use a pimpl to avoid the need for gtk includes here