Merge lp:~elementary-pantheon/wingpanel/background-opacity into lp:~elementary-pantheon/wingpanel/old-trunk

[Danielle Foré]

This branch is intended to set wingpanel's background opacity based on the wallpaper such that wingpanel will be as transparent as possible while keeping the text and icons legible.

[Danielle Foré (danrabbit)]

Doesn't build for me:

/usr/bin/ld.bfd.real: CMakeFiles/wingpanel.dir/src/Services/BackgroundManager.c.o: undefined reference to symbol 'sqrt@@GLIBC_2.0'
//lib/i386-linux-gnu/libm.so.6: error adding symbols: DSO missing from command line

[Tom Beckmann (tombeckmann)]

The math library is not linked. You have to add m, as seen here for example http://bazaar.launchpad.net/~gala-dev/gala/trunk/view/head:/CMakeLists.txt#L124

[Jacob Parker (jacobparker1992)]

Alright. Should have that fixed. Sorry—I've not really done this stuff before.

[Cody Garver (codygarver)]

Rejected because the true branch for this is lp:~jacobparker1992/wingpanel/background-opacity

Unmerged revisions

155. By jacobparker1992 on 2013-12-21

implement background opacity checking

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-15 20:47:06 +0000
+++ CMakeLists.txt	2013-12-21 22:39:37 +0000
@@ -87,6 +87,7 @@
     src/Services/AppLauncherService.vala
     src/Services/LauncherRunner.vala
     src/Services/IndicatorSorter.vala
+    src/Services/BackgroundManager.vala
 PACKAGES
 	${WINGPANEL_DEPS}
 CUSTOM_VAPIS

=== modified file 'org.pantheon.desktop.wingpanel.gschema.xml'
--- org.pantheon.desktop.wingpanel.gschema.xml	2012-07-08 03:02:36 +0000
+++ org.pantheon.desktop.wingpanel.gschema.xml	2013-12-21 22:39:37 +0000
@@ -13,7 +13,12 @@
 		<key type="s" name="default-launcher">
 			<default>"slingshot-launcher"</default>
 			<summary>The default program to use as App launcher.</summary>
-			<description>Description</description>
+			<description>The default program to use as App launcher.</description>
+		</key>
+		<key type="d" name="background-alpha">
+			<default>0.8</default>
+			<summary>Background opacity variable (must be between zero and one).</summary>
+			<description>Background opacity variable (must be between zero and one).</description>
 		</key>
 	</schema>
 </schemalist>

=== modified file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	2013-04-14 07:54:25 +0000
+++ src/Services/Settings.vala	2013-12-21 22:39:37 +0000
@@ -23,6 +23,7 @@
         public string[] blacklist { get; set; }
         public bool show_launcher { get; set; }
         public string default_launcher { get; set; }
+        public double background_alpha { get; set; }
 
         public Settings () {
             base ("org.pantheon.desktop.wingpanel");

=== modified file 'src/Widgets/BasePanel.vala'
--- src/Widgets/BasePanel.vala	2013-08-07 10:18:24 +0000
+++ src/Widgets/BasePanel.vala	2013-12-21 22:39:37 +0000
@@ -42,6 +42,13 @@
     private uint animation_timer = 0;
 
     private PanelShadow shadow = new PanelShadow ();
+    
+    private Services.Settings _settings;
+    
+    public Services.Settings settings {
+        get { return _settings; }
+        set { _settings = value; }
+    }
 
     public BasePanel () {
         decorated = false;
@@ -91,9 +98,13 @@
 
         if (child != null)
             propagate_draw (child, cr);
-
-        if (!shadow.visible)
+        
+        if (settings.background_alpha > 1E-3) {
+            shadow.show ();
             shadow.show_all ();
+        } else {
+            shadow.hide ();
+        }
 
         return true;
     }

=== modified file 'src/Widgets/Panel.vala'
--- src/Widgets/Panel.vala	2013-04-14 07:54:25 +0000
+++ src/Widgets/Panel.vala	2013-12-21 22:39:37 +0000
@@ -30,9 +30,13 @@
         private MenuBar apps_menubar;
 
         private IndicatorLoader indicator_loader;
+        
+        //private override Services.Settings settings { get; set; }
 
-        public Panel (WingpanelApp app, Services.Settings settings, IndicatorLoader indicator_loader) {
+        public Panel (WingpanelApp app, Services.Settings _settings, IndicatorLoader indicator_loader) {
             set_application (app as Gtk.Application);
+            
+            settings = _settings;
 
             this.indicator_loader = indicator_loader;
 
@@ -42,12 +46,32 @@
             container.set_homogeneous (false);
             left_wrapper.set_homogeneous (false);
             right_wrapper.set_homogeneous (false);
-
+            
             add (container);
 
             var style_context = get_style_context ();
             style_context.add_class (StyleClass.PANEL);
             style_context.add_class (Gtk.STYLE_CLASS_MENUBAR);
+            
+            settings.changed.connect (() => {
+                // TODO: Check if the alpha is zero, remove the shadow
+                
+                override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
+                    red = 0.0, green = 0.0, blue = 0.0, alpha = settings.background_alpha
+                });
+                
+                clock.override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
+                    red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0
+                });
+                menubar.override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
+                    red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0
+                });
+                apps_menubar.override_background_color (Gtk.StateFlags.NORMAL, Gdk.RGBA () {
+                    red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0
+                });
+            });
+            
+            settings.changed ();
 
             // Add default widgets
             add_defaults (settings);

=== modified file 'src/Widgets/PanelShadow.vala'
--- src/Widgets/PanelShadow.vala	2013-04-14 07:54:25 +0000
+++ src/Widgets/PanelShadow.vala	2013-12-21 22:39:37 +0000
@@ -25,7 +25,7 @@
                              to (alpha (#000, 0.0)));
         }
     """;
-
+    
     public PanelShadow () {
         skip_taskbar_hint = true;
 
@@ -40,7 +40,10 @@
     protected override bool draw (Cairo.Context cr) {
         Gtk.Allocation size;
         get_allocation (out size);
-
+        
+        // TODO:
+        //          a) Remove this entire file---it looks good without a shadow
+        //          b) Check if the alpha is 0 (or less than 1E-3) before rendering a shadow
         get_style_context ().render_background (cr, size.x, size.y, size.width, size.height);
 
         return true;

=== modified file 'src/WingpanelApp.vala'
--- src/WingpanelApp.vala	2013-04-14 07:54:25 +0000
+++ src/WingpanelApp.vala	2013-12-21 22:39:37 +0000
@@ -50,6 +50,8 @@
             panel = new Widgets.Panel (this, settings, indicator_loader);
 
             panel.show_all ();
+            
+            var background_manager = new Services.BackgroundManager (settings);
         }
 
         public static int main (string[] args) {