Merge lp:~agateau/unity-2d/use-gtk-rendering into lp:unity-2d

[Aurélien Gâteau]

This branch uses GTK3 primitives to draw labels and active menubar item background instead of the Cairo code which was copied from unity-3d.

[Bob The Builder (bobthebuilder-deactivatedaccount)]

No proposals found for merge of lp:~agateau/unity-2d/unity-core into lp:unity-2d/4.0.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-27 11:59:05 +0000
+++ CMakeLists.txt	2011-07-27 15:51:26 +0000
@@ -29,6 +29,7 @@
 pkg_check_modules(GTK REQUIRED gtk+-3.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(WNCK REQUIRED libwnck-3.0)
+pkg_check_modules(QTGCONF REQUIRED libqtgconf)
 
 
 # GSettings schemas

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-07-27 11:59:05 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-07-27 15:51:26 +0000
@@ -31,6 +31,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GLIB_INCLUDE_DIRS}
+    ${GTK_INCLUDE_DIRS}
+    ${PANGO_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
     )
 
@@ -48,6 +50,8 @@
     ${QT_QTOPENGL_LIBRARIES}
     ${X11_LIBRARIES}
     ${GLIB_LDFLAGS}
+    ${GTK_LDFLAGS}
+    ${PANGO_LDFLAGS}
     ${WNCK_LDFLAGS}
     )
 

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 11:59:05 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-07-27 15:51:26 +0000
@@ -25,14 +25,59 @@
 
 // libunity-2d
 #include <debug_p.h>
+#include <gconnector.h>
+#include <gscopedpointer.h>
 #include <unity2ddebug.h>
 
 // Qt
+#include <QFont>
 #include <QWindowsStyle>
 
 // GTK
 #include <gtk/gtk.h>
-
+#include <pango/pango.h>
+
+///////////////////////////////
+class PlatformFontTracker
+{
+public:
+    PlatformFontTracker()
+    {
+        m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-font-name",
+            G_CALLBACK(PlatformFontTracker::onFontChanged), this);
+
+        updateFont();
+    }
+
+private:
+    void updateFont()
+    {
+        gchar* fontName = 0;
+        g_object_get(gtk_settings_get_default(), "gtk-font-name", &fontName, NULL);
+        GScopedPointer<PangoFontDescription, pango_font_description_free> fontDescription(
+            pango_font_description_from_string(fontName)
+            );
+        g_free(fontName);
+
+        int size = pango_font_description_get_size(fontDescription.data());
+
+        QFont font = QFont(
+            pango_font_description_get_family(fontDescription.data()),
+            size / PANGO_SCALE
+            );
+
+        QApplication::setFont(font);
+    }
+
+    static void onFontChanged(GObject*, GParamSpec*, PlatformFontTracker* obj)
+    {
+        obj->updateFont();
+    }
+
+    GConnector m_gConnector;
+};
+
+///////////////////////////////
 AbstractX11EventFilter::~AbstractX11EventFilter()
 {
     Unity2dApplication* application = Unity2dApplication::instance();
@@ -41,6 +86,7 @@
     }
 }
 
+///////////////////////////////
 static bool arrayContains(char** begin, char** end, const char* string)
 {
     for (char** ptr = begin; ptr != end; ++ptr) {
@@ -83,6 +129,7 @@
 
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)
 : QApplication(argc, argv)
+, m_platformFontTracker(new PlatformFontTracker)
 {
     /* Allow developers to run Unity 2D uninstalled by telling dconf-qt
        where to look for Unity 2D's schemas.
@@ -96,6 +143,7 @@
 Unity2dApplication::~Unity2dApplication()
 {
     qDeleteAll(m_x11EventFilters);
+    delete m_platformFontTracker;
 }
 
 Unity2dApplication* Unity2dApplication::instance()

=== modified file 'libunity-2d-private/src/unity2dapplication.h'
--- libunity-2d-private/src/unity2dapplication.h	2011-07-18 14:36:34 +0000
+++ libunity-2d-private/src/unity2dapplication.h	2011-07-27 15:51:26 +0000
@@ -27,6 +27,8 @@
 
 class Unity2dApplication;
 
+class PlatformFontTracker;
+
 class AbstractX11EventFilter
 {
 public:
@@ -65,6 +67,7 @@
 
 private:
     QList<AbstractX11EventFilter*> m_x11EventFilters;
+    PlatformFontTracker* m_platformFontTracker;
 };
 
 #endif // UNITY2DAPPLICATION_H

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-07-27 12:44:39 +0000
+++ panel/applets/CMakeLists.txt	2011-07-27 15:51:26 +0000
@@ -12,12 +12,14 @@
     appindicator/appindicatorapplet.cpp
     appindicator/sniitem.cpp
     appname/appnameapplet.cpp
+    appname/croppedlabel.cpp
     appname/menubarwidget.cpp
     appname/windowhelper.cpp
     common/applet.cpp
     common/indicatorentrywidget.cpp
     common/indicatorsmanager.cpp
     common/indicatorwidget.cpp
+    common/cairoutils.cpp
     common/panelstyle.cpp
     homebutton/homebuttonapplet.cpp
     homebutton/homebutton.cpp
@@ -41,6 +43,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/indicator
     ${CMAKE_CURRENT_SOURCE_DIR}/unitycore
     ${QTBAMF_INCLUDE_DIRS}
+    ${QTGCONF_INCLUDE_DIRS}
     ${DBUSMENUQT_INCLUDE_DIRS}
     ${GTK_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
@@ -58,6 +61,7 @@
     ${QT_QTCORE_LIBRARIES}
     ${DBUSMENUQT_LDFLAGS}
     ${QTBAMF_LDFLAGS}
+    ${QTGCONF_LDFLAGS}
     ${GTK_LDFLAGS}
     ${WNCK_LDFLAGS}
     ${X11_LIBRARIES}

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-07-27 11:59:05 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-07-27 15:51:26 +0000
@@ -23,6 +23,7 @@
 #include "appnameapplet.h"
 
 // Local
+#include "croppedlabel.h"
 #include "menubarwidget.h"
 #include "windowhelper.h"
 
@@ -49,9 +50,7 @@
 
 static const int WINDOW_BUTTONS_RIGHT_MARGIN = 4;
 
-static const int APPNAME_LABEL_LEFT_MARGIN = 12;
-
-static const int FADEOUT_WIDTH = 16;
+static const int APPNAME_LABEL_LEFT_MARGIN = 6;
 
 namespace Unity2d
 {
@@ -106,50 +105,6 @@
     }
 };
 
-/**
- * This label makes sure minimumSizeHint() is not set. This ensures the applet
- * does not get wider if a window title is very long
- */
-class CroppedLabel : public QLabel
-{
-public:
-    CroppedLabel(QWidget* parent = 0)
-    : QLabel(parent)
-    {}
-
-    QSize minimumSizeHint() const
-    {
-        return QWidget::minimumSizeHint();
-    }
-
-protected:
-    void paintEvent(QPaintEvent* event)
-    {
-        QImage image(width(), height(), QImage::Format_ARGB32_Premultiplied);
-        {
-            QPainter painter(&image);
-            painter.initFrom(this);
-            painter.setCompositionMode(QPainter::CompositionMode_Source);
-            painter.fillRect(rect(), Qt::transparent);
-
-            painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-            painter.drawText(contentsRect(), Qt::AlignLeft | Qt::AlignVCenter, text());
-
-            if (QLabel::minimumSizeHint().width() > contentsRect().width()) {
-                // Text does not fit, fade the end
-                painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-                QRect gradientRect(width() - FADEOUT_WIDTH, 0, FADEOUT_WIDTH, height());
-                QLinearGradient gradient(gradientRect.topLeft(), gradientRect.topRight());
-                gradient.setColorAt(0, Qt::white);
-                gradient.setColorAt(1, Qt::transparent);
-                painter.fillRect(gradientRect, gradient);
-            }
-        }
-        QPainter painter(this);
-        painter.drawImage(0, 0, image);
-    }
-};
-
 struct AppNameAppletPrivate
 {
     AppNameApplet* q;

=== added file 'panel/applets/appname/croppedlabel.cpp'
--- panel/applets/appname/croppedlabel.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/croppedlabel.cpp	2011-07-27 15:51:26 +0000
@@ -0,0 +1,140 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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/>.
+ */
+// Self
+#include "croppedlabel.h"
+
+// Local
+#include <cairoutils.h>
+#include <panelstyle.h>
+
+// unity-2d
+#include <debug_p.h>
+
+// libqtgconf
+#include <gconfitem-qml-wrapper.h>
+
+// Qt
+#include <QImage>
+#include <QPainter>
+
+// GTK
+#include <gtk/gtk.h>
+
+static const int FADEOUT_WIDTH = 30;
+
+static const char* WINDOW_TITLE_FONT_KEY = "/apps/metacity/general/titlebar_font";
+
+CroppedLabel::CroppedLabel(QWidget* parent)
+: QLabel(parent)
+{
+}
+
+QSize CroppedLabel::minimumSizeHint() const
+{
+    return QWidget::minimumSizeHint();
+}
+
+static void paintFadeoutGradient(QImage* image)
+{
+    QPainter painter(image);
+    painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    QRect gradientRect(image->width() - FADEOUT_WIDTH, 0, FADEOUT_WIDTH, image->height());
+    QLinearGradient gradient(gradientRect.topLeft(), gradientRect.topRight());
+    gradient.setColorAt(0, Qt::white);
+    gradient.setColorAt(1, Qt::transparent);
+    painter.fillRect(gradientRect, gradient);
+}
+
+static QString getWindowTitleFontName()
+{
+    GConfItemQmlWrapper client;
+    client.setKey(WINDOW_TITLE_FONT_KEY);
+    return client.getValue().toString();
+}
+
+void CroppedLabel::paintEvent(QPaintEvent* event)
+{
+    // Create an image filled with background brush (to avoid subpixel hinting
+    // artefacts around text)
+    QImage image(width(), height(), QImage::Format_ARGB32_Premultiplied);
+    {
+        QPainter painter(&image);
+        painter.initFrom(this);
+        painter.eraseRect(rect());
+    }
+
+    // Create a pango layout
+    GObjectScopedPointer<PangoContext> pangoContext(gdk_pango_context_get());
+    GObjectScopedPointer<PangoLayout> layout(pango_layout_new(pangoContext.data()));
+
+    // Set font
+    QByteArray fontName = getWindowTitleFontName().toUtf8();
+    PangoFontDescription* desc = pango_font_description_from_string(fontName.data());
+    pango_layout_set_font_description(layout.data(), desc);
+    pango_font_description_free(desc);
+
+    // Set text
+    QByteArray utf8Text = text().toUtf8();
+    pango_layout_set_text (layout.data(), utf8Text.data(), -1);
+
+    // Get text size
+    int textWidth = 0;
+    int textHeight = 0;
+    pango_layout_get_pixel_size(layout.data(), &textWidth, &textHeight);
+
+    // Draw text
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(&image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+
+    PanelStyle* style = PanelStyle::instance();
+    GtkStyleContext* style_context = style->styleContext();
+
+    gtk_style_context_save(style_context);
+
+    GtkWidgetPath* widget_path = gtk_widget_path_new();
+    gtk_widget_path_append_type(widget_path, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type(widget_path, GTK_TYPE_MENU_ITEM);
+    gtk_widget_path_iter_set_name(widget_path, -1 , "UnityPanelWidget");
+
+    gtk_style_context_set_path(style_context, widget_path);
+    gtk_style_context_add_class(style_context, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(style_context, GTK_STYLE_CLASS_MENUITEM);
+
+    gtk_render_layout(style_context, cr.data(),
+        contentsRect().left(),
+        contentsRect().top() + (height() - textHeight) / 2,
+        layout.data());
+
+    gtk_widget_path_free(widget_path);
+
+    gtk_style_context_restore(style_context);
+
+    // Fade if necessary
+    if (textWidth > contentsRect().width()) {
+        paintFadeoutGradient(&image);
+    }
+
+    // Paint on our widget
+    QPainter painter(this);
+    painter.drawImage(0, 0, image);
+}
+
+#include "croppedlabel.moc"

=== added file 'panel/applets/appname/croppedlabel.h'
--- panel/applets/appname/croppedlabel.h	1970-01-01 00:00:00 +0000
+++ panel/applets/appname/croppedlabel.h	2011-07-27 15:51:26 +0000
@@ -0,0 +1,45 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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 CROPPEDLABEL_H
+#define CROPPEDLABEL_H
+
+// Local
+
+// Qt
+#include <QLabel>
+
+/**
+ * This label makes sure minimumSizeHint() is not set. This ensures the applet
+ * does not get wider if a window title is very long
+ */
+class CroppedLabel : public QLabel
+{
+    Q_OBJECT
+public:
+    CroppedLabel(QWidget* parent = 0);
+
+    QSize minimumSizeHint() const;
+
+protected:
+    void paintEvent(QPaintEvent*);
+};
+
+#endif /* CROPPEDLABEL_H */

=== added file 'panel/applets/common/cairoutils.cpp'
--- panel/applets/common/cairoutils.cpp	1970-01-01 00:00:00 +0000
+++ panel/applets/common/cairoutils.cpp	2011-07-27 15:51:26 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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/>.
+ */
+// Self
+#include "cairoutils.h"
+
+// Local
+
+// Qt
+#include <QImage>
+
+namespace CairoUtils {
+
+cairo_surface_t* createSurfaceForQImage(QImage* image)
+{
+    return cairo_image_surface_create_for_data(
+        image->bits(),
+        CAIRO_FORMAT_ARGB32,
+        image->width(),
+        image->height(),
+        image->bytesPerLine()
+        );
+}
+
+} // namespace

=== added file 'panel/applets/common/cairoutils.h'
--- panel/applets/common/cairoutils.h	1970-01-01 00:00:00 +0000
+++ panel/applets/common/cairoutils.h	2011-07-27 15:51:26 +0000
@@ -0,0 +1,47 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * 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 CAIROUTILS_H
+#define CAIROUTILS_H
+
+// Local
+#include <gscopedpointer.h>
+
+// Qt
+
+// Cairo
+#include <cairo.h>
+
+class QImage;
+
+namespace CairoUtils {
+
+typedef GScopedPointer<cairo_surface_t, cairo_surface_destroy> SurfacePointer;
+typedef GScopedPointer<cairo_t, cairo_destroy> Pointer;
+
+/**
+ * Creates a Cairo surface for a QImage.
+ * QImage format must be Format_ARGB32_Premultiplied.
+ */
+cairo_surface_t* createSurfaceForQImage(QImage*);
+
+} // namespace
+
+#endif /* CAIROUTILS_H */

=== removed file 'panel/applets/common/fakecairo.h'
--- panel/applets/common/fakecairo.h	2011-07-12 15:49:40 +0000
+++ panel/applets/common/fakecairo.h	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * 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 FAKECAIRO_H
-#define FAKECAIRO_H
-
-// NuxCore
-#include <NuxCore/Color.h>
-
-// Qt
-#include <QPainter>
-#include <QPainterPath>
-
-/*
- * This module attempts to fake Cairo calls using QPainter, making it easier to
- * port Cairo paint operations to Qt
- */
-struct fcairo_t
-{
-    fcairo_t(QPainter* _painter)
-    : painter(_painter)
-    {
-        painter->save();
-    }
-
-    ~fcairo_t()
-    {
-        painter->restore();
-    }
-
-    QPainter* painter;
-    QPainterPath path;
-};
-
-inline void fcairo_arc(fcairo_t& cr, qreal xc, qreal yc, qreal radius, qreal angle1, qreal angle2)
-{
-    QRectF rect(xc - radius, yc - radius, radius * 2, radius * 2);
-
-    while (angle2 < angle1) {
-        angle2 += 2 * M_PI;
-    }
-
-    qreal start = (2. - angle1 / M_PI) * 180;
-    qreal stop  = (2. - angle2 / M_PI) * 180;
-    cr.path.arcTo(rect, start, stop - start);
-}
-
-inline void fcairo_move_to(fcairo_t& cr, qreal x, qreal y)
-{
-    cr.path.moveTo(x, y);
-}
-
-inline void fcairo_line_to(fcairo_t& cr, qreal x, qreal y)
-{
-    cr.path.lineTo(x, y);
-}
-
-inline void fcairo_fill_preserve(fcairo_t& cr)
-{
-    cr.painter->fillPath(cr.path, cr.painter->brush());
-}
-
-inline void fcairo_stroke(fcairo_t& cr)
-{
-    QPen pen(cr.painter->brush().color(), 1);
-    cr.painter->strokePath(cr.path, pen);
-    cr.path = QPainterPath();
-}
-
-typedef QGradient fcairo_pattern_t;
-
-inline fcairo_pattern_t* fcairo_pattern_create_linear (qreal x1, qreal y1, qreal x2, qreal y2)
-{
-    return new QLinearGradient(x1, y1, x2, y2);
-}
-
-inline void fcairo_pattern_destroy(fcairo_pattern_t* pattern)
-{
-    delete pattern;
-}
-
-inline void fcairo_pattern_add_color_stop_rgba(fcairo_pattern_t* pattern, qreal offset, qreal r, qreal g, qreal b, qreal a)
-{
-    pattern->setColorAt(offset, QColor::fromRgbF(r, g, b, a));
-}
-
-inline void fcairo_set_source(fcairo_t& cr, fcairo_pattern_t* pattern)
-{
-    cr.painter->setPen(Qt::NoPen);
-    cr.painter->setBrush(*pattern);
-}
-
-inline void fcairo_set_source_rgb(fcairo_t& cr, qreal r, qreal g, qreal b)
-{
-    cr.painter->setBrush(QColor::fromRgbF(r, g, b));
-}
-
-inline nux::color::Color nuxColorFromQColor(const QColor& qColor)
-{
-    nux::color::Color color;
-    color.red = qColor.redF();
-    color.green = qColor.greenF();
-    color.blue = qColor.blueF();
-    color.alpha = qColor.alphaF();
-    return color;
-}
-
-#endif /* FAKECAIRO_H */

=== modified file 'panel/applets/common/indicatorentrywidget.cpp'
--- panel/applets/common/indicatorentrywidget.cpp	2011-07-12 15:50:20 +0000
+++ panel/applets/common/indicatorentrywidget.cpp	2011-07-27 15:51:26 +0000
@@ -22,8 +22,9 @@
 #include "indicatorentrywidget.h"
 
 // Local
+#include <cairoutils.h>
 #include <debug_p.h>
-#include <fakecairo.h>
+#include <gscopedpointer.h>
 #include <panelstyle.h>
 
 // Qt
@@ -42,56 +43,25 @@
 
 using namespace unity::indicator;
 
-// Copied from libdbusmenu-qt
-static QString swapMnemonicChar(const QString &in, const char src, const char dst)
-{
-    QString out;
-    bool mnemonicFound = false;
-
-    for (int pos = 0; pos < in.length(); ) {
-        QChar ch = in[pos];
-        if (ch == src) {
-            if (pos == in.length() - 1) {
-                // 'src' at the end of string, skip it
-                ++pos;
-            } else {
-                if (in[pos + 1] == src) {
-                    // A real 'src'
-                    out += src;
-                    pos += 2;
-                } else if (!mnemonicFound) {
-                    // We found the mnemonic
-                    mnemonicFound = true;
-                    out += dst;
-                    ++pos;
-                } else {
-                    // We already have a mnemonic, just skip the char
-                    ++pos;
-                }
-            }
-        } else if (ch == dst) {
-            // Escape 'dst'
-            out += dst;
-            out += dst;
-            ++pos;
-        } else {
-            out += ch;
-            ++pos;
-        }
-    }
-
-    return out;
-}
-
 IndicatorEntryWidget::IndicatorEntryWidget(const Entry::Ptr& entry)
 : m_entry(entry)
 , m_padding(PADDING)
 , m_hasIcon(false)
 , m_hasLabel(false)
+, m_gtkWidgetPath(gtk_widget_path_new())
 {
+    gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_WINDOW);
+    gtk_widget_path_iter_set_name(m_gtkWidgetPath, -1 , "UnityPanelWidget");
+    gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_MENU_BAR);
+    gtk_widget_path_append_type(m_gtkWidgetPath, GTK_TYPE_MENU_ITEM);
+
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
     m_entry->updated.connect(sigc::mem_fun(this, &IndicatorEntryWidget::updatePix));
-    updatePix();
+}
+
+IndicatorEntryWidget::~IndicatorEntryWidget()
+{
+    gtk_widget_path_free(m_gtkWidgetPath);
 }
 
 QSize IndicatorEntryWidget::minimumSizeHint() const
@@ -104,105 +74,47 @@
     return m_pix.size();
 }
 
+void IndicatorEntryWidget::resizeEvent(QResizeEvent* event)
+{
+    QWidget::resizeEvent(event);
+    updatePix();
+}
+
 void IndicatorEntryWidget::paintEvent(QPaintEvent*)
 {
     if (!m_pix.isNull()) {
         QPainter painter(this);
-        if (m_entry->active()) {
-            paintActiveBackground(&painter);
-        }
         painter.drawPixmap(0, 0, m_pix);
     }
 }
 
 
-void IndicatorEntryWidget::paintActiveBackground(QPainter* painter)
+void IndicatorEntryWidget::paintActiveBackground(QImage* image)
 {
-    // This code should be kept in sync with the draw_menu_bg() function from
+    // This code should be kept in sync with corresponding unityshell code from
     // plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp
-    int radius = 4;
-    double x = 0;
-    double y = 0;
-    double xos = 0.5;
-    double yos = 0.5;
-    /* FIXME */
-    double mpi = 3.14159265358979323846;
-
-    PanelStyle* style = PanelStyle::instance();
-    nux::color::Color bgtop = nuxColorFromQColor(style->backgroundTopColor());
-    nux::color::Color bgbot = nuxColorFromQColor(style->backgroundBottomColor());
-    nux::color::Color line = nuxColorFromQColor(style->lineColor());
-
-    painter->setRenderHint(QPainter::Antialiasing);
-
-    fcairo_t cr(painter);
-
-    fcairo_move_to (cr, x+xos+radius, y+yos);
-    fcairo_arc (cr, x+xos+width()-xos*2-radius, y+yos+radius, radius, mpi*1.5, mpi*2);
-    fcairo_line_to (cr, x+xos+width()-xos*2, y+yos+height()-yos*2+2);
-    fcairo_line_to (cr, x+xos, y+yos+height()-yos*2+2);
-    fcairo_arc (cr, x+xos+radius, y+yos+radius, radius, mpi, mpi*1.5);
-
-    fcairo_pattern_t * pat = fcairo_pattern_create_linear (x+xos, y, x+xos, y+height()-yos*2+2);
-    fcairo_pattern_add_color_stop_rgba (pat, 0.0,
-                                     bgtop.red,
-                                     bgtop.green,
-                                     bgtop.blue,
-                                     1.0f - bgbot.red);
-    fcairo_pattern_add_color_stop_rgba (pat, 1.0,
-                                     bgbot.red,
-                                     bgbot.green,
-                                     bgbot.blue,
-                                     1.0f - bgtop.red);
-    fcairo_set_source (cr, pat);
-    fcairo_fill_preserve (cr);
-    fcairo_pattern_destroy (pat);
-
-    /*
-    pat = fcairo_pattern_create_linear (x+xos, y, x+xos, y+height()-yos*2+2);
-    fcairo_pattern_add_color_stop_rgba (pat, 0.0,
-                                     line.red,
-                                     line.green,
-                                     line.blue,
-                                     1.0f);
-    fcairo_pattern_add_color_stop_rgba (pat, 1.0,
-                                     line.red,
-                                     line.green,
-                                     line.blue,
-                                     1.0f);
-    fcairo_set_source (cr, pat);
-    */
-    fcairo_set_source_rgb (cr, line.red, line.green, line.blue);
-    fcairo_stroke (cr);
-    //fcairo_pattern_destroy (pat);
-
-    xos++;
-    yos++;
-
-    /* enlarging the area to not draw the lightborder at bottom, ugly trick :P */
-    fcairo_move_to (cr, x+radius+xos, y+yos);
-    fcairo_arc (cr, x+xos+width()-xos*2-radius, y+yos+radius, radius, mpi*1.5, mpi*2);
-    fcairo_line_to (cr, x+xos+width()-xos*2, y+yos+height()-yos*2+3);
-    fcairo_line_to (cr, x+xos, y+yos+height()-yos*2+3);
-    fcairo_arc (cr, x+xos+radius, y+yos+radius, radius, mpi, mpi*1.5);
-
-    /*
-    pat = fcairo_pattern_create_linear (x+xos, y, x+xos, y+height()-yos*2+3);
-    fcairo_pattern_add_color_stop_rgba (pat, 0.0,
-                                     bgbot.red,
-                                     bgbot.green,
-                                     bgbot.blue,
-                                     1.0f);
-    fcairo_pattern_add_color_stop_rgba (pat, 1.0,
-                                     bgbot.red,
-                                     bgbot.green,
-                                     bgbot.blue,
-                                     1.0f);
-    fcairo_set_source (cr, pat);
-    */
-    fcairo_set_source_rgb (cr, bgbot.red, bgbot.green, bgbot.blue);
-    fcairo_stroke (cr);
-    //fcairo_pattern_destroy (pat);
+
+    // Get a surface and a context
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+
+    // Init style
+    GtkStyleContext* styleContext = PanelStyle::instance()->styleContext();
+
+    gtk_style_context_save(styleContext);
+
+    gtk_style_context_set_path(styleContext, m_gtkWidgetPath);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUITEM);
+    gtk_style_context_set_state(styleContext, GTK_STATE_FLAG_PRELIGHT);
+
+    // Draw
+    // FIXME(Cimi) probably some padding is needed here.
+    gtk_render_background(styleContext, cr.data(), 0, 0, width(), height());
+    gtk_render_frame(styleContext, cr.data(), 0, 0, width(), height());
+
+    // Clean up
+    gtk_style_context_restore(styleContext);
 }
 
 void IndicatorEntryWidget::updatePix()
@@ -213,6 +125,8 @@
     int iconX = m_padding;
     int labelX = 0;
 
+    GObjectScopedPointer<PangoLayout> pangoLayout;
+
     // Compute width, labelX and update m_has{Icon,Label}
     QPixmap iconPix;
     if (m_entry->image_visible()) {
@@ -225,17 +139,18 @@
         width += iconPix.width();
     }
 
-    QString label = QString::fromUtf8(m_entry->label().c_str());
-    label = swapMnemonicChar(label, '_', '&');
-    m_hasLabel = !label.isEmpty() && m_entry->label_visible();
+    m_hasLabel = !m_entry->label().empty() && m_entry->label_visible();
     if (m_hasLabel) {
         if (m_hasIcon) {
             width += SPACING;
         }
         labelX = width;
-        QString visibleLabel = label;
-        visibleLabel.remove('&');
-        width += fontMetrics().width(visibleLabel);
+        pangoLayout.reset(createPangoLayout());
+        int labelWidth;
+        int labelHeight;
+        pango_layout_get_pixel_size(pangoLayout.data(), &labelWidth, &labelHeight);
+
+        width += labelWidth;
     }
 
     width += m_padding;
@@ -245,38 +160,27 @@
     if (!m_hasIcon && !m_hasLabel) {
         m_pix = QPixmap();
     } else {
-        m_pix = QPixmap(width, 24);
-        m_pix.fill(Qt::transparent);
-        QPainter painter(&m_pix);
+        QImage img(width, height(), QImage::Format_ARGB32_Premultiplied);
+        QPainter painter(&img);
         painter.initFrom(this);
+        painter.eraseRect(img.rect());
+        if (m_entry->active()) {
+            paintActiveBackground(&img);
+        }
         if (m_hasIcon) {
             bool disabled = !m_entry->image_sensitive();
             if (disabled) {
                 painter.setOpacity(0.5);
             }
-            painter.drawPixmap(iconX, 0, iconPix);
+            painter.drawPixmap(iconX, (height() - iconPix.height()) / 2, iconPix);
             if (disabled) {
                 painter.setOpacity(1);
             }
         }
         if (m_hasLabel) {
-            PanelStyle* style = PanelStyle::instance();
-
-            int flags = Qt::AlignLeft | Qt::AlignVCenter;
-            flags |= m_entry->show_now() ? Qt::TextShowMnemonic : Qt::TextHideMnemonic;
-
-            // Shadow
-            QColor color = style->textShadowColor();
-            color.setAlphaF(1. - color.redF());
-            painter.setPen(color);
-            painter.drawText(labelX, 1, width - labelX, m_pix.height(), flags, label);
-
-            // Text
-            color = style->textColor();
-            color.setAlphaF(m_entry->label_sensitive() ? 1. : .5);
-            painter.setPen(color);
-            painter.drawText(labelX, 0, width - labelX, m_pix.height(), flags, label);
+            paintLabel(&img, pangoLayout.data(), labelX);
         }
+        m_pix = QPixmap::fromImage(img);
     }
 
     // Notify others we changed, but only trigger a layout update if necessary
@@ -294,6 +198,80 @@
     }
 }
 
+PangoLayout* IndicatorEntryWidget::createPangoLayout()
+{
+    // Parse
+    PangoAttrList* attrs = NULL;
+    if (m_entry->show_now()) {
+        if (!pango_parse_markup(m_entry->label().c_str(),
+                                 -1,
+                                 '_',
+                                 &attrs,
+                                 NULL,
+                                 NULL,
+                                 NULL))
+        {
+            UQ_WARNING << "pango_parse_markup failed";
+        }
+    }
+
+    // Create layout
+    GObjectScopedPointer<PangoContext> pangoContext(gdk_pango_context_get());
+    PangoLayout* layout = pango_layout_new(pangoContext.data());
+
+    if (attrs) {
+        pango_layout_set_attributes(layout, attrs);
+        pango_attr_list_unref(attrs);
+    }
+
+    // Set font
+    char* font_description = NULL;
+    GtkSettings *settings = gtk_settings_get_default();
+    g_object_get(settings,
+                  "gtk-font-name", &font_description,
+                  NULL);
+    PangoFontDescription* desc = pango_font_description_from_string(font_description);
+    pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
+    pango_layout_set_font_description(layout, desc);
+    pango_font_description_free(desc);
+    g_free(font_description);
+
+    // Set text
+    QString label = QString::fromUtf8(m_entry->label().c_str());
+    label.replace('_', QString());
+    QByteArray utf8Label = label.toUtf8();
+    pango_layout_set_text(layout, utf8Label.data(), -1);
+
+    return layout;
+}
+
+void IndicatorEntryWidget::paintLabel(QImage* image, PangoLayout* layout, int labelX)
+{
+    // This code should be kept in sync with corresponding unityshell code from
+    // plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp
+    int labelWidth, labelHeight;
+    pango_layout_get_pixel_size(layout, &labelWidth, &labelHeight);
+    CairoUtils::SurfacePointer surface(CairoUtils::createSurfaceForQImage(image));
+    CairoUtils::Pointer cr(cairo_create(surface.data()));
+    pango_cairo_update_layout(cr.data(), layout);
+
+    PanelStyle* style = PanelStyle::instance();
+    GtkStyleContext* styleContext = style->styleContext();
+
+    gtk_style_context_save(styleContext);
+
+    gtk_style_context_set_path(styleContext, m_gtkWidgetPath);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUBAR);
+    gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_MENUITEM);
+
+    if (m_entry->active()) {
+        gtk_style_context_set_state(styleContext, GTK_STATE_FLAG_PRELIGHT);
+    }
+
+    gtk_render_layout(styleContext, cr.data(), labelX, (image->height() - labelHeight) / 2, layout);
+    gtk_style_context_restore(styleContext);
+}
+
 QPixmap IndicatorEntryWidget::decodeIcon()
 {
     QPixmap pix;

=== modified file 'panel/applets/common/indicatorentrywidget.h'
--- panel/applets/common/indicatorentrywidget.h	2011-07-26 10:11:23 +0000
+++ panel/applets/common/indicatorentrywidget.h	2011-07-27 15:51:26 +0000
@@ -29,6 +29,9 @@
 // Qt
 #include <QWidget>
 
+struct _GtkWidgetPath;
+struct _PangoLayout;
+
 class QPainter;
 
 class IndicatorEntryWidget : public QWidget, public sigc::trackable
@@ -36,6 +39,7 @@
 Q_OBJECT
 public:
     IndicatorEntryWidget(const unity::indicator::Entry::Ptr& entry);
+    ~IndicatorEntryWidget();
 
     QSize minimumSizeHint() const;
     QSize sizeHint() const;
@@ -61,6 +65,7 @@
     void isEmptyChanged();
 
 protected:
+    void resizeEvent(QResizeEvent*);
     void paintEvent(QPaintEvent*);
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
@@ -73,9 +78,13 @@
     int m_padding;
     bool m_hasIcon;
     bool m_hasLabel;
+    struct _GtkWidgetPath* m_gtkWidgetPath;
     void updatePix();
     QPixmap decodeIcon();
-    void paintActiveBackground(QPainter*);
+    void paintActiveBackground(QImage*);
+
+    struct _PangoLayout* createPangoLayout();
+    void paintLabel(QImage*, struct _PangoLayout*, int labelX);
 };
 
 #endif /* INDICATORENTRYWIDGET_H */

=== modified file 'panel/applets/common/panelstyle.cpp'
--- panel/applets/common/panelstyle.cpp	2011-07-19 09:22:55 +0000
+++ panel/applets/common/panelstyle.cpp	2011-07-27 15:51:26 +0000
@@ -22,92 +22,54 @@
 #include "panelstyle.h"
 
 // libunity-2d
+#include <cairoutils.h>
 #include <debug_p.h>
 #include <gconnector.h>
 #include <gscopedpointer.h>
 
 // Qt
 #include <QApplication>
-#include <QColor>
-#include <QFont>
 #include <QPalette>
 
 // GTK
 #include <gtk/gtk.h>
-#include <pango/pango.h>
-
-typedef void (*ColorGetter)(GtkStyleContext*, GtkStateFlags, GdkRGBA*);
-
-inline QColor colorFromContext(ColorGetter getter, GtkStyleContext* context, GtkStateFlags state)
-{
-    GdkRGBA color;
-    getter(context, state, &color);
-    return QColor::fromRgbF(color.red, color.green, color.blue, color.alpha);
-}
 
 class PanelStylePrivate
 {
 public:
     PanelStyle* q;
-    GtkWidget* m_offScreenWindow;
+    GObjectScopedPointer<GtkStyleContext> m_styleContext;
     GConnector m_gConnector;
 
-    QColor m_textColor;
-    QColor m_backgroundTopColor;
-    QColor m_backgroundBottomColor;
-    QColor m_textShadowColor;
-    QColor m_lineColor;
-    QFont m_font;
-
     static void onThemeChanged(GObject*, GParamSpec*, gpointer data)
     {
         PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
         priv->updatePalette();
     }
 
-    static void onFontChanged(GObject*, GParamSpec*, gpointer data)
-    {
-        PanelStylePrivate* priv = reinterpret_cast<PanelStylePrivate*>(data);
-        priv->updateFont();
-    }
-
     void updatePalette()
     {
-        GtkStyleContext* context = gtk_widget_get_style_context(m_offScreenWindow);
-        UQ_RETURN_IF_FAIL(context);
+        GtkStyleContext* context = m_styleContext.data();
+        gtk_style_context_invalidate(context);
 
-        m_textColor             = colorFromContext(gtk_style_context_get_color, context, GTK_STATE_FLAG_NORMAL);
-        m_textShadowColor       = colorFromContext(gtk_style_context_get_color, context, GTK_STATE_FLAG_SELECTED);
-        m_lineColor             = colorFromContext(gtk_style_context_get_background_color, context, GTK_STATE_FLAG_NORMAL).darker(130);
-        m_backgroundTopColor    = colorFromContext(gtk_style_context_get_background_color, context, GTK_STATE_FLAG_ACTIVE);
-        m_backgroundBottomColor = colorFromContext(gtk_style_context_get_background_color, context, GTK_STATE_FLAG_NORMAL);
+        // 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;
-        pal.setColor(QPalette::Window, m_backgroundTopColor);
-        pal.setColor(QPalette::Button, m_backgroundTopColor);
-        pal.setColor(QPalette::Text, m_textColor);
-        pal.setColor(QPalette::WindowText, m_textColor);
-        pal.setColor(QPalette::ButtonText, m_textColor);
+        pal.setBrush(QPalette::Window, generateBackgroundBrush());
         QApplication::setPalette(pal);
     }
 
-    void updateFont()
+    QBrush generateBackgroundBrush()
     {
-        gchar* fontName = 0;
-        g_object_get(gtk_settings_get_default(), "gtk-font-name", &fontName, NULL);
-        GScopedPointer<PangoFontDescription, pango_font_description_free> fontDescription(
-            pango_font_description_from_string(fontName)
-            );
-        g_free(fontName);
-
-        int size = pango_font_description_get_size(fontDescription.data());
-
-        m_font = QFont(
-            pango_font_description_get_family(fontDescription.data()),
-            size / PANGO_SCALE
-            );
-
-        QApplication::setFont(m_font);
+        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());
+        return QBrush(image);
     }
 };
 
@@ -115,24 +77,26 @@
 : d(new PanelStylePrivate)
 {
     d->q = this;
-    d->m_offScreenWindow = gtk_offscreen_window_new();
-    gtk_widget_set_name(d->m_offScreenWindow, "UnityPanelWidget");
-    gtk_widget_set_size_request(d->m_offScreenWindow, 100, 24);
-    gtk_style_context_add_class(gtk_widget_get_style_context(d->m_offScreenWindow), "menubar");
-    gtk_widget_show_all(d->m_offScreenWindow);
+    d->m_styleContext.reset(gtk_style_context_new());
+
+    GtkWidgetPath* widgetPath = gtk_widget_path_new ();
+    gtk_widget_path_append_type(widgetPath, GTK_TYPE_WINDOW);
+    gtk_widget_path_iter_set_name(widgetPath, -1 , "UnityPanelWidget");
+
+    gtk_style_context_set_path(d->m_styleContext.data(), widgetPath);
+    gtk_style_context_add_class(d->m_styleContext.data(), "gnome-panel-menu-bar");
+    gtk_style_context_add_class(d->m_styleContext.data(), "unity-panel");
+
+    gtk_widget_path_free (widgetPath);
 
     d->m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-theme-name",
         G_CALLBACK(PanelStylePrivate::onThemeChanged), d);
-    d->m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-font-name",
-        G_CALLBACK(PanelStylePrivate::onFontChanged), d);
 
     d->updatePalette();
-    d->updateFont();
 }
 
 PanelStyle::~PanelStyle()
 {
-    gtk_widget_destroy(d->m_offScreenWindow);
     delete d;
 }
 
@@ -142,34 +106,9 @@
     return &style;
 }
 
-QColor PanelStyle::textColor() const
-{
-    return d->m_textColor;
-}
-
-QColor PanelStyle::backgroundTopColor() const
-{
-    return d->m_backgroundTopColor;
-}
-
-QColor PanelStyle::backgroundBottomColor() const
-{
-    return d->m_backgroundBottomColor;
-}
-
-QColor PanelStyle::textShadowColor() const
-{
-    return d->m_textShadowColor;
-}
-
-QColor PanelStyle::lineColor() const
-{
-    return d->m_lineColor;
-}
-
-QFont PanelStyle::font() const
-{
-    return d->m_font;
+GtkStyleContext* PanelStyle::styleContext() const
+{
+    return d->m_styleContext.data();
 }
 
 #include "panelstyle.moc"

=== modified file 'panel/applets/common/panelstyle.h'
--- panel/applets/common/panelstyle.h	2011-06-30 16:43:27 +0000
+++ panel/applets/common/panelstyle.h	2011-07-27 15:51:26 +0000
@@ -26,12 +26,15 @@
 // Qt
 #include <QObject>
 
-class QColor;
-class QFont;
+struct _GtkStyleContext;
 
 class PanelStylePrivate;
 /**
- * Provides easy access to panel colors
+ * 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.
  */
 class PanelStyle : public QObject
 {
@@ -42,13 +45,7 @@
 
     static PanelStyle* instance();
 
-    QColor textColor() const;
-    QColor backgroundTopColor() const;
-    QColor backgroundBottomColor() const;
-    QColor textShadowColor() const;
-    QColor lineColor() const;
-
-    QFont font() const;
+    struct _GtkStyleContext* styleContext() const;
 
 private:
     friend class PanelStylePrivate;

=== modified file 'panel/applets/homebutton/homebutton.cpp'
--- panel/applets/homebutton/homebutton.cpp	2011-05-26 16:41:04 +0000
+++ panel/applets/homebutton/homebutton.cpp	2011-07-27 15:51:26 +0000
@@ -40,8 +40,10 @@
     setStyleSheet(
             "QToolButton { border: none; margin: 0; padding: 0; width: 61 }"
             "QToolButton:checked, QToolButton:pressed {"
-            // Use border-image here, not background-image, because bfb_bg_active.png is 56px wide
-            "     border-image: url(theme:/bfb_bg_active.png);"
+            "   padding-top: 1px;"
+            "   padding-left: 1px;"
+            "   padding-right: -1px;"
+            "   padding-bottom: -1px;"
             "}"
     );
 }