Unity

Merge lp:~unity-team/unity/remove-background into lp:unity

  1. remove-background
  2. Merge into trunk
Proposed by Jason Smith
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 330
Proposed branch: lp:~unity-team/unity/remove-background
Merge into: lp:unity
Diff against target: 33 lines (+0/-9)
1 file modified
targets/mutter/plugin.vala (+0/-9)
To merge this branch: bzr merge lp:~unity-team/unity/remove-background
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+27331@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

I am not really sure what role that Background played... As it was clearly added to the stage and shown()?

What worries me more is that the Background came out of the Unity.Testing namespace... Can the 'uses Unity.Testing' possibly be removed now?

Revision history for this message
Neil J. Patel (njpatel) wrote :

When we would spread the windows for the window-picker (clicking on the ubuntu icon), we'd hide all the windows and this would be our background. This branch removes that in favour of just using the normal desktop window to provide the background (either g-s-d or nautilus). We don't remove it from Unity as the binary target `unity` still uses it.

And yeah, using Unity.Testing should be removed and then feel free to commit as it works fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala 2010-06-10 00:17:10 +0000
+++ targets/mutter/plugin.vala 2010-06-11 08:05:43 +0000
@@ -120,7 +120,6 @@
120 private Maximus maximus;120 private Maximus maximus;
121121
122 /* Unity Components */122 /* Unity Components */
123 private Background background;
124 private ExposeManager expose_manager;123 private ExposeManager expose_manager;
125 private Launcher.Launcher launcher;124 private Launcher.Launcher launcher;
126 private Places.Controller places_controller;125 private Places.Controller places_controller;
@@ -233,11 +232,6 @@
233232
234 Clutter.Group window_group = (Clutter.Group) this.plugin.get_window_group ();233 Clutter.Group window_group = (Clutter.Group) this.plugin.get_window_group ();
235234
236 this.background = new Background ();
237 this.stage.add_actor (background);
238 this.background.lower_bottom ();
239 this.background.show ();
240
241 this.launcher = new Launcher.Launcher (this);235 this.launcher = new Launcher.Launcher (this);
242 this.launcher.get_view ().opacity = 0;236 this.launcher.get_view ().opacity = 0;
243237
@@ -354,9 +348,6 @@
354 (int)height - this.PANEL_HEIGHT);348 (int)height - this.PANEL_HEIGHT);
355 this.drag_dest.move (0, this.PANEL_HEIGHT);349 this.drag_dest.move (0, this.PANEL_HEIGHT);
356350
357 this.background.set_size (width, height);
358 this.background.set_position (0, 0);
359
360 this.launcher.get_view ().set_size (this.QUICKLAUNCHER_WIDTH,351 this.launcher.get_view ().set_size (this.QUICKLAUNCHER_WIDTH,
361 (height-this.PANEL_HEIGHT));352 (height-this.PANEL_HEIGHT));
362 this.launcher.get_view ().set_position (0, this.PANEL_HEIGHT);353 this.launcher.get_view ().set_position (0, this.PANEL_HEIGHT);