Skip to content

Introduce GestureAction.CUSTOM #2518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 3, 2025
Merged

Introduce GestureAction.CUSTOM #2518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a917b38
Introduce GestureAction.CUSTOM
lenemter Aug 2, 2025
c486ce8
Merge branch 'main' into lenemter/custom-gesture
lenemter Aug 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/Gestures/Gesture.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ namespace Gala {
SWITCH_WORKSPACE,
SWITCH_WINDOWS,
MULTITASKING_VIEW,
DOCK,
ZOOM,
CLOSE_WINDOW,
CUSTOM,
N_ACTIONS
}

Expand Down
4 changes: 1 addition & 3 deletions src/ShellClients/PanelWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
*/

public class Gala.PanelWindow : ShellWindow, RootTarget {
private const int ANIMATION_DURATION = 250;

private static HashTable<Meta.Window, Meta.Strut?> window_struts = new HashTable<Meta.Window, Meta.Strut?> (null, null);

public WindowManager wm { get; construct; }
Expand Down Expand Up @@ -53,7 +51,7 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
notify["width"].connect (update_strut);
notify["height"].connect (update_strut);

gesture_controller = new GestureController (DOCK, wm);
gesture_controller = new GestureController (CUSTOM, wm);
add_gesture_controller (gesture_controller);

hide_tracker = new HideTracker (wm.get_display (), this);
Expand Down
6 changes: 3 additions & 3 deletions src/ShellClients/ShellWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {

private void update_target () {
property_target = new PropertyTarget (
DOCK, window_actor,
CUSTOM, window_actor,
get_animation_property (),
get_property_type (),
calculate_value (false),
Expand All @@ -54,7 +54,7 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
}

private void update_property () {
property_target.propagate (UPDATE, DOCK, get_hidden_progress ());
property_target.propagate (UPDATE, CUSTOM, get_hidden_progress ());
}

public override void propagate (UpdateType update_type, GestureAction action, double progress) {
Expand Down Expand Up @@ -84,7 +84,7 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
multitasking_view_progress = progress;
break;

case DOCK:
case CUSTOM:
custom_progress = progress;
break;

Expand Down
6 changes: 3 additions & 3 deletions src/Widgets/MultitaskingView/WindowClone.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
construct {
reactive = true;

gesture_controller = new GestureController (CLOSE_WINDOW, wm);
gesture_controller = new GestureController (CUSTOM, wm);
gesture_controller.enable_scroll (this, VERTICAL);
add_gesture_controller (gesture_controller);

Expand Down Expand Up @@ -272,7 +272,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
}

public override void update_progress (Gala.GestureAction action, double progress) {
if (action != CLOSE_WINDOW || slot == null || !Meta.Prefs.get_gnome_animations ()) {
if (action != CUSTOM || slot == null || !Meta.Prefs.get_gnome_animations ()) {
return;
}

Expand All @@ -295,7 +295,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
public override void end_progress (GestureAction action) {
update_hover_widgets (false);

if (action == CLOSE_WINDOW && get_current_commit (CLOSE_WINDOW) > 0.5 && Meta.Prefs.get_gnome_animations ()) {
if (action == CUSTOM && get_current_commit (CUSTOM) > 0.5 && Meta.Prefs.get_gnome_animations ()) {
close_window (Meta.CURRENT_TIME);
}
}
Expand Down