Skip to content

Commit 17369ea

Browse files
authored
Merge branch 'main' into lenemter/sort-windows-2
2 parents 12d589a + 0004784 commit 17369ea

File tree

11 files changed

+620
-1233
lines changed

11 files changed

+620
-1233
lines changed

daemon/DBus.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public enum Gala.ActionType {
77
NONE = 0,
8-
SHOW_WORKSPACE_VIEW,
8+
SHOW_MULTITASKING_VIEW,
99
MAXIMIZE_CURRENT,
1010
HIDE_CURRENT,
1111
OPEN_LAUNCHER,

lib/Plugin.vala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ namespace Gala {
1919
public enum PluginFunction {
2020
ADDITION,
2121
WINDOW_SWITCHER,
22-
WORKSPACE_VIEW,
2322
WINDOW_OVERVIEW
2423
}
2524

lib/WindowManager.vala

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@
1616
//
1717

1818
namespace Gala {
19+
namespace ActionKeys {
20+
public const string INTERACTIVE_SCREENSHOT_ACTION = "interactive-screenshot-action";
21+
public const string OVERLAY_ACTION = "overlay-action";
22+
public const string PANEL_MAIN_MENU_ACTION = "panel-main-menu-action";
23+
public const string TOGGLE_RECORDING_ACTION = "toggle-recording-action";
24+
}
25+
1926
public enum ActionType {
2027
NONE = 0,
21-
SHOW_WORKSPACE_VIEW,
28+
SHOW_MULTITASKING_VIEW,
2229
MAXIMIZE_CURRENT,
2330
HIDE_CURRENT,
2431
OPEN_LAUNCHER,
@@ -118,11 +125,6 @@ namespace Gala {
118125
*/
119126
public abstract Meta.BackgroundGroup background_group { get; protected set; }
120127

121-
/**
122-
* View that allows to see and manage all your windows and desktops.
123-
*/
124-
public abstract Gala.ActivatableComponent workspace_view { get; protected set; }
125-
126128
/**
127129
* Enters the modal mode, which means that all events are directed to the stage instead
128130
* of the windows. This is the only way to receive keyboard events besides shortcut listeners.
@@ -176,5 +178,12 @@ namespace Gala {
176178
* @param direction The direction in which to switch
177179
*/
178180
public abstract void switch_to_next_workspace (Meta.MotionDirection direction, uint32 timestamp);
181+
182+
/**
183+
* Gets action command from gsettings and executes it.
184+
*
185+
* @param action_key The gsettings key of action. Available keys are stored in ActionKeys
186+
*/
187+
public abstract void launch_action (string action_key);
179188
}
180189
}

src/Gestures/GestureBackend.vala

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Copyright 2025 elementary, Inc. (https://elementary.io)
3+
* SPDX-License-Identifier: GPL-3.0-or-later
4+
*
5+
* Authored by: Leonhard Kargl <[email protected]>
6+
*/
7+
8+
public interface Gala.GestureBackend : Object {
9+
public signal bool on_gesture_detected (Gesture gesture, uint32 timestamp);
10+
public signal void on_begin (double delta, uint64 time);
11+
public signal void on_update (double delta, uint64 time);
12+
public signal void on_end (double delta, uint64 time);
13+
14+
public virtual void prepare_gesture_handling () { }
15+
16+
/**
17+
* The gesture should be cancelled. The implementation should stop emitting
18+
* signals and reset any internal state. In particular it should not emit on_end.
19+
* The implementation has to make sure that any further events from the same gesture will
20+
* will be ignored. Once the gesture ends a new gesture should be treated as usual.
21+
*/
22+
public virtual void cancel_gesture () { }
23+
}

src/Gestures/GesturePropertyTransition.vala

Lines changed: 0 additions & 237 deletions
This file was deleted.

0 commit comments

Comments
 (0)