Merge lp:~unity-team/unity/unity.fix-636602 into lp:unity

[Mirco Müller]

A new class called Unity.Panel.Divider has been added to fix LP: #636602. This adds a special Ctk.Image actor between the home-button and menubar/window-buttons to hold the dividing groove artwork. The padding is intentionally part of the artwork-image, because clutk/clutter would otherwise stretch the divider-groove itself to the full width (groove + right padding).

This branch needs the artwork introduced with lp:~unity-team/unity-asset-pool/unity-asset-pool.fix-636602

[Gord Allott (gordallott)]

approved, works well. works a little weird in the popup version, but thats not a problem

review: Approve

=== modified file 'unity-private/Makefile.am'
--- unity-private/Makefile.am	2010-08-26 17:04:48 +0000
+++ unity-private/Makefile.am	2010-09-13 15:48:49 +0000
@@ -76,6 +76,7 @@
 
 panel_sources = \
   panel/panel-background.vala \
+  panel/panel-divider.vala \
   panel/panel-home-button.vala \
   panel/panel-indicator-background.vala \
   panel/panel-indicator-bar.vala \
 
=== added file 'unity-private/panel/panel-divider.vala'
--- unity-private/panel/panel-divider.vala	1970-01-01 00:00:00 +0000
+++ unity-private/panel/panel-divider.vala	2010-09-13 15:48:49 +0000
@@ -0,0 +1,81 @@
+/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/*
+ * 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]>
+ *
+ */
+ 
+namespace Unity.Panel
+{
+  public class Divider : Ctk.Image
+  {
+    public Shell shell { get; construct; }
+    private Clutter.Texture bg;
+
+    public Divider (Shell shell)
+    {
+      Object (reactive:true, shell:shell);
+
+      shell.mode_changed.connect (on_mode_changed);
+
+      Unity.Testing.ObjectRegistry.get_default ().register ("PanelDivider",
+                                                            this);
+    }
+
+    construct
+    {
+      try
+        {
+          bg = new Clutter.Texture.from_file (
+                                  "/usr/share/unity/themes/divider.png");
+        }
+      catch (Error e)
+        {
+          warning ("Could not load bg-texture for divider: %s", e.message);
+        }
+
+      set_background (bg);
+    }
+
+    /* the current divider-artwork is two pixels wide */
+    private override void get_preferred_width (float     for_height,
+                                               out float min_width,
+                                               out float nat_width)
+    {
+      // the width of six pixels is made up of two pixels for the divider itself
+      // and four pixels for the padding; the padding needs to be in the image
+      // of the artwork, because otherwise clutk/clutter would stretch the two
+      // pixel divider across the whole width 
+      min_width = 6.0f;
+      nat_width = 6.0f;
+    }
+
+    private void on_mode_changed (ShellMode mode)
+    {
+      if (mode == ShellMode.MINIMIZED)
+        {
+          set_background (bg);
+        }
+      else
+        {
+          set_background (null);
+        }
+
+      do_queue_redraw ();
+    }
+
+  }
+}
 
=== modified file 'unity-private/panel/panel-home-button.vala'
--- unity-private/panel/panel-home-button.vala	2010-09-09 07:08:56 +0000
+++ unity-private/panel/panel-home-button.vala	2010-09-13 15:48:49 +0000
@@ -28,7 +28,6 @@
     private Clutter.Texture bfb_bg_normal;
     private Clutter.Texture bfb_bg_prelight;
     private Clutter.Texture bfb_bg_active;
-    private bool search_shown;
 
     public HomeButton (Shell shell)
     {
@@ -52,7 +51,7 @@
 
       notify["state"].connect (on_state_changed);
 
-      width += 3.0f;
+      //width += 3.0f;
 
       glow = new Ctk.EffectGlow ();
       glow.set_color ({ 255, 255, 255, 255 });
@@ -98,8 +97,6 @@
       set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
       set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
       set_background_for_state (Ctk.ActorState.STATE_ACTIVE, bfb_bg_active);
-
-      search_shown = false;
     }
 
     private override void allocate (Clutter.ActorBox        box,
@@ -111,9 +108,10 @@
       float       pheight;
       Ctk.Padding pad = { 0 };
  
-      // 2.0f are added so the home-button groove aligns with the
-      // right edge of the launcher, this fixes LP: #630031
-      lwidth  = 2.0f + (float) shell.get_launcher_width_foobar ();
+      // 1.0f are subtracted so the groove dividing home-button and
+      // the rest of the panel aligns with the right edge of the
+      // launcher, this fixes LP: #630031
+      lwidth  = (float) shell.get_launcher_width_foobar () - 1.0f;
       pheight = (float) shell.get_panel_height_foobar ();
       theme_image.get_preferred_size (out cwidth, out cheight,
                                            out cwidth, out cheight);
@@ -180,10 +178,11 @@
                                                out float min_width,
                                                out float nat_width)
     {
-      // 2.0f are added so the home-button groove aligns with the
-      // right edge of the launcher, this fixes LP: #630031
-      min_width = 2.0f + shell.get_launcher_width_foobar ();
-      nat_width = 2.0f + shell.get_launcher_width_foobar ();
+      // 1.0f are subtracted so the groove dividing home-button and
+      // the rest of the panel aligns with the right edge of the
+      // launcher, this fixes LP: #630031
+      min_width = shell.get_launcher_width_foobar () - 1.0f;
+      nat_width = shell.get_launcher_width_foobar () - 1.0f;
     }
 
     private void on_mode_changed (ShellMode mode)
@@ -193,14 +192,12 @@
           set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
           set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
           set_background_for_state (Ctk.ActorState.STATE_ACTIVE, bfb_bg_active);
-          search_shown = false;
         }
       else
         {
           set_background_for_state (Ctk.ActorState.STATE_NORMAL, null);
           set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, null);
           set_background_for_state (Ctk.ActorState.STATE_ACTIVE, null);
-          search_shown = true;
         }
 
       do_queue_redraw ();
 
=== modified file 'unity-private/panel/panel-view.vala'
--- unity-private/panel/panel-view.vala	2010-08-02 09:16:36 +0000
+++ unity-private/panel/panel-view.vala	2010-09-13 15:48:49 +0000
@@ -33,6 +33,7 @@
     Ctk.HBox              hbox;
     Background            bground;
     HomeButton            home_button;
+    Divider               divider;
     WindowButtons         window_buttons;
     MenuBar               menu_bar;
     SystemTray            system_tray;
@@ -68,6 +69,10 @@
       hbox.pack (home_button, false, true);
       home_button.show ();
 
+      divider = new Divider (shell);
+      hbox.pack (divider, false, false);
+      divider.show ();
+
       window_buttons = new WindowButtons ();
       hbox.pack (window_buttons, false, true);
       window_buttons.show ();