Merge lp:~aacid/unity-2d/unity-2d_panel_style_split into lp:unity-2d

[Albert Astals Cid]

Split panelstyle into panelstyle and panalpalettemanager so you can have different palettes per panel

[Michał Sawicz (saviq)]

review: Approve

[lp:~aacid/unity-2d/unity-2d_panel_style_split]

945. By Albert Astals Cid on 2012-03-06

Merge lp:unity-2d

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-03-05 16:38:47 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-03-06 15:27:19 +0000
@@ -70,6 +70,7 @@
     indicatorswidget.cpp
     panelapplet.cpp
     panelstyle.cpp
+    panelpalettemanager.cpp
     percentcoder.cpp
     windowsintersectmonitor.cpp
     abstractdbusservicemonitor.cpp

=== added file 'libunity-2d-private/src/panelpalettemanager.cpp'
--- libunity-2d-private/src/panelpalettemanager.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelpalettemanager.cpp	2012-03-06 15:27:19 +0000
@@ -0,0 +1,87 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "panelpalettemanager.h"
+
+// libunity-2d
+#include <cairoutils.h>
+#include <dashclient.h>
+#include <hudclient.h>
+#include <panelstyle.h>
+#include <unity2dpanel.h>
+
+// Qt
+#include <QBrush>
+#include <QPalette>
+
+// GTK
+#include <gtk/gtk.h>
+
+namespace Unity2d
+{
+
+static void onThemeChanged(GObject*, GParamSpec*, gpointer data)
+{
+    PanelPaletteManager* priv = reinterpret_cast<PanelPaletteManager*>(data);
+    priv->updatePalette();
+}
+
+PanelPaletteManager::PanelPaletteManager(Unity2dPanel* panel)
+ : m_panel(panel)
+{
+    connect(DashClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(updatePalette()));
+    connect(HUDClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(updatePalette()));
+
+    m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name", G_CALLBACK(onThemeChanged), this);
+    updatePalette();
+}
+
+static QBrush generateBackgroundBrush()
+{
+    QImage image(100, 24, QImage::Format_ARGB32_Premultiplied); // FIXME: Hardcoded
+    image.fill(Qt::transparent);
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(&image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+    GtkStyleContext* context = PanelStyle::instance()->styleContext();
+    gtk_render_background(context, cr.data(), 0, 0, image.width(), image.height());
+    gtk_render_frame(context, cr.data(), 0, 0, image.width(), image.height());
+    return QBrush(image);
+}
+
+void PanelPaletteManager::updatePalette()
+{
+    GtkStyleContext* context = PanelStyle::instance()->styleContext();
+    gtk_style_context_invalidate(context);
+
+    // Without this line, it seems the GtkStyleContext is not correctly
+    // initialized and we get some uninitialized pixels in the background
+    // brush.
+    gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, NULL);
+
+    QPalette pal;
+    if (DashClient::instance()->active() || HUDClient::instance()->active()) {
+        pal.setBrush(QPalette::Window, QColor(0, 0, 0, 168));
+    } else {
+        pal.setBrush(QPalette::Window, generateBackgroundBrush());
+    }
+    m_panel->setPalette(pal);
+}
+
+} // namespace Unity2d
+
+#include "panelpalettemanager.moc"
\ No newline at end of file

=== added file 'libunity-2d-private/src/panelpalettemanager.h'
--- libunity-2d-private/src/panelpalettemanager.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/panelpalettemanager.h	2012-03-06 15:27:19 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PANELPALETTEMANAGER_H
+#define PANELPALETTEMANAGER_H
+
+// Local
+class Unity2dPanel;
+
+// libunity-2d
+#include <gconnector.h>
+
+// Qt
+#include <QObject>
+
+namespace Unity2d
+{
+
+class PanelPaletteManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit PanelPaletteManager(Unity2dPanel* panel);
+
+public Q_SLOTS:
+    void updatePalette();
+
+private:
+    Q_DISABLE_COPY(PanelPaletteManager)
+
+    Unity2dPanel* m_panel;
+    GConnector m_gConnector;
+};
+
+} // namespace Unity2d
+
+#endif // PANELPALETTEMANAGER_H

=== modified file 'libunity-2d-private/src/panelstyle.cpp'
--- libunity-2d-private/src/panelstyle.cpp	2012-03-05 16:38:47 +0000
+++ libunity-2d-private/src/panelstyle.cpp	2012-03-06 15:27:19 +0000
@@ -22,12 +22,9 @@
 #include "panelstyle.h"
 
 // libunity-2d
-#include <cairoutils.h>
 #include <debug_p.h>
 #include <gconnector.h>
 #include <gscopedpointer.h>
-#include <dashclient.h>
-#include <hudclient.h>
 
 // Qt
 #include <QApplication>
@@ -51,42 +48,15 @@
     static void onThemeChanged(GObject*, GParamSpec*, gpointer data)
     {
         PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
-        priv->updatePalette();
+        priv->updateTheme();
     }
 
-    void updatePalette()
+    void updateTheme()
     {
         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);
-
-        // Without this line, it seems the GtkStyleContext is not correctly
-        // initialized and we get some uninitialized pixels in the background
-        // brush.
-        gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, NULL);
-
-        QPalette pal;
-        if (DashClient::instance()->active() || HUDClient::instance()->active()) {
-            pal.setBrush(QPalette::Window, QColor(0, 0, 0, 168));
-        } else {
-            pal.setBrush(QPalette::Window, generateBackgroundBrush());
-        }
-        QApplication::setPalette(pal);
-    }
-
-    QBrush generateBackgroundBrush()
-    {
-        QImage image(100, 24, QImage::Format_ARGB32_Premultiplied); // FIXME: Hardcoded
-        image.fill(Qt::transparent);
-        CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(&image));
-        CairoUtils::Pointer cr(cairo_create(surface.data()));
-        gtk_render_background(m_styleContext.data(), cr.data(), 0, 0, image.width(), image.height());
-        gtk_render_frame(m_styleContext.data(), cr.data(), 0, 0, image.width(), image.height());
-        return QBrush(image);
     }
 
     QPixmap windowButtonPixmapFromWMTheme(PanelStyle::WindowButtonType type, PanelStyle::WindowButtonState state)
@@ -161,7 +131,7 @@
     }
 };
 
-PanelStyle::PanelStyle(QObject* parent)
+PanelStyle::PanelStyle()
 : d(new PanelStylePrivate)
 {
     d->q = this;
@@ -180,9 +150,7 @@
     d->m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name",
         G_CALLBACK(PanelStylePrivate::onThemeChanged), d);
 
-    QObject::connect(DashClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(onDashActiveChanged(bool)));
-    QObject::connect(HUDClient::instance(), SIGNAL(activeChanged(bool)), this, SLOT(onDashActiveChanged(bool)));
-    d->updatePalette();
+    d->updateTheme();
 }
 
 PanelStyle::~PanelStyle()
@@ -212,10 +180,3 @@
         return d->genericWindowButtonPixmap(type, state);
     }
 }
-
-void PanelStyle::onDashActiveChanged(bool active)
-{
-    d->updatePalette();
-}
-
-#include "panelstyle.moc"

=== modified file 'libunity-2d-private/src/panelstyle.h'
--- libunity-2d-private/src/panelstyle.h	2012-02-12 15:12:46 +0000
+++ libunity-2d-private/src/panelstyle.h	2012-03-06 15:27:19 +0000
@@ -32,17 +32,12 @@
 
 class PanelStylePrivate;
 /**
- * Provides easy access to panel style context and track platform theme to
- * ensure we have the correct background brush.
- *
- * FIXME: This class does not have a very clear focus and has side-effects
- * (background brush handling). It should be refactored.
+ * Provides easy access to panel style context and track platform theme.
  */
-class PanelStyle : public QObject
+class PanelStyle
 {
-    Q_OBJECT
 public:
-    PanelStyle(QObject* parent = 0);
+    PanelStyle();
     ~PanelStyle();
 
     enum WindowButtonType {
@@ -64,9 +59,6 @@
 
     QPixmap windowButtonPixmap(WindowButtonType, WindowButtonState);
 
-private Q_SLOTS:
-    void onDashActiveChanged(bool active);
-
 private:
     friend class PanelStylePrivate;
     // Use a pimpl to avoid the need for gtk includes here

=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2012-02-09 09:27:03 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2012-03-06 15:27:19 +0000
@@ -34,6 +34,7 @@
 #include <QX11Info>
 
 // unity-2d
+#include "panelpalettemanager.h"
 #include "screeninfo.h"
 
 static const int SLIDE_DURATION = 125;
@@ -116,6 +117,7 @@
     } else {
         d->m_screenInfo = new ScreenInfo(this, this);
     }
+    new Unity2d::PanelPaletteManager(this);
 
     setAttribute(Qt::WA_X11NetWmWindowTypeDock);
     setAttribute(Qt::WA_Hover);