Skip to content

Commit 163fde0

Browse files
committed
Rename to filter_action
1 parent 48dbaf0 commit 163fde0

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

lib/WindowManager.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,6 @@ namespace Gala {
201201
* Checks whether the action should currently be prohibited.
202202
* @return true if the action should be prohibited, false otherwise
203203
*/
204-
public abstract bool action_filter (GestureAction action);
204+
public abstract bool filter_action (GestureAction action);
205205
}
206206
}

src/Gestures/GestureController.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class Gala.GestureController : Object {
121121

122122
private bool gesture_detected (GestureBackend backend, Gesture gesture, uint32 timestamp) {
123123
var recognized_action = GestureSettings.get_action (gesture, out _action_info);
124-
recognizing = enabled && (!wm.action_filter (recognized_action) && recognized_action == action ||
124+
recognizing = enabled && (!wm.filter_action (recognized_action) && recognized_action == action ||
125125
backend == scroll_backend && recognized_action == NONE);
126126

127127
if (recognizing) {

src/WindowManager.vala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ namespace Gala {
16911691
switch (action) {
16921692
case Meta.KeyBindingAction.OVERLAY_KEY:
16931693
if (behavior_settings.get_string ("overlay-action") == OPEN_MULTITASKING_VIEW) {
1694-
return action_filter (MULTITASKING_VIEW);
1694+
return filter_action (MULTITASKING_VIEW);
16951695
}
16961696
break;
16971697
case Meta.KeyBindingAction.WORKSPACE_1:
@@ -1708,16 +1708,16 @@ namespace Gala {
17081708
case Meta.KeyBindingAction.WORKSPACE_12:
17091709
case Meta.KeyBindingAction.WORKSPACE_LEFT:
17101710
case Meta.KeyBindingAction.WORKSPACE_RIGHT:
1711-
return action_filter (SWITCH_WORKSPACE);
1711+
return filter_action (SWITCH_WORKSPACE);
17121712
case Meta.KeyBindingAction.SHOW_DESKTOP:
1713-
return action_filter (MULTITASKING_VIEW);
1713+
return filter_action (MULTITASKING_VIEW);
17141714
case Meta.KeyBindingAction.SWITCH_APPLICATIONS:
17151715
case Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD:
17161716
case Meta.KeyBindingAction.SWITCH_WINDOWS:
17171717
case Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD:
17181718
case Meta.KeyBindingAction.SWITCH_GROUP:
17191719
case Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD:
1720-
return action_filter (SWITCH_WINDOWS);
1720+
return filter_action (SWITCH_WINDOWS);
17211721
default:
17221722
break;
17231723
}
@@ -1727,10 +1727,10 @@ namespace Gala {
17271727
case "cycle-workspaces-previous":
17281728
case "switch-to-workspace-first":
17291729
case "switch-to-workspace-last":
1730-
return action_filter (SWITCH_WORKSPACE);
1730+
return filter_action (SWITCH_WORKSPACE);
17311731
case "zoom-in":
17321732
case "zoom-out":
1733-
return action_filter (ZOOM);
1733+
return filter_action (ZOOM);
17341734
default:
17351735
break;
17361736
}
@@ -1748,7 +1748,7 @@ namespace Gala {
17481748
return filter (binding);
17491749
}
17501750

1751-
public bool action_filter (GestureAction action) {
1751+
public bool filter_action (GestureAction action) {
17521752
if (!is_modal ()) {
17531753
return false;
17541754
}

0 commit comments

Comments
 (0)