Merge lp:~canonical-dx-team/unity/unity.fix-685830 into lp:unity

[Mirco Müller]

New style-handling class for the panel implemented as a singleton.

[Neil J. Patel (njpatel)]

It looks like you haven't yet hooked everything up so this merge proposal might be a bit premature. I'll comment on what I see anyway:

 - It should be _panel_style not _panelStyle, same goes for anything else like that

- GetDefault(), if _panelStyle == NULL, then create a new one and return it, but if one is already around: return _panelStyle->Reference(); On the other end, the objects should grab panel style object on construction and then ->UnReference it on destruction.

- To be more C++, you should probably have:

nux::Color& GetBackgroundTop ()

etc, so you can do nux::Color top = style->GetBackgroundTop ();, which is cleaner

- Probably can rid of printfs?

- I think the PanelIndicatorObjectEntryView bits still need to be hooked up

- Missing a "changed" signal so we can react to theme changes?

review: Needs Fixing

[Mirco Müller (macslow)]

> - It should be _panel_style not _panelStyle, same goes for anything else like
> that

Changed.
>
> - GetDefault(), if _panelStyle == NULL, then create a new one and return it,
> but if one is already around: return _panelStyle->Reference(); On the other
> end, the objects should grab panel style object on construction and then
> ->UnReference it on destruction.

But why should reference-counting be used, when PanelStyle is meant to be a singleton. I think these two concepts are mutual exclusive imo.

> - To be more C++, you should probably have:
>
> nux::Color& GetBackgroundTop ()

Initially you asked me to use ANSI-C-ish call-by-reference for this, but I've changed it now to the C++-reference return-type.

> - Probably can rid of printfs?

Yeah, was just for debugging.

> - I think the PanelIndicatorObjectEntryView bits still need to be hooked up
>
> - Missing a "changed" signal so we can react to theme changes?

Doing that atm.

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2010-12-07 15:01:07 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2010-12-09 16:50:42 +0000
@@ -25,6 +25,7 @@
 #include "Nux/WindowCompositor.h"
 
 #include "PanelIndicatorObjectEntryView.h"
+#include "PanelStyle.h"
 
 #include <glib.h>
 #include <pango/pangocairo.h>

=== added file 'src/PanelStyle.cpp'
--- src/PanelStyle.cpp	1970-01-01 00:00:00 +0000
+++ src/PanelStyle.cpp	2010-12-09 16:50:42 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authored by: Mirco Müller <[e-mail]>
+ */
+
+#include <gtk/gtk.h>
+
+#include "PanelStyle.h"
+
+PanelStyle* PanelStyle::_panel_style = NULL;
+
+void
+OnStyleChanged (GObject*    gobject,
+                GParamSpec* pspec,
+                gpointer    data)
+{
+  PanelStyle* self = (PanelStyle*) data;
+
+  self->sigChanged.emit (*self);
+}
+
+PanelStyle*
+PanelStyle::GetDefault ()
+{
+  if (_panel_style == NULL)
+  {
+    _panel_style = new PanelStyle ();
+
+    g_signal_connect (gtk_settings_get_default (),
+                      "notify::gtk-theme-name",
+                      G_CALLBACK (OnStyleChanged),
+                      _panel_style);
+  }
+
+  _panel_style->Reference (); 
+  return _panel_style;
+}
+
+nux::Color&
+PanelStyle::GetTextColor ()
+{
+  nux::Color& color = _text;
+
+  return color;
+}
+
+nux::Color&
+PanelStyle::GetBackgroundTop ()
+{
+  nux::Color& color = _bg_top;
+
+  return color;
+}
+
+nux::Color&
+PanelStyle::GetBackgroundBottom ()
+{
+  nux::Color& color = _bg_bottom;
+
+  return color;
+}
+
+nux::Color&
+PanelStyle::GetTextShadow ()
+{
+  nux::Color& color = _text_shadow;
+
+  return color;
+}
+
+PanelStyle::PanelStyle ()
+{
+  GtkWidget* menu_bar = NULL;
+  GtkStyle*  style    = NULL;
+
+  menu_bar = gtk_menu_bar_new ();
+  style = gtk_widget_get_style (menu_bar);
+
+  _text.SetRed ((float) style->text[4].red / (float) 0xffff);
+  _text.SetGreen ((float) style->text[4].green / (float) 0xffff);
+  _text.SetBlue ((float) style->text[4].blue / (float) 0xffff);
+  _text.SetAlpha (1.0f);
+
+  _bg_top.SetRed ((float) style->bg[4].red / (float) 0xffff);
+  _bg_top.SetGreen ((float) style->bg[4].green / (float) 0xffff);
+  _bg_top.SetBlue ((float) style->bg[4].blue / (float) 0xffff);
+  _bg_top = 0.4f * _bg_top;
+  _bg_top.SetAlpha (1.0f);
+
+  _bg_bottom.SetRed ((float) style->bg[4].red / (float) 0xffff);
+  _bg_bottom.SetGreen ((float) style->bg[4].green / (float) 0xffff);
+  _bg_bottom.SetBlue ((float) style->bg[4].blue / (float) 0xffff);
+  _bg_bottom = 0.22f * _bg_bottom;
+  _bg_bottom.SetAlpha (1.0f);
+
+  _text_shadow.SetRed ((float) style->text[2].red / (float) 0xffff);
+  _text_shadow.SetGreen ((float) style->text[2].green / (float) 0xffff);
+  _text_shadow.SetBlue ((float) style->text[2].blue / (float) 0xffff);
+  _text_shadow.SetAlpha (1.0f);
+
+  g_object_unref (style);
+  g_object_unref (menu_bar);
+}
+
+PanelStyle::~PanelStyle ()
+{
+  if (GetReferenceCount () != 0)
+    g_warning ("PanelStyle::~PanelStyle() - Reference-counter is not 0!");
+}

=== added file 'src/PanelStyle.h'
--- src/PanelStyle.h	1970-01-01 00:00:00 +0000
+++ src/PanelStyle.h	2010-12-09 16:50:42 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authored by: Mirco Müller <[e-mail]>
+ */
+
+#ifndef PANEL_STYLE_H
+#define PANEL_STYLE_H
+
+#include "Nux/Nux.h"
+
+class PanelStyle : public nux::Object
+{
+  public:
+    PanelStyle ();
+    ~PanelStyle ();
+
+    static PanelStyle* GetDefault ();
+
+    nux::Color& GetTextColor ();
+    nux::Color& GetBackgroundTop ();
+    nux::Color& GetBackgroundBottom ();
+    nux::Color& GetTextShadow ();
+
+    sigc::signal<void, PanelStyle&> sigChanged;
+
+  private:
+    static PanelStyle* _panel_style;
+    nux::Color         _text;
+    nux::Color         _bg_top;
+    nux::Color         _bg_bottom;
+    nux::Color         _text_shadow;
+};
+
+#endif // PANEL_STYLE_H

=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2010-12-09 15:52:53 +0000
+++ src/PanelView.cpp	2010-12-09 16:50:42 +0000
@@ -31,6 +31,7 @@
 #include <glib.h>
 
 #include "PanelView.h"
+#include "PanelStyle.h"
 
 #include "IndicatorObjectFactoryRemote.h"
 #include "PanelIndicatorObjectView.h"
@@ -156,8 +157,25 @@
   cairo_set_line_width (cr, 1);
 
   cairo_pattern_t *pat = cairo_pattern_create_linear (0, 0, 0, _last_height);
-  cairo_pattern_add_color_stop_rgb (pat, 0.0f, 89/255.0f, 88/255.0f, 83/255.0f);
-  cairo_pattern_add_color_stop_rgb (pat, 1.0f, 50/255.0f, 50/255.0f, 45/255.0f);
+
+  PanelStyle* style = PanelStyle::GetDefault ();
+  nux::Color  start;
+  nux::Color  end;
+
+  start = style->GetBackgroundTop ();
+  end = style->GetBackgroundBottom ();
+
+  cairo_pattern_add_color_stop_rgb (pat,
+                                    0.0f,
+                                    start.GetRed (),
+                                    start.GetGreen (),
+                                    start.GetBlue ());
+  cairo_pattern_add_color_stop_rgb (pat,
+                                    1.0f,
+                                    end.GetRed (),
+                                    end.GetGreen (),
+                                    end.GetBlue ());
+
   cairo_set_source (cr, pat);
   cairo_rectangle (cr, 0, 0, _last_width, _last_height);
   cairo_fill (cr);

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2010-12-09 11:04:20 +0000
+++ tests/CMakeLists.txt	2010-12-09 16:50:42 +0000
@@ -62,6 +62,8 @@
 
 add_executable (test-panel
                 TestPanel.cpp
+                ../src/PanelStyle.cpp
+                ../src/PanelStyle.h
                 ../src/PanelView.cpp
                 ../src/PanelView.h
                 ../src/PanelIndicatorObjectView.cpp