Skip to content
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

Jump to bottom

added support for using numpad arrows to navigate the menu #12302

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added support for using numpad arrows to navigate the menu #12302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce8726
added support for using numpad arrows to navigate the menu
Pjsrcool Jul 22, 2024
b8ef4cd
account for RTL layouts
Pjsrcool Jul 23, 2024
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
40 changes: 29 additions & 11 deletions files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
}

let minIndex = 0;
let goUp = symbol === Clutter.KEY_Up;
let goUp = symbol === Clutter.KEY_Up || symbol === Clutter.KEY_KP_Up;
let nextActive = null;
let menuItems = this.contextMenu._getMenuItems(); // The context menu items

Expand Down Expand Up @@ -1757,11 +1757,20 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
/* Accounts for mirrored RTL layout.
Switches between left/right key presses */
if(St.Widget.get_default_direction() === St.TextDirection.RTL) {
if(symbol === Clutter.KEY_Right) {
symbol = Clutter.KEY_Left;
} else if(symbol === Clutter.KEY_Left) {
symbol = Clutter.KEY_Right;
}
switch(symbol) {
case Clutter.KEY_Right:
symbol = Clutter.KEY_Left;
break;
case Clutter.KEY_KP_Right:
symbol = Clutter.KEY_RP_Left;
break;
case Clutter.KEY_Left:
symbol = Clutter.KEY_Right;
break;
case Clutter.KEY_KP_Left:
symbol = Clutter.KEY_KP_Right;
break;
}
}

/* check for a keybinding and quit early, otherwise we get a double hit
Expand All @@ -1780,7 +1789,9 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
let continueNavigation = false;
switch (symbol) {
case Clutter.KEY_Up:
case Clutter.KEY_KP_Up:
case Clutter.KEY_Down:
case Clutter.KEY_KP_Down:
case Clutter.KEY_Return:
case Clutter.KEY_KP_Enter:
case Clutter.KEY_Menu:
Expand All @@ -1790,7 +1801,9 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
this._navigateContextMenu(this._activeContextMenuParent, symbol, ctrlKey);
break;
case Clutter.KEY_Right:
case Clutter.KEY_KP_Right:
case Clutter.KEY_Left:
case Clutter.KEY_KP_Left:
case Clutter.KEY_Tab:
case Clutter.KEY_ISO_Left_Tab:
continueNavigation = true;
Expand All @@ -1808,12 +1821,14 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {

switch (symbol) {
case Clutter.KEY_Up:
case Clutter.KEY_KP_Up:
whichWay = "up";
if (this._activeContainer === this.favoritesBox && ctrlKey &&
this._activeActor._delegate instanceof FavoritesButton)
navigationKey = false;
break;
case Clutter.KEY_Down:
case Clutter.KEY_KP_Down:
whichWay = "down";
if (this._activeContainer === this.favoritesBox && ctrlKey &&
this._activeActor._delegate instanceof FavoritesButton)
Expand All @@ -1824,6 +1839,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
case Clutter.KEY_Page_Down:
whichWay = "bottom"; break;
case Clutter.KEY_Right:
case Clutter.KEY_KP_Right:
if (!this.searchActive)
whichWay = "right";
if (this._activeContainer === this.applicationsBox)
Expand All @@ -1833,6 +1849,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
whichWay = "none";
break;
case Clutter.KEY_Left:
case Clutter.KEY_KP_Left:
if (!this.searchActive)
whichWay = "left";
if (this._activeContainer === this.favoritesBox || this._activeContainer === this.systemButtonsBox)
Expand Down Expand Up @@ -2036,20 +2053,21 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
item_actor = this.favoritesBox.get_child_at_index(selectedItemIndex);
}
} else if (this._activeContainer === this.favoritesBox &&
(symbol === Clutter.KEY_Down || symbol === Clutter.KEY_Up) && ctrlKey &&
this._activeActor._delegate instanceof FavoritesButton) {
(symbol === Clutter.KEY_Down || symbol === Clutter.KEY_KP_Down ||
symbol === Clutter.KEY_Up || symbol === Clutter.KEY_KP_Up) &&
ctrlKey && this._activeActor._delegate instanceof FavoritesButton) {
const selectedItemIndex = this._activeContainer._vis_iter.getAbsoluteIndexOfChild(this._activeActor);
item_actor = this._activeActor;
let id = item_actor._delegate.app.get_id();
let appFavorites = AppFavorites.getAppFavorites();
let favorites = appFavorites.getFavorites();
let numFavorites = favorites.length;
let favPos = 0;
if (selectedItemIndex == (numFavorites-1) && symbol === Clutter.KEY_Down)
if (selectedItemIndex == (numFavorites-1) && (symbol === Clutter.KEY_Down || symbol === Clutter.KEY_KP_Down))
favPos = 0;
else if (selectedItemIndex == 0 && symbol === Clutter.KEY_Up)
else if (selectedItemIndex == 0 && (symbol === Clutter.KEY_Up || symbol === Clutter.KEY_KP_Up))
favPos = numFavorites-1;
else if (symbol === Clutter.KEY_Down)
else if (symbol === Clutter.KEY_Down || symbol === Clutter.KEY_KP_Down)
favPos = selectedItemIndex + 1;
else
favPos = selectedItemIndex - 1;
Expand Down
Loading