[mutter,panel-bar] Remove animations for switching between place view for testing; Remove effect on bar-view bg, broken inside mutter.

modified: mutter-plugin/plugin.vala src/panel/panel-home.vala src/places/bar-view.vala src/places/cairo-drawing.vala src/window.vala (bzr r55.2.11)

4 files changed, 25 insertions, 7 deletions

diff --git a/src/panel/panel-home.vala b/src/panel/panel-home.vala
index 394695de6..8d3654e4b 100644
--- a/src/panel/panel-home.vala
+++ b/src/panel/panel-home.vala
@@ -26,8 +26,8 @@ namespace Unity.Panel
 
 public HomeButton (Shell shell)
 {
- Object (filename:PKGDATADIR + "/bfb.png",
- size:22,
+ Object (size:22,
+ filename:PKGDATADIR + "/bfb.png",
 reactive:true,
 shell:shell);
 }
diff --git a/src/places/bar-view.vala b/src/places/bar-view.vala
index 3b3d54f53..f408cf666 100644
--- a/src/places/bar-view.vala
+++ b/src/places/bar-view.vala
@@ -119,6 +119,7 @@ namespace Unity.Places.Bar
 (int)(this.padding.left + QL_PAD),
 (int)ICON_VIEW_WIDTH,
 width);
+ this.queue_relayout ();
 }
 
 public override void map ()
@@ -167,8 +168,9 @@ namespace Unity.Places.Bar
 n_places++;
 }
 
- /* Allocate the Trash */
- child_box.x1 = box.x2 - box.x1 - 266 - ICON_VIEW_WIDTH;
+ /* Allocate the Trash (24 = Padding) */
+ var i_width = this.shell.get_indicators_width () - 24;
+ child_box.x1 = box.x2 - box.x1 - i_width - ICON_VIEW_WIDTH;
 child_box.x2 = child_box.x1 + ICON_VIEW_WIDTH;
 this.trash_icon.allocate (child_box, flags);
 
diff --git a/src/places/cairo-drawing.vala b/src/places/cairo-drawing.vala
index 94fb3686b..2b8df2867 100644
--- a/src/places/cairo-drawing.vala
+++ b/src/places/cairo-drawing.vala
@@ -202,7 +202,7 @@ namespace Unity.Places.CairoDrawing
 effect_glow.set_color (c);
 effect_glow.set_factor (1.0f);
 effect_glow.set_margin (5);
- this.add_effect (effect_glow);
+ //this.add_effect (effect_glow);
 }
 
 construct
diff --git a/src/window.vala b/src/window.vala
index 2baeef396..9397f0f4c 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -40,6 +40,7 @@ namespace Unity
 private Places.Controller controller;
 private Unity.Places.View places;
 
+ private bool showing_places;
 
 public UnderlayWindow (bool popup, int width, int height)
 {
@@ -130,6 +131,8 @@ namespace Unity
 this.places = this.controller.get_view ();
 this.stage.add_actor (this.quicklauncher);
 this.stage.add_actor (this.places);
+ this.places.opacity = 0;
+ this.showing_places = false;
 
 this.panel = new Panel.View (this);
 this.stage.add_actor (this.panel);
@@ -262,12 +265,25 @@ namespace Unity
 
 public void show_unity ()
 {
- this.wnck_screen.toggle_showing_desktop (true);
+ if (this.showing_places)
+ {
+ this.showing_places = false;
+ this.panel.set_indicator_mode (true);
+ this.places.opacity = 255;
+ }
+ else
+ {
+ this.showing_places = true;
+ this.panel.set_indicator_mode (false);
+ this.places.opacity = 0;
+ }
+
+ this.places.do_queue_redraw ();
 }
 
 public int get_indicators_width ()
 {
- return this.get_indicators_width ();
+ return this.panel.get_indicators_width ();
 }
 
 }