elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-25 10:13:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up workspace switching code

Browse Source
This commit is contained in:
Tom Beckmann 2012-06-09 02:05:53 +02:00
parent aa5030f286
commit c5a3bc8ffe
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Main.vala
View File

@ -427,8 +427,7 @@ namespace Gala
public override void switch_workspace (int from, int to, MotionDirection direction)
{
unowned List<Meta.WindowActor> windows = Compositor.get_window_actors (get_screen ());
//FIXME js/ui/windowManager.js line 430
unowned List<WindowActor> windows = Compositor.get_window_actors (get_screen ());
int w, h;
get_screen ().get_size (out w, out h);
@ -442,18 +441,8 @@ namespace Gala
direction == MotionDirection.DOWN_RIGHT)
x2 = -w;
if (direction == MotionDirection.LEFT ||
direction == MotionDirection.UP_LEFT ||
direction == MotionDirection.DOWN_LEFT)
x2 = w;
else if (direction == MotionDirection.RIGHT ||
direction == MotionDirection.UP_RIGHT ||
direction == MotionDirection.DOWN_RIGHT)
x2 = -w;
var in_group = new Clutter.Actor ();
var out_group = new Clutter.Actor ();
in_group = new Clutter.Actor ();
out_group = new Clutter.Actor ();
var group = Compositor.get_window_group_for_screen (get_screen ());
group.add_actor (in_group);
group.add_actor (out_group);
@ -466,11 +455,13 @@ namespace Gala
if (!window.get_meta_window ().showing_on_its_workspace ())
continue;
win.append (window);
par.append (window.get_parent ());
if (window.get_workspace () == from) {
win.append (window);
par.append (window.get_parent ());
clutter_actor_reparent (window, out_group);
} else if (window.get_workspace () == to) {
win.append (window);
par.append (window.get_parent ());
clutter_actor_reparent (window, in_group);
}
}