h/karousel
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actions: rename methods to use camelCase

Browse Source
This commit is contained in:
Peter Fajdiga
2024-09-06 00:08:30 +02:00
parent b94d3e2304
commit a754da9b78
3 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/lib/actions/Actions.ts
View File

@@ -4,7 +4,7 @@ namespace Actions {
private readonly config: Actions.Config,
) {}
public "focus-left"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public focusLeft(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const leftColumn = grid.getLeftColumn(column);
if (leftColumn === null) {
return;
@@ -12,7 +12,7 @@ namespace Actions {
leftColumn.focus();
}
public "focus-right"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public focusRight(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const rightColumn = grid.getRightColumn(column);
if (rightColumn === null) {
return;
@@ -20,7 +20,7 @@ namespace Actions {
rightColumn.focus();
}
public "focus-up"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public focusUp(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const aboveWindow = column.getAboveWindow(window);
if (aboveWindow === null) {
return;
@@ -28,7 +28,7 @@ namespace Actions {
aboveWindow.focus();
}
public "focus-down"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public focusDown(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const belowWindow = column.getBelowWindow(window);
if (belowWindow === null) {
return;
@@ -36,7 +36,7 @@ namespace Actions {
belowWindow.focus();
}
public "focus-start"(clientManager: ClientManager, desktopManager: DesktopManager) {
public focusStart(clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const firstColumn = grid.getFirstColumn();
if (firstColumn === null) {
@@ -45,7 +45,7 @@ namespace Actions {
firstColumn.focus();
}
public "focus-end"(clientManager: ClientManager, desktopManager: DesktopManager) {
public focusEnd(clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const lastColumn = grid.getLastColumn();
if (lastColumn === null) {
@@ -54,7 +54,7 @@ namespace Actions {
lastColumn.focus();
}
public "window-move-left"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveLeft(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
if (column.getWindowCount() === 1) {
// move from own column into existing column
const leftColumn = grid.getLeftColumn(column);
@@ -70,7 +70,7 @@ namespace Actions {
}
}
public "window-move-right"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveRight(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
if (column.getWindowCount() === 1) {
// move from own column into existing column
const rightColumn = grid.getRightColumn(column);
@@ -87,71 +87,71 @@ namespace Actions {
}
// TODO (optimization): only arrange moved windows
public "window-move-up"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveUp(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
column.moveWindowUp(window);
}
// TODO (optimization): only arrange moved windows
public "window-move-down"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveDown(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
column.moveWindowDown(window);
}
public "window-move-start"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveStart(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const newColumn = new Column(grid, null);
window.moveToColumn(newColumn);
}
public "window-move-end"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveEnd(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const newColumn = new Column(grid, grid.getLastColumn());
window.moveToColumn(newColumn);
}
public "window-toggle-floating"(clientManager: ClientManager, desktopManager: DesktopManager) {
public windowToggleFloating(clientManager: ClientManager, desktopManager: DesktopManager) {
const kwinClient = Workspace.activeWindow;
clientManager.toggleFloatingClient(kwinClient);
}
public "column-move-left"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnMoveLeft(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
grid.moveColumnLeft(column);
}
public "column-move-right"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnMoveRight(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
grid.moveColumnRight(column);
}
public "column-move-start"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnMoveStart(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
grid.moveColumn(column, null);
}
public "column-move-end"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnMoveEnd(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
grid.moveColumn(column, grid.getLastColumn());
}
public "column-toggle-stacked"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnToggleStacked(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
column.toggleStacked();
}
public "column-width-increase"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnWidthIncrease(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
this.config.columnResizer.increaseWidth(column, this.config.manualResizeStep);
}
public "column-width-decrease"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnWidthDecrease(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
this.config.columnResizer.decreaseWidth(column, this.config.manualResizeStep);
}
public "columns-width-equalize"(clientManager: ClientManager, desktopManager: DesktopManager) {
public columnsWidthEqualize(clientManager: ClientManager, desktopManager: DesktopManager) {
desktopManager.getCurrentDesktop().equalizeVisibleColumnsWidths();
}
public "grid-scroll-left"(clientManager: ClientManager, desktopManager: DesktopManager) {
public gridScrollLeft(clientManager: ClientManager, desktopManager: DesktopManager) {
this.gridScroll(desktopManager, -this.config.manualScrollStep);
}
public "grid-scroll-right"(clientManager: ClientManager, desktopManager: DesktopManager) {
public gridScrollRight(clientManager: ClientManager, desktopManager: DesktopManager) {
this.gridScroll(desktopManager, this.config.manualScrollStep);
}
public "grid-scroll-start"(clientManager: ClientManager, desktopManager: DesktopManager) {
public gridScrollStart(clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const firstColumn = grid.getFirstColumn();
if (firstColumn === null) {
@@ -160,7 +160,7 @@ namespace Actions {
grid.desktop.scrollToColumn(firstColumn);
}
public "grid-scroll-end"(clientManager: ClientManager, desktopManager: DesktopManager) {
public gridScrollEnd(clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const lastColumn = grid.getLastColumn();
if (lastColumn === null) {
@@ -169,11 +169,11 @@ namespace Actions {
grid.desktop.scrollToColumn(lastColumn);
}
public "grid-scroll-focused"(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public gridScrollFocused(clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
grid.desktop.scrollCenterRange(column);
}
public "grid-scroll-left-column"(clientManager: ClientManager, desktopManager: DesktopManager) {
public gridScrollLeftColumn(clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const column = grid.getLeftmostVisibleColumn(grid.desktop.getCurrentVisibleRange(), true);
if (column === null) {
@@ -188,7 +188,7 @@ namespace Actions {
grid.desktop.scrollToColumn(leftColumn);
}
public "grid-scroll-right-column"(clientManager: ClientManager, desktopManager: DesktopManager) {
public gridScrollRightColumn(clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const column = grid.getRightmostVisibleColumn(grid.desktop.getCurrentVisibleRange(), true);
if (column === null) {
@@ -203,7 +203,7 @@ namespace Actions {
grid.desktop.scrollToColumn(rightColumn);
}
public "screen-switch"(clientManager: ClientManager, desktopManager: DesktopManager) {
public screenSwitch(clientManager: ClientManager, desktopManager: DesktopManager) {
desktopManager.selectScreen(Workspace.activeScreen);
}

10
src/lib/actions/NumActions.ts
View File

@@ -2,7 +2,7 @@ namespace Actions {
export class NumActions {
constructor() {}
public "focus-"(columnIndex: number, clientManager: ClientManager, desktopManager: DesktopManager) {
public focus(columnIndex: number, clientManager: ClientManager, desktopManager: DesktopManager) {
const grid = desktopManager.getCurrentDesktop().grid;
const targetColumn = grid.getColumnAtIndex(columnIndex);
if (targetColumn === null) {
@@ -11,7 +11,7 @@ namespace Actions {
targetColumn.focus();
};
public "window-move-to-column-"(columnIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public windowMoveToColumn(columnIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const targetColumn = grid.getColumnAtIndex(columnIndex);
if (targetColumn === null) {
return;
@@ -20,7 +20,7 @@ namespace Actions {
grid.desktop.autoAdjustScroll();
};
public "column-move-to-column-"(columnIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
public columnMoveToColumn(columnIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) {
const targetColumn = grid.getColumnAtIndex(columnIndex);
if (targetColumn === null || targetColumn === column) {
return;
@@ -32,7 +32,7 @@ namespace Actions {
}
};
public "column-move-to-desktop-"(desktopIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, oldGrid: Grid) {
public columnMoveToDesktop(desktopIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, oldGrid: Grid) {
const kwinDesktop = Workspace.desktops[desktopIndex];
if (kwinDesktop === undefined) {
return;
@@ -44,7 +44,7 @@ namespace Actions {
column.moveToGrid(newGrid, newGrid.getLastColumn());
};
public "tail-move-to-desktop-"(desktopIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, oldGrid: Grid) {
public tailMoveToDesktop(desktopIndex: number, clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, oldGrid: Grid) {
const kwinDesktop = Workspace.desktops[desktopIndex];
if (kwinDesktop === undefined) {
return;

68
src/lib/keyBindings/definition.ts
View File

@@ -4,182 +4,182 @@ function getKeyBindings(world: World, actions: Actions.Actions): KeyBinding[] {
name: "window-toggle-floating",
description: "Toggle floating",
defaultKeySequence: "Meta+Space",
action: () => world.do(actions["window-toggle-floating"]),
action: () => world.do(actions.windowToggleFloating),
},
{
name: "focus-left",
description: "Move focus left",
defaultKeySequence: "Meta+A",
action: () => world.doIfTiledFocused(actions["focus-left"]),
action: () => world.doIfTiledFocused(actions.focusLeft),
},
{
name: "focus-right",
description: "Move focus right",
comment: "Clashes with default KDE shortcuts, may require manual remapping",
defaultKeySequence: "Meta+D",
action: () => world.doIfTiledFocused(actions["focus-right"]),
action: () => world.doIfTiledFocused(actions.focusRight),
},
{
name: "focus-up",
description: "Move focus up",
comment: "Clashes with default KDE shortcuts, may require manual remapping",
defaultKeySequence: "Meta+W",
action: () => world.doIfTiledFocused(actions["focus-up"]),
action: () => world.doIfTiledFocused(actions.focusUp),
},
{
name: "focus-down",
description: "Move focus down",
comment: "Clashes with default KDE shortcuts, may require manual remapping",
defaultKeySequence: "Meta+S",
action: () => world.doIfTiledFocused(actions["focus-down"]),
action: () => world.doIfTiledFocused(actions.focusDown),
},
{
name: "focus-start",
description: "Move focus to start",
defaultKeySequence: "Meta+Home",
action: () => world.do(actions["focus-start"]),
action: () => world.do(actions.focusStart),
},
{
name: "focus-end",
description: "Move focus to end",
defaultKeySequence: "Meta+End",
action: () => world.do(actions["focus-end"]),
action: () => world.do(actions.focusEnd),
},
{
name: "window-move-left",
description: "Move window left",
comment: "Moves window out of and into columns",
defaultKeySequence: "Meta+Shift+A",
action: () => world.doIfTiledFocused(actions["window-move-left"]),
action: () => world.doIfTiledFocused(actions.windowMoveLeft),
},
{
name: "window-move-right",
description: "Move window right",
comment: "Moves window out of and into columns",
defaultKeySequence: "Meta+Shift+D",
action: () => world.doIfTiledFocused(actions["window-move-right"]),
action: () => world.doIfTiledFocused(actions.windowMoveRight),
},
{
name: "window-move-up",
description: "Move window up",
defaultKeySequence: "Meta+Shift+W",
action: () => world.doIfTiledFocused(actions["window-move-up"]),
action: () => world.doIfTiledFocused(actions.windowMoveUp),
},
{
name: "window-move-down",
description: "Move window down",
defaultKeySequence: "Meta+Shift+S",
action: () => world.doIfTiledFocused(actions["window-move-down"]),
action: () => world.doIfTiledFocused(actions.windowMoveDown),
},
{
name: "window-move-start",
description: "Move window to start",
defaultKeySequence: "Meta+Shift+Home",
action: () => world.doIfTiledFocused(actions["window-move-start"]),
action: () => world.doIfTiledFocused(actions.windowMoveStart),
},
{
name: "window-move-end",
description: "Move window to end",
defaultKeySequence: "Meta+Shift+End",
action: () => world.doIfTiledFocused(actions["window-move-end"]),
action: () => world.doIfTiledFocused(actions.windowMoveEnd),
},
{
name: "column-toggle-stacked",
description: "Toggle stacked layout for focused column",
comment: "One window in the column visible, others shaded; not supported on Wayland",
defaultKeySequence: "Meta+X",
action: () => world.doIfTiledFocused(actions["column-toggle-stacked"]),
action: () => world.doIfTiledFocused(actions.columnToggleStacked),
},
{
name: "column-move-left",
description: "Move column left",
defaultKeySequence: "Meta+Ctrl+Shift+A",
action: () => world.doIfTiledFocused(actions["column-move-left"]),
action: () => world.doIfTiledFocused(actions.columnMoveLeft),
},
{
name: "column-move-right",
description: "Move column right",
defaultKeySequence: "Meta+Ctrl+Shift+D",
action: () => world.doIfTiledFocused(actions["column-move-right"]),
action: () => world.doIfTiledFocused(actions.columnMoveRight),
},
{
name: "column-move-start",
description: "Move column to start",
defaultKeySequence: "Meta+Ctrl+Shift+Home",
action: () => world.doIfTiledFocused(actions["column-move-start"]),
action: () => world.doIfTiledFocused(actions.columnMoveStart),
},
{
name: "column-move-end",
description: "Move column to end",
defaultKeySequence: "Meta+Ctrl+Shift+End",
action: () => world.doIfTiledFocused(actions["column-move-end"]),
action: () => world.doIfTiledFocused(actions.columnMoveEnd),
},
{
name: "column-width-increase",
description: "Increase column width",
defaultKeySequence: "Meta+Ctrl++",
action: () => world.doIfTiledFocused(actions["column-width-increase"]),
action: () => world.doIfTiledFocused(actions.columnWidthIncrease),
},
{
name: "column-width-decrease",
description: "Decrease column width",
defaultKeySequence: "Meta+Ctrl+-",
action: () => world.doIfTiledFocused(actions["column-width-decrease"]),
action: () => world.doIfTiledFocused(actions.columnWidthDecrease),
},
{
name: "columns-width-equalize",
description: "Equalize widths of visible columns",
defaultKeySequence: "Meta+Ctrl+X",
action: () => world.do(actions["columns-width-equalize"]),
action: () => world.do(actions.columnsWidthEqualize),
},
{
name: "grid-scroll-focused",
description: "Center focused window",
comment: "Scrolls so that the focused window is centered in the screen",
defaultKeySequence: "Meta+Alt+Return",
action: () => world.doIfTiledFocused(actions["grid-scroll-focused"]),
action: () => world.doIfTiledFocused(actions.gridScrollFocused),
},
{
name: "grid-scroll-left-column",
description: "Scroll one column to the left",
defaultKeySequence: "Meta+Alt+A",
action: () => world.do(actions["grid-scroll-left-column"]),
action: () => world.do(actions.gridScrollLeftColumn),
},
{
name: "grid-scroll-right-column",
description: "Scroll one column to the right",
defaultKeySequence: "Meta+Alt+D",
action: () => world.do(actions["grid-scroll-right-column"]),
action: () => world.do(actions.gridScrollRightColumn),
},
{
name: "grid-scroll-left",
description: "Scroll left",
defaultKeySequence: "Meta+Alt+PgUp",
action: () => world.do(actions["grid-scroll-left"]),
action: () => world.do(actions.gridScrollLeft),
},
{
name: "grid-scroll-right",
description: "Scroll right",
defaultKeySequence: "Meta+Alt+PgDown",
action: () => world.do(actions["grid-scroll-right"]),
action: () => world.do(actions.gridScrollRight),
},
{
name: "grid-scroll-start",
description: "Scroll to start",
defaultKeySequence: "Meta+Alt+Home",
action: () => world.do(actions["grid-scroll-start"]),
action: () => world.do(actions.gridScrollStart),
},
{
name: "grid-scroll-end",
description: "Scroll to end",
defaultKeySequence: "Meta+Alt+End",
action: () => world.do(actions["grid-scroll-end"]),
action: () => world.do(actions.gridScrollEnd),
},
{
name: "screen-switch",
description: "Move Karousel grid to the current screen",
defaultKeySequence: "Meta+Ctrl+Return",
action: () => world.do(actions["screen-switch"]),
action: () => world.do(actions.screenSwitch),
},
];
}
@@ -192,7 +192,7 @@ function getNumKeyBindings(world: World, numActions: Actions.NumActions): NumKey
comment: "Clashes with default KDE shortcuts, may require manual remapping",
defaultModifiers: "Meta",
fKeys: false,
action: composeNum(world.do, numActions["focus-"]),
action: composeNum(world.do, numActions.focus),
},
{
name: "window-move-to-column-",
@@ -200,7 +200,7 @@ function getNumKeyBindings(world: World, numActions: Actions.NumActions): NumKey
comment: "Requires manual remapping according to your keyboard layout, e.g. Meta+Shift+1 -> Meta+!",
defaultModifiers: "Meta+Shift",
fKeys: false,
action: composeNum(world.doIfTiledFocused, numActions["window-move-to-column-"]),
action: composeNum(world.doIfTiledFocused, numActions.windowMoveToColumn),
},
{
name: "column-move-to-column-",
@@ -208,21 +208,21 @@ function getNumKeyBindings(world: World, numActions: Actions.NumActions): NumKey
comment: "Requires manual remapping according to your keyboard layout, e.g. Meta+Ctrl+Shift+1 -> Meta+Ctrl+!",
defaultModifiers: "Meta+Ctrl+Shift",
fKeys: false,
action: composeNum(world.doIfTiledFocused, numActions["column-move-to-column-"]),
action: composeNum(world.doIfTiledFocused, numActions.columnMoveToColumn),
},
{
name: "column-move-to-desktop-",
description: "Move column to desktop ",
defaultModifiers: "Meta+Ctrl+Shift",
fKeys: true,
action: composeNum(world.doIfTiledFocused, numActions["column-move-to-desktop-"]),
action: composeNum(world.doIfTiledFocused, numActions.columnMoveToDesktop),
},
{
name: "tail-move-to-desktop-",
description: "Move this and all following columns to desktop ",
defaultModifiers: "Meta+Ctrl+Shift+Alt",
fKeys: true,
action: composeNum(world.doIfTiledFocused, numActions["tail-move-to-desktop-"]),
action: composeNum(world.doIfTiledFocused, numActions.tailMoveToDesktop),
},
];
}