elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2025-01-01 14:06:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix workspaces nudging all the time

Browse Source
This commit is contained in:
Tom Beckmann 2012-09-01 17:42:49 +02:00
parent f93a5dec32
commit 257e45de07
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Widgets/WorkspaceView.vala
View File

@ -204,12 +204,16 @@ namespace Gala
void switch_to_next_workspace (MotionDirection direction) void switch_to_next_workspace (MotionDirection direction)
{ {
var display = screen.get_display (); var display = screen.get_display ();
var old_index = screen.get_active_workspace_index ();
var neighbor = screen.get_active_workspace ().get_neighbor (direction); var neighbor = screen.get_active_workspace ().get_neighbor (direction);
neighbor.activate (display.get_current_time ()); neighbor.activate (display.get_current_time ());
//if we didnt switch, show a nudge-over animation // if we didnt switch, show a nudge-over animation. need to take the indices
if (screen.get_active_workspace () == neighbor) { // here since the changing only applies after the animation ends
if (old_index == 0 && direction == MotionDirection.LEFT ||
old_index == screen.n_workspaces - 1 && direction == MotionDirection.RIGHT) {
var dest = direction == MotionDirection.LEFT ? 32.0f : -32.0f; var dest = direction == MotionDirection.LEFT ? 32.0f : -32.0f;
Compositor.get_window_group_for_screen (screen).animate (Clutter.AnimationMode.LINEAR, 100, x:dest); Compositor.get_window_group_for_screen (screen).animate (Clutter.AnimationMode.LINEAR, 100, x:dest);
Clutter.Threads.Timeout.add (210, () => { Clutter.Threads.Timeout.add (210, () => {