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

Make multitasking view nudge animation movement match workspace animation movement

Browse Source
This commit is contained in:
JoseExposito 2021-04-04 13:22:44 +02:00 committed by Daniel Foré
parent aec4f89c42
commit 3916d058c9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Widgets/MultitaskingView.vala
View File

@ -247,22 +247,21 @@ namespace Gala {
} }
private void switch_workspace_with_gesture (Meta.MotionDirection direction) { private void switch_workspace_with_gesture (Meta.MotionDirection direction) {
var relative_dir = (direction == Meta.MotionDirection.LEFT) ? -1 : 1;
unowned Meta.WorkspaceManager manager = display.get_workspace_manager (); unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
var num_workspaces = manager.get_n_workspaces (); var num_workspaces = manager.get_n_workspaces ();
var active_workspace_index = manager.get_active_workspace ().index (); var active_workspace_index = manager.get_active_workspace ().index ();
var target_workspace_index = (direction == Meta.MotionDirection.LEFT) var target_workspace_index = active_workspace_index + relative_dir;
? active_workspace_index - 1
: active_workspace_index + 1;
float initial_x = workspaces.x; float initial_x = workspaces.x;
float target_x = 0; float target_x = 0;
bool is_nudge_animation = (target_workspace_index < 0 || target_workspace_index >= num_workspaces); bool is_nudge_animation = (target_workspace_index < 0 || target_workspace_index >= num_workspaces);
var nudge_gap = WindowManagerGala.NUDGE_GAP * InternalUtils.get_ui_scaling_factor ();
if (is_nudge_animation) { if (is_nudge_animation) {
var nudge_delta = (direction == Meta.MotionDirection.LEFT) var workspaces_geometry = InternalUtils.get_workspaces_geometry (display);
? WindowManagerGala.NUDGE_GAP target_x = initial_x + (workspaces_geometry.width * -relative_dir);
: -WindowManagerGala.NUDGE_GAP;
target_x = initial_x + nudge_delta * InternalUtils.get_ui_scaling_factor ();
} else { } else {
foreach (var child in workspaces.get_children ()) { foreach (var child in workspaces.get_children ()) {
unowned WorkspaceClone workspace_clone = (WorkspaceClone) child; unowned WorkspaceClone workspace_clone = (WorkspaceClone) child;
@ -284,6 +283,11 @@ namespace Gala {
GestureTracker.OnUpdate on_animation_update = (percentage) => { GestureTracker.OnUpdate on_animation_update = (percentage) => {
var x = GestureTracker.animation_value (initial_x, target_x, percentage, true); var x = GestureTracker.animation_value (initial_x, target_x, percentage, true);
if (is_nudge_animation) {
x = x.clamp (initial_x - nudge_gap, initial_x + nudge_gap);
}
workspaces.x = x; workspaces.x = x;
}; };