Makefile: package: rename package dir to karousel

This reverts commit dda63d68cde58c7f4a7162b11a2fd614365d36ff.

.gitignore

@@ -1,4 +1,4 @@
 /package/contents/code/main.js
 /package/contents/config/main.xml
-/karousel.tar.gz
+/karousel*.tar.gz
 /.idea

Makefile

@@ -1,6 +1,7 @@
 .PHONY: *
 
 TSC_SCRIPT_FLAGS = --lib es2020 ./src/extern/qt.d.ts
+VERSION = $(shell grep '"Version":' ./package/metadata.json | grep -o '[0-9\.]*')
 
 config:
 	mkdir -p ./package/contents/config
@@ -15,8 +16,8 @@ install: build config
 uninstall:
 	kpackagetool5 --type=KWin/Script -r ./package
 
-package:
+package: build config
-	tar -czf ./karousel.tar.gz ./package
+	tar -czf ./karousel_${subst .,_,${VERSION}}.tar.gz ./package --transform s/package/karousel/
 
 logs:
 	journalctl -t kwin_x11 -g '^qml:|^file://.*karousel' -f

README.md

@@ -13,9 +13,16 @@ unprompted reflow of window content.
 Windows are automatically centered when possible. And when running out of width, windows can be
 scrolled through horizontally.
 
-Similar window managers include [PaperWM](https://github.com/paperwm/PaperWM) and
+Similar window managers include [PaperWM](https://github.com/paperwm/PaperWM),
+[Niri](https://github.com/YaLTeR/niri), and
 [Cardboard](https://gitlab.com/cardboardwm/cardboard).
 
+## Dependencies
+Karousel requires the following QML modules:
+- QtQuick 2.15
+- org.kde.kwin 3.0
+- org.kde.notification 1.0
+
 ## Limitations
 - Doesn't support multiple screens
 - Doesn't support windows on all desktops
@@ -39,13 +46,14 @@ Here's the default ones:
 | Meta+Shift+S             | Move window down                                                                                                               |
 | Meta+Shift+Home          | Move window to start                                                                                                           |
 | Meta+Shift+End           | Move window to end                                                                                                             |
-| Meta+X                   | Toggle stacked layout for focused column                                                                                       |
+| Meta+X                   | Toggle stacked layout for focused column (One window in the column visible, others shaded; not supported on Wayland)           |
 | Meta+Ctrl+Shift+A        | Move column left                                                                                                               |
 | Meta+Ctrl+Shift+D        | Move column right                                                                                                              |
 | Meta+Ctrl+Shift+Home     | Move column to start                                                                                                           |
 | Meta+Ctrl+Shift+End      | Move column to end                                                                                                             |
 | Meta+Ctrl++              | Increase column width                                                                                                          |
 | Meta+Ctrl+-              | Decrease column width                                                                                                          |
+| Meta+Ctrl+X              | Equalize widths of visible columns                                                                                             |
 | Meta+Alt+Return          | Center focused window (Scrolls so that the focused window is centered in the screen)                                           |
 | Meta+Alt+A               | Scroll one column to the left                                                                                                  |
 | Meta+Alt+D               | Scroll one column to the right                                                                                                 |

generators/config/kcfg.ts

@@ -5,9 +5,20 @@ console.log(`<?xml version="1.0" encoding="UTF-8"?>
 
 for (const entry of configDef) {
     console.log(`        <entry name="${entry.name}" type="${entry.type}">
-            <default>${entry.default}</default>
+            <default>${escapeXml(entry.default)}</default>
         </entry>`);
 }
 
 console.log(`    </group>
 </kcfg>`);
+
+function escapeXml(input: any) {
+    if (typeof input === "string") {
+        return input
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;');
+    } else {
+        return input;
+    }
+}

generators/docs/keyBindings.ts

@@ -21,7 +21,7 @@ function formatComment(comment: string | undefined) {
 
 function printCols(...columns: (string[] | string)[]) {
     const nCols = columns.length;
-    if (nCols == 0) {
+    if (nCols === 0) {
         return;
     }
 
@@ -30,7 +30,7 @@ function printCols(...columns: (string[] | string)[]) {
     ).map(
         (column: string[] | string) => column.length
     ));
-    if (nRows == Infinity) {
+    if (nRows === Infinity) {
         // we only have single string columns
         nRows = 1;
     }

package/contents/ui/config.ui

@@ -11,12 +11,141 @@
         <layout class="QVBoxLayout" name="layout_main">
             <item>
                 <widget class="QTabWidget" name="tabContainer">
-                    <widget class="QWidget" name="tab_general">
+                    <widget class="QWidget" name="tab_behavior">
                         <attribute name="title">
-                            <string>General</string>
+                            <string>Behavior</string>
                         </attribute>
-                        <layout class="QFormLayout" name="layout_tab_general">
+                        <layout class="QVBoxLayout">
+                            <item>
+                                <widget class="QGroupBox">
+                                    <property name="flat">
+                                        <bool>true</bool>
+                                    </property>
+                                    <layout class="QVBoxLayout">
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_untileOnDrag">
+                                                <property name="text">
+                                                    <string>Un-tile windows by dragging them</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_stackColumnsByDefault">
+                                                <property name="text">
+                                                    <string>Stack columns by default</string>
+                                                </property>
+                                                <property name="toolTip">
+                                                    <string>New columns start in stacked mode (one window in the column visible, others shaded). Not supported on Wayland.</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_resizeNeighborColumn">
+                                                <property name="text">
+                                                    <string>Resize neighbor column on edge resize</string>
+                                                </property>
+                                                <property name="toolTip">
+                                                    <string>When resizing a column by dragging its edge, also inversely resize the column on the other side of the edge</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_reMaximize">
+                                                <property name="text">
+                                                    <string>Re-maximize tiled windows</string>
+                                                </property>
+                                                <property name="toolTip">
+                                                    <string>Restore maximized and full-screen states of tiled windows on focus</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_skipSwitcher">
+                                                <property name="text">
+                                                    <string>Tiled windows skip switcher</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                    </layout>
+                                </widget>
+                            </item>
 
+                            <item>
+                                <widget class="QGroupBox">
+                                    <property name="title">
+                                        <string>Scrolling mode</string>
+                                    </property>
+                                    <layout class="QVBoxLayout">
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_scrollingLazy">
+                                                <property name="text">
+                                                    <string>Only scroll as necessary</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_scrollingCentered">
+                                                <property name="text">
+                                                    <string>Center focused column</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_scrollingGrouped">
+                                                <property name="text">
+                                                    <string>Center visible columns</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                    </layout>
+                                </widget>
+                            </item>
+
+                            <item>
+                                <widget class="QGroupBox">
+                                    <property name="title">
+                                        <string>Layering mode</string>
+                                    </property>
+                                    <layout class="QVBoxLayout">
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_tiledKeepBelow">
+                                                <property name="text">
+                                                    <string>Keep tiled windows below</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_floatingKeepAbove">
+                                                <property name="text">
+                                                    <string>Keep floating windows above</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                    </layout>
+                                </widget>
+                            </item>
+
+                            <item>
+                                <spacer name="spacer_footer">
+                                    <property name="orientation">
+                                        <enum>Qt::Vertical</enum>
+                                    </property>
+                                    <property name="sizeHint" stdset="0">
+                                        <size>
+                                            <width>0</width>
+                                            <height>0</height>
+                                        </size>
+                                    </property>
+                                </spacer>
+                            </item>
+                        </layout>
+                    </widget>
+
+                    <widget class="QWidget" name="tab_parameters">
+                        <attribute name="title">
+                            <string>Parameters</string>
+                        </attribute>
+                        <layout class="QFormLayout">
                             <item row="0" column="0">
                                 <widget class="QLabel" name="label_gapsOuterTop">
                                     <property name="text">
@@ -144,34 +273,13 @@
                             </item>
 
                             <item row="6" column="0">
-                                <widget class="QLabel" name="label_overscroll">
-                                    <property name="text">
-                                        <string>Overscroll amount:</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="6" column="1">
-                                <widget class="QSpinBox" name="kcfg_overscroll">
-                                    <property name="suffix">
-                                        <string> px</string>
-                                    </property>
-                                    <property name="maximum">
-                                        <number>999</number>
-                                    </property>
-                                    <property name="value">
-                                        <number>0</number>
-                                    </property>
-                                </widget>
-                            </item>
-
-                            <item row="7" column="0">
                                 <widget class="QLabel" name="label_manualScrollStep">
                                     <property name="text">
                                         <string>Manual scroll step size:</string>
                                     </property>
                                 </widget>
                             </item>
-                            <item row="7" column="1">
+                            <item row="6" column="1">
                                 <widget class="QSpinBox" name="kcfg_manualScrollStep">
                                     <property name="suffix">
                                         <string> px</string>
@@ -185,112 +293,55 @@
                                 </widget>
                             </item>
 
+                            <item row="7" column="0">
+                                <widget class="QLabel" name="label_manualResizeStep">
+                                    <property name="text">
+                                        <string>Manual resize step size:</string>
+                                    </property>
+                                </widget>
+                            </item>
+                            <item row="7" column="1">
+                                <widget class="QSpinBox" name="kcfg_manualResizeStep">
+                                    <property name="suffix">
+                                        <string> px</string>
+                                    </property>
+                                    <property name="maximum">
+                                        <number>999</number>
+                                    </property>
+                                    <property name="value">
+                                        <number>0</number>
+                                    </property>
+                                </widget>
+                            </item>
+
+                            <item row="8" column="0">
+                                <widget class="QLabel" name="label_offScreenOpacity">
+                                    <property name="text">
+                                        <string>Obscured window opacity:</string>
+                                    </property>
+                                </widget>
+                            </item>
                             <item row="8" column="1">
-                                <spacer name="separator_behavior">
+                                <widget class="QSpinBox" name="kcfg_offScreenOpacity">
-                                    <property name="orientation">
+                                    <property name="suffix">
-                                        <enum>Qt::Vertical</enum>
+                                        <string> %</string>
                                     </property>
-                                    <property name="sizeType">
+                                    <property name="maximum">
-                                        <enum>QSizePolicy::Fixed</enum>
+                                        <number>100</number>
                                     </property>
-                                    <property name="sizeHint" stdset="0">
+                                    <property name="value">
-                                        <size>
+                                        <number>0</number>
-                                            <width>0</width>
-                                            <height>12</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </item>
-                            <item row="9" column="0">
-                                <widget class="QLabel" name="label_behavior">
-                                    <property name="text">
-                                        <string>Behavior:</string>
                                     </property>
                                 </widget>
                             </item>
-                            <item row="9" column="1">
-                                <widget class="QCheckBox" name="kcfg_untileOnDrag">
-                                    <property name="text">
-                                        <string>Un-tile windows by dragging them</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="10" column="1">
-                                <widget class="QCheckBox" name="kcfg_stackColumnsByDefault">
-                                    <property name="text">
-                                        <string>Stack columns by default</string>
-                                    </property>
-                                    <property name="toolTip">
-                                        <string>New columns start in stacked mode</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="11" column="1">
-                                <widget class="QCheckBox" name="kcfg_resizeNeighborColumn">
-                                    <property name="text">
-                                        <string>Resize neighbor column on edge resize</string>
-                                    </property>
-                                    <property name="toolTip">
-                                        <string>When resizing a column by dragging its edge, also inversely resize the column on the other side of the edge</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="12" column="1">
-                                <widget class="QCheckBox" name="kcfg_reMaximize">
-                                    <property name="text">
-                                        <string>Re-maximize tiled windows</string>
-                                    </property>
-                                    <property name="toolTip">
-                                        <string>Restore maximized and full-screen states of tiled windows on focus</string>
-                                    </property>
-                                </widget>
-                            </item>
-
-                            <item row="13" column="1">
-                                <spacer name="separator_layering">
-                                    <property name="orientation">
-                                        <enum>Qt::Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>QSizePolicy::Fixed</enum>
-                                    </property>
-                                    <property name="sizeHint" stdset="0">
-                                        <size>
-                                            <width>0</width>
-                                            <height>12</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </item>
-                            <item row="14" column="0">
-                                <widget class="QLabel" name="label_layering">
-                                    <property name="text">
-                                        <string>Layering mode:</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="14" column="1">
-                                <widget class="QRadioButton" name="kcfg_tiledKeepBelow">
-                                    <property name="text">
-                                        <string>Keep tiled windows below</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="15" column="1">
-                                <widget class="QRadioButton" name="kcfg_floatingKeepAbove">
-                                    <property name="text">
-                                        <string>Keep floating windows above</string>
-                                    </property>
-                                </widget>
-                            </item>
-
                         </layout>
                     </widget>
+
                     <widget class="QWidget" name="tab_windowRules">
                         <attribute name="title">
                             <string>Window Rules</string>
                         </attribute>
-                        <layout class="QVBoxLayout" name="layout_tab_windowRules">
+                        <layout class="QVBoxLayout">
                             <item>
                                 <widget class="QPlainTextEdit" name="kcfg_windowRules">
                                     <property name="tabChangesFocus">

package/metadata.json

@@ -1,7 +1,7 @@
 {
     "KPlugin": {
         "Name": "Karousel",
-        "Description": "Manual columnar tiling extension for KWin",
+        "Description": "Scrollable tiling extension for KWin",
         "Icon": "preferences-system-windows",
         "Authors": [{
             "Email": "peter.fajdiga@gmail.com",
@@ -9,7 +9,7 @@
         }],
         "Id": "karousel",
         "ServiceTypes": ["KWin/Script"],
-        "Version": "0.5",
+        "Version": "0.7.2",
         "License": "GPLv3",
         "Website": "https://github.com/peterfajdiga/karousel",
         "BugReportUrl": "https://github.com/peterfajdiga/karousel/issues"

src/Actions.ts

@@ -2,7 +2,7 @@ namespace Actions {
     export function init(world: World, config: Config) {
         return {
             focusLeft: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const prevColumn = grid.getPrevColumn(column);
                     if (prevColumn === null) {
                         return;
@@ -12,7 +12,7 @@ namespace Actions {
             },
 
             focusRight: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const nextColumn = grid.getNextColumn(column);
                     if (nextColumn === null) {
                         return;
@@ -22,7 +22,7 @@ namespace Actions {
             },
 
             focusUp: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const prevWindow = column.getPrevWindow(window);
                     if (prevWindow === null) {
                         return;
@@ -32,7 +32,7 @@ namespace Actions {
             },
 
             focusDown: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const nextWindow = column.getNextWindow(window);
                     if (nextWindow === null) {
                         return;
@@ -64,7 +64,7 @@ namespace Actions {
             },
 
             windowMoveLeft: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     if (column.getWindowCount() === 1) {
                         // move from own column into existing column
                         const prevColumn = grid.getPrevColumn(column);
@@ -82,7 +82,7 @@ namespace Actions {
             },
 
             windowMoveRight: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     if (column.getWindowCount() === 1) {
                         // move from own column into existing column
                         const nextColumn = grid.getNextColumn(column);
@@ -101,27 +101,27 @@ namespace Actions {
 
             windowMoveUp: () => {
                 // TODO (optimization): only arrange moved windows
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveWindowUp(window);
                 });
             },
 
             windowMoveDown: () => {
                 // TODO (optimization): only arrange moved windows
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveWindowDown(window);
                 });
             },
 
             windowMoveStart: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const newColumn = new Column(grid, null);
                     window.moveToColumn(newColumn);
                 });
             },
 
             windowMoveEnd: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const newColumn = new Column(grid, grid.getLastColumn());
                     window.moveToColumn(newColumn);
                 });
@@ -135,44 +135,50 @@ namespace Actions {
             },
 
             columnMoveLeft: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     grid.moveColumnLeft(column);
                 });
             },
 
             columnMoveRight: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     grid.moveColumnRight(column);
                 });
             },
 
             columnMoveStart: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveAfter(null);
                 });
             },
 
             columnMoveEnd: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveAfter(grid.getLastColumn());
                 });
             },
 
             columnToggleStacked: () => {
-                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(false, (clientManager, desktopManager, window, column, grid) => {
                     column.toggleStacked();
                 });
             },
 
             columnWidthIncrease: () => {
-                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(false, (clientManager, desktopManager, window, column, grid) => {
-                    grid.increaseColumnWidth(column);
+                    config.columnResizer.increaseWidth(column, config.manualResizeStep);
                 });
             },
 
             columnWidthDecrease: () => {
-                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(false, (clientManager, desktopManager, window, column, grid) => {
-                    grid.decreaseColumnWidth(column);
+                    config.columnResizer.decreaseWidth(column, config.manualResizeStep);
+                });
+            },
+
+            columnsWidthEqualize: () => {
+                world.do((clientManager, desktopManager) => {
+                    desktopManager.getCurrentDesktop().equalizeVisibleColumnsWidths();
                 });
             },
 
@@ -207,15 +213,15 @@ namespace Actions {
             },
 
             gridScrollFocused: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
-                    grid.desktop.scrollCenterColumn(column);
+                    grid.desktop.scrollCenterRange(column);
                 })
             },
 
             gridScrollLeftColumn: () => {
                 world.do((clientManager, desktopManager) => {
                     const grid = desktopManager.getCurrentDesktop().grid;
-                    const column = grid.getLeftmostVisibleColumn(grid.desktop.getCurrentScrollPos(), true);
+                    const column = grid.getLeftmostVisibleColumn(grid.desktop.getCurrentVisibleRange(), true);
                     if (column === null) {
                         return;
                     }
@@ -232,7 +238,7 @@ namespace Actions {
             gridScrollRightColumn: () => {
                 world.do((clientManager, desktopManager) => {
                     const grid = desktopManager.getCurrentDesktop().grid;
-                    const column = grid.getRightmostVisibleColumn(grid.desktop.getCurrentScrollPos(), true);
+                    const column = grid.getRightmostVisibleColumn(grid.desktop.getCurrentVisibleRange(), true);
                     if (column === null) {
                         return;
                     }
@@ -255,17 +261,17 @@ namespace Actions {
                     const grid = desktopManager.getCurrentDesktop().grid;
                     const targetColumn = grid.getColumnAtIndex(columnIndex);
                     if (targetColumn === null) {
-                        return null;
+                        return;
                     }
                     targetColumn.focus();
                 });
             },
 
             windowMoveToColumn: (columnIndex: number) => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const targetColumn = grid.getColumnAtIndex(columnIndex);
                     if (targetColumn === null) {
-                        return null;
+                        return;
                     }
                     window.moveToColumn(targetColumn);
                     grid.desktop.autoAdjustScroll();
@@ -273,10 +279,10 @@ namespace Actions {
             },
 
             columnMoveToColumn: (columnIndex: number) => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const targetColumn = grid.getColumnAtIndex(columnIndex);
                     if (targetColumn === null || targetColumn === column) {
-                        return null;
+                        return;
                     }
                     if (targetColumn.isAfter(column)) {
                         column.moveAfter(targetColumn);
@@ -319,5 +325,12 @@ namespace Actions {
 
     export type Config = {
         manualScrollStep: number,
+        manualResizeStep: number,
+        columnResizer: ColumnResizer,
     };
+
+    export type ColumnResizer = {
+        increaseWidth(column: Column, step: number): void,
+        decreaseWidth(column: Column, step: number): void,
+    }
 }

src/ClientAreaOption.ts

@@ -1,10 +0,0 @@
-enum ClientAreaOption {
-    PlacementArea,
-    MovementArea,
-    MaximizeArea,
-    MaximizeFullArea,
-    FullScreenArea,
-    WorkArea,
-    FullArea,
-    ScreenArea,
-}

src/behavior/columnResizer/ContextualResizer.ts

@@ -0,0 +1,96 @@
+class ContextualResizer {
+    public increaseWidth(column: Column, step: number) {
+        const grid = column.grid;
+        const desktop = grid.desktop;
+        const visibleRange = desktop.getCurrentVisibleRange();
+        if(!column.isVisible(visibleRange, true) || column.getWidth() >= column.getMaxWidth()) {
+            return;
+        }
+
+        let leftVisibleColumn = grid.getLeftmostVisibleColumn(visibleRange, true);
+        let rightVisibleColumn = grid.getRightmostVisibleColumn(visibleRange, true);
+        if (leftVisibleColumn === null || rightVisibleColumn === null) {
+            console.assert(false); // should at least see self
+            return;
+        }
+
+        const leftSpace = leftVisibleColumn.getLeft() - visibleRange.getLeft();
+        const rightSpace = visibleRange.getRight() - rightVisibleColumn.getRight();
+
+        const newWidth = ContextualResizer.findNextStep(
+            [
+                visibleRange.getWidth(),
+                column.getWidth() + step,
+                column.getWidth() + leftSpace + rightSpace,
+                column.getWidth() + leftSpace + rightSpace + leftVisibleColumn.getWidth() + grid.config.gapsInnerHorizontal,
+                column.getWidth() + leftSpace + rightSpace + rightVisibleColumn.getWidth() + grid.config.gapsInnerHorizontal,
+            ],
+            width => width - column.getWidth(),
+        )
+        if (newWidth === undefined) {
+            return;
+        }
+
+        column.setWidth(newWidth, true);
+        desktop.scrollCenterVisible(column);
+    }
+
+    public decreaseWidth(column: Column, step: number) {
+        const grid = column.grid;
+        const desktop = grid.desktop;
+        const visibleRange = desktop.getCurrentVisibleRange();
+        if(!column.isVisible(visibleRange, true) || column.getWidth() <= column.getMinWidth()) {
+            return;
+        }
+
+        const leftVisibleColumn = grid.getLeftmostVisibleColumn(visibleRange, true);
+        const rightVisibleColumn = grid.getRightmostVisibleColumn(visibleRange, true);
+        if (leftVisibleColumn === null || rightVisibleColumn === null) {
+            console.assert(false); // should at least see self
+            return;
+        }
+
+        let leftOffScreenColumn = grid.getPrevColumn(leftVisibleColumn);
+        if (leftOffScreenColumn === column) {
+            leftOffScreenColumn = null;
+        }
+        let rightOffScreenColumn = grid.getNextColumn(rightVisibleColumn);
+        if (rightOffScreenColumn === column) {
+            rightOffScreenColumn = null;
+        }
+
+        const visibleColumnsWidth = rightVisibleColumn.getRight() - leftVisibleColumn.getLeft();
+        const unusedWidth = visibleRange.getWidth() - visibleColumnsWidth;
+        const leftOffScreen = leftOffScreenColumn === null ? 0 : leftOffScreenColumn.getWidth() + grid.config.gapsInnerHorizontal - unusedWidth;
+        const rightOffScreen = rightOffScreenColumn === null ? 0 : rightOffScreenColumn.getWidth() + grid.config.gapsInnerHorizontal - unusedWidth;
+
+        const newWidth = ContextualResizer.findNextStep(
+            [
+                visibleRange.getWidth(),
+                column.getWidth() - step,
+                column.getWidth() - leftOffScreen,
+                column.getWidth() - rightOffScreen,
+            ],
+            width => column.getWidth() - width,
+        )
+        if (newWidth === undefined) {
+            return;
+        }
+
+        column.setWidth(newWidth, true);
+        desktop.scrollCenterVisible(column);
+    }
+
+    private static findNextStep(steps: number[], evaluate: (step: number) => number) {
+        let bestScore = Infinity;
+        let bestStep = undefined;
+        for (const step of steps) {
+            const score = evaluate(step);
+            if (score > 0 && score < bestScore) {
+                bestScore = score;
+                bestStep = step;
+            }
+        }
+        return bestStep;
+    }
+}

src/behavior/columnResizer/RawResizer.ts

@@ -0,0 +1,9 @@
+class RawResizer {
+    public increaseWidth(column: Column, step: number) {
+        column.adjustWidth(step, true);
+    }
+
+    public decreaseWidth(column: Column, step: number) {
+        column.adjustWidth(-step, true);
+    }
+}

src/behavior/scrollClamper/CenterClamper.ts

@@ -0,0 +1,13 @@
+class CenterClamper {
+    public clampScrollX(desktop: Desktop, x: number) {
+        const firstColumn = desktop.grid.getFirstColumn();
+        if (firstColumn === null) {
+            return 0;
+        }
+        const lastColumn = desktop.grid.getLastColumn()!;
+
+        let minScroll = Math.round((firstColumn.getWidth() - desktop.tilingArea.width) / 2);
+        let maxScroll = Math.round(desktop.grid.getWidth() - (desktop.tilingArea.width + lastColumn.getWidth()) / 2);
+        return clamp(x, minScroll, maxScroll);
+    }
+}

src/behavior/scrollClamper/EdgeClamper.ts

@@ -0,0 +1,10 @@
+class EdgeClamper {
+    public clampScrollX(desktop: Desktop, x: number) {
+        let minScroll = 0;
+        let maxScroll = desktop.grid.getWidth() - desktop.tilingArea.width;
+        if (maxScroll < 0) {
+            return Math.round(maxScroll / 2);
+        }
+        return clamp(x, minScroll, maxScroll);
+    }
+}

src/behavior/scroller/CenteredScroller.ts

@@ -0,0 +1,5 @@
+class CenteredScroller {
+    public scrollToColumn(desktop: Desktop, column: Column) {
+        desktop.scrollCenterRange(column);
+    }
+}

src/behavior/scroller/GroupedScroller.ts

@@ -0,0 +1,5 @@
+class GroupedScroller {
+    public scrollToColumn(desktop: Desktop, column: Column) {
+        desktop.scrollCenterVisible(column);
+    }
+}

src/behavior/scroller/LazyScroller.ts

@@ -0,0 +1,5 @@
+class LazyScroller {
+    public scrollToColumn(desktop: Desktop, column: Column) {
+        desktop.scrollIntoView(column);
+    }
+}

src/config/config.ts

@@ -5,12 +5,17 @@ type Config = {
     gapsOuterRight: number,
     gapsInnerHorizontal: number,
     gapsInnerVertical: number,
-    overscroll: number,
     manualScrollStep: number,
+    manualResizeStep: number,
+    offScreenOpacity: number,
     untileOnDrag: boolean,
     stackColumnsByDefault: boolean,
     resizeNeighborColumn: boolean,
     reMaximize: boolean,
+    skipSwitcher: boolean,
+    scrollingLazy: boolean,
+    scrollingCentered: boolean,
+    scrollingGrouped: boolean,
     tiledKeepBelow: boolean,
     floatingKeepAbove: boolean,
     windowRules: string,

src/config/definition.ts

@@ -7,26 +7,45 @@ const defaultWindowRules = `[
         "class": "kcalc",
         "tile": false
     },
+    {
+        "class": "org.kde.kcalc",
+        "tile": false
+    },
     {
         "class": "kfind",
         "tile": true
     },
+    {
+        "class": "org.kde.kfind",
+        "tile": true
+    },
     {
         "class": "kruler",
         "tile": false
     },
+    {
+        "class": "org.kde.kruler",
+        "tile": false
+    },
     {
         "class": "krunner",
         "tile": false
     },
     {
-        "class": "zoom",
+        "class": "org.kde.krunner",
-        "caption": "Zoom Cloud Meetings",
+        "tile": false
+    },
+    {
+        "class": "yakuake",
+        "tile": false
+    },
+    {
+        "class": "org.kde.yakuake",
         "tile": false
     },
     {
         "class": "zoom",
-        "caption": "zoom",
+        "caption": "Zoom Cloud Meetings|zoom|zoom <2>",
         "tile": false
     },
     {
@@ -53,78 +72,103 @@ const defaultWindowRules = `[
 
 const configDef = [
     {
-        "name": "gapsOuterTop",
+        name: "gapsOuterTop",
-        "type": "UInt",
+        type: "UInt",
-        "default": 18
+        default: 18,
     },
     {
-        "name": "gapsOuterBottom",
+        name: "gapsOuterBottom",
-        "type": "UInt",
+        type: "UInt",
-        "default": 18
+        default: 18,
     },
     {
-        "name": "gapsOuterLeft",
+        name: "gapsOuterLeft",
-        "type": "UInt",
+        type: "UInt",
-        "default": 18
+        default: 18,
     },
     {
-        "name": "gapsOuterRight",
+        name: "gapsOuterRight",
-        "type": "UInt",
+        type: "UInt",
-        "default": 18
+        default: 18,
     },
     {
-        "name": "gapsInnerHorizontal",
+        name: "gapsInnerHorizontal",
-        "type": "UInt",
+        type: "UInt",
-        "default": 18
+        default: 18,
     },
     {
-        "name": "gapsInnerVertical",
+        name: "gapsInnerVertical",
-        "type": "UInt",
+        type: "UInt",
-        "default": 18
+        default: 18,
     },
     {
-        "name": "overscroll",
+        name: "manualScrollStep",
-        "type": "UInt",
+        type: "UInt",
-        "default": 0
+        default: 200,
     },
     {
-        "name": "manualScrollStep",
+        name: "manualResizeStep",
-        "type": "UInt",
+        type: "UInt",
-        "default": 200
+        default: 600,
     },
     {
-        "name": "untileOnDrag",
+        name: "offScreenOpacity",
-        "type": "Bool",
+        type: "UInt",
-        "default": true
+        default: 100,
     },
     {
-        "name": "stackColumnsByDefault",
+        name: "untileOnDrag",
-        "type": "Bool",
+        type: "Bool",
-        "default": false
+        default: true,
     },
     {
-        "name": "resizeNeighborColumn",
+        name: "stackColumnsByDefault",
-        "type": "Bool",
+        type: "Bool",
-        "default": false
+        default: false,
     },
     {
-        "name": "reMaximize",
+        name: "resizeNeighborColumn",
-        "type": "Bool",
+        type: "Bool",
-        "default": false
+        default: false,
     },
     {
-        "name": "tiledKeepBelow",
+        name: "reMaximize",
-        "type": "Bool",
+        type: "Bool",
-        "default": true
+        default: false,
     },
     {
-        "name": "floatingKeepAbove",
+        name: "skipSwitcher",
-        "type": "Bool",
+        type: "Bool",
-        "default": false
+        default: false,
     },
     {
-        "name": "windowRules",
+        name: "scrollingLazy",
-        "type": "String",
+        type: "Bool",
-        "default": defaultWindowRules
+        default: true,
+    },
+    {
+        name: "scrollingCentered",
+        type: "Bool",
+        default: false,
+    },
+    {
+        name: "scrollingGrouped",
+        type: "Bool",
+        default: false,
+    },
+    {
+        name: "tiledKeepBelow",
+        type: "Bool",
+        default: true,
+    },
+    {
+        name: "floatingKeepAbove",
+        type: "Bool",
+        default: false,
+    },
+    {
+        name: "windowRules",
+        type: "String",
+        default: defaultWindowRules,
     }
 ];

src/extern/kwin.d.ts

@@ -1,42 +1,47 @@
 declare const KWin: {
-    // Functions
     readConfig(key: string, defaultValue: any): any;
     registerShortcut(name: string, description: string, keySequence: string, callback: () => void): void;
 };
 
 declare const workspace: {
-    // Read-write Properties
     readonly desktops: number;
     readonly currentDesktop: number;
     readonly currentActivity: string;
 
-    // Read-write Properties
     activeClient: KwinClient;
 
-    // Signals
+    readonly currentDesktopChanged: QSignal<[]>
-    currentDesktopChanged: QSignal<[oldDesktopNumber: number]>
+    readonly clientAdded: QSignal<[KwinClient]>;
-    clientAdded: QSignal<[KwinClient]>;
+    readonly clientRemoved: QSignal<[KwinClient]>;
-    clientRemoved: QSignal<[KwinClient]>;
+    readonly clientMinimized: QSignal<[KwinClient]>;
-    clientMinimized: QSignal<[KwinClient]>;
+    readonly clientUnminimized: QSignal<[KwinClient]>;
-    clientUnminimized: QSignal<[KwinClient]>;
+    readonly clientMaximizeSet: QSignal<[KwinClient, horizontally: boolean, vertically: boolean]>;
-    clientMaximizeSet: QSignal<[KwinClient, horizontally: boolean, vertically: boolean]>;
+    readonly clientActivated: QSignal<[KwinClient]>;
-    clientActivated: QSignal<[KwinClient]>;
+    readonly numberDesktopsChanged: QSignal<[]>;
-    numberDesktopsChanged: QSignal<[oldNumberOfVirtualDesktops: number]>;
+    readonly currentActivityChanged: QSignal<[]>;
-    currentActivityChanged: QSignal<[newActivity: string]>;
+    readonly virtualScreenSizeChanged: QSignal<[]>;
-    virtualScreenSizeChanged: QSignal<[void]>;
 
-    // Functions
     clientArea(option: ClientAreaOption, screenNumber: number, desktopNumber: number);
     clientList(): KwinClient[];
 };
 
-type Tile = any;
+const enum ClientAreaOption {
+    PlacementArea,
+    MovementArea,
+    MaximizeArea,
+    MaximizeFullArea,
+    FullScreenArea,
+    WorkArea,
+    FullArea,
+    ScreenArea,
+}
+
+type Tile = unknown;
 
 interface KwinClient {
-    // Read-only Properties
     readonly shadeable: boolean;
     readonly caption: string;
-    readonly minSize: QSize;
+    readonly minSize: QmlSize;
     readonly transient: boolean;
     readonly transientFor: KwinClient;
     readonly move: boolean;
@@ -48,28 +53,27 @@ interface KwinClient {
     readonly normalWindow: boolean;
     readonly managed: boolean;
 
-    // Read-write Properties
+    opacity: number;
     fullScreen: boolean;
     activities: string[]; // empty array means all activities
+    skipSwitcher: boolean;
     keepAbove: boolean;
     keepBelow: boolean;
     shade: boolean;
     minimized: boolean;
-    frameGeometry: QRect;
+    frameGeometry: QmlRect;
     desktop: number; // -1 means all desktops
     tile: Tile;
 
-    // Signals
+    readonly fullScreenChanged: QSignal<[]>;
-    fullScreenChanged: QSignal<[void]>;
+    readonly desktopChanged: QSignal<[]>;
-    desktopChanged: QSignal<[void]>;
+    readonly activitiesChanged: QSignal<[]>;
-    activitiesChanged: QSignal<[KwinClient]>;
+    readonly captionChanged: QSignal<[]>;
-    captionChanged: QSignal<[void]>;
+    readonly tileChanged: QSignal<[]>;
-    tileChanged: QSignal<[Tile]>;
+    readonly moveResizedChanged: QSignal<[]>;
-    moveResizedChanged: QSignal<[void]>;
+    readonly moveResizeCursorChanged: QSignal<[]>;
-    moveResizeCursorChanged: QSignal<[void]>;
+    readonly clientStartUserMovedResized: QSignal<[]>;
-    clientStartUserMovedResized: QSignal<[void]>;
+    readonly frameGeometryChanged: QSignal<[KwinClient, oldGeometry: QmlRect]>;
-    frameGeometryChanged: QSignal<[KwinClient, oldGeometry: QRect]>;
 
-    // Functions
     setMaximize(vertically: boolean, horizontally: boolean): void;
 }

src/extern/qt.d.ts

@@ -1,10 +1,11 @@
 declare const console: {
     log(...args: any[]);
+    trace();
     assert(boolean);
 };
 
 declare const Qt: {
-    rect(x: number, y: number, width: number, height: number): QRect;
+    rect(x: number, y: number, width: number, height: number): QmlRect;
     createQmlObject(qml: string, parent: QmlObject);
 };
 
@@ -12,18 +13,18 @@ type QmlObject = unknown;
 
 type QByteArray = string;
 
-type QRect = {
+type QmlRect = {
     x: number;
     y: number;
     width: number;
     height: number;
     top: number;
-    bottom: number;
+    bottom: number; // top + height
     left: number;
-    right: number;
+    right: number; // left + width
 };
 
-type QSize = {
+type QmlSize = {
     width: number;
     height: number;
 };
@@ -33,9 +34,9 @@ type QSignal<T extends unknown[]> = {
     disconnect(handler: (...args: [...T]) => void): void;
 };
 
-type QQmlTimer = {
+type QmlTimer = {
     interval: number;
-    triggered: QSignal<[void]>;
+    readonly triggered: QSignal<[]>;
     restart(): void;
     destroy(): void;
 };

src/keyBindings/definition.ts

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

src/keyBindings/loader.ts

@@ -53,7 +53,12 @@ function registerNumKeyBindings(name: string, description: string, modifiers: st
 }
 
 function registerKeyBindings(world: World, config: Config) {
-    const actions = Actions.init(world, config);
+    const actions = Actions.init(world, {
+        manualScrollStep: config.manualScrollStep,
+        manualResizeStep: config.manualResizeStep,
+        columnResizer: config.scrollingCentered ? new RawResizer() : new ContextualResizer(),
+    });
+
     for (const binding of keyBindings) {
         registerKeyBinding(binding.name, binding.description, binding.defaultKeySequence, actions[binding.action]);
     }

src/layout/Column.ts

@@ -92,16 +92,17 @@ class Column {
 
     public setWidth(width: number, setPreferred: boolean) {
         width = clamp(width, this.getMinWidth(), this.getMaxWidth());
-        const oldWidth = this.width;
+        if (width === this.width) {
+            return;
+        }
+
         this.width = width;
         if (setPreferred) {
             for (const window of this.windows.iterator()) {
                 window.client.preferredWidth = width;
             }
         }
-        if (width !== oldWidth) {
+        this.grid.onColumnWidthChanged(this);
-            this.grid.onColumnWidthChanged(this, oldWidth, width);
-        }
     }
 
     public adjustWidth(widthDelta: number, setPreferred: boolean) {
@@ -180,7 +181,14 @@ class Column {
         window.focus();
     }
 
-    public arrange(x: number) {
+    public arrange(x: number, visibleRange: Range, forceOpaque: boolean) {
+        if (this.grid.config.offScreenOpacity < 1.0 && !forceOpaque) {
+            const opacity = this.isVisible(visibleRange, true) ? 100 : this.grid.config.offScreenOpacity;
+            for (const window of this.windows.iterator()) {
+                window.client.kwinClient.opacity = opacity;
+            }
+        }
+
         if (this.stacked && this.windows.length() >= 2 && this.canStack()) {
             this.arrangeStacked(x);
             return;
@@ -237,13 +245,13 @@ class Column {
         return true;
     }
 
-    public isVisible(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+    public isVisible(visibleRange: Desktop.Range, fullyVisible: boolean) {
         if (fullyVisible) {
-            return this.getLeft() >= scrollPos.getLeft() &&
+            return this.getLeft() >= visibleRange.getLeft() &&
-                this.getRight() <= scrollPos.getRight();
+                this.getRight() <= visibleRange.getRight();
         } else {
-            return this.getRight() + this.grid.config.gapsInnerHorizontal > scrollPos.getLeft() &&
+            return this.getRight() + this.grid.config.gapsInnerHorizontal > visibleRange.getLeft() &&
-                this.getLeft() - this.grid.config.gapsInnerHorizontal < scrollPos.getRight();
+                this.getLeft() - this.grid.config.gapsInnerHorizontal < visibleRange.getRight();
         }
     }
 

src/layout/Desktop.ts

@@ -5,15 +5,17 @@ class Desktop {
     private readonly config: Desktop.Config;
     private scrollX: number;
     private dirty: boolean;
+    private dirtyScroll: boolean;
     private dirtyPins: boolean;
-    public clientArea: QRect;
+    public clientArea: QmlRect;
-    public tilingArea: QRect;
+    public tilingArea: QmlRect;
 
     constructor(desktopNumber: number, pinManager: PinManager, config: Desktop.Config, layoutConfig: LayoutConfig) {
         this.pinManager = pinManager;
         this.config = config;
         this.scrollX = 0;
         this.dirty = true;
+        this.dirtyScroll = true;
         this.dirtyPins = true;
         this.desktopNumber = desktopNumber;
         this.grid = new Grid(this, layoutConfig);
@@ -29,6 +31,7 @@ class Desktop {
         this.clientArea = newClientArea;
         this.tilingArea = Desktop.getTilingArea(newClientArea, this.desktopNumber, this.pinManager, this.config);
         this.dirty = true;
+        this.dirtyScroll = true;
         this.dirtyPins = false;
         this.grid.onScreenSizeChanged();
         this.autoAdjustScroll();
@@ -38,7 +41,7 @@ class Desktop {
         return workspace.clientArea(ClientAreaOption.PlacementArea, 0, desktopNumber);
     }
 
-    private static getTilingArea(clientArea: QRect, desktopNumber: number, pinManager: PinManager, config: Desktop.Config) {
+    private static getTilingArea(clientArea: QmlRect, desktopNumber: number, pinManager: PinManager, config: Desktop.Config) {
         const availableSpace = pinManager.getAvailableSpace(desktopNumber, clientArea);
         const top = availableSpace.top + config.marginTop;
         const bottom = availableSpace.bottom - config.marginBottom;
@@ -47,102 +50,113 @@ class Desktop {
         return Qt.rect(
             left,
             top,
-            right - left + 1,
+            right - left,
-            bottom - top + 1,
+            bottom - top,
         )
     }
 
-    // calculates Desktop.Pos that scrolls the column into view
+    public scrollIntoView(range: Desktop.Range) {
-    public getScrollPosForColumn(column: Column) {
+        const left = range.getLeft();
-        const left = column.getLeft();
+        const right = range.getRight();
-        const right = column.getRight();
+        const initialVisibleRange = this.getCurrentVisibleRange();
-        const initialScrollPos = this.getCurrentScrollPos();
 
         let targetScrollX: number;
-        if (left < initialScrollPos.getLeft()) {
+        if (left < initialVisibleRange.getLeft()) {
             targetScrollX = left;
-        } else if (right > initialScrollPos.getRight()) {
+        } else if (right > initialVisibleRange.getRight()) {
             targetScrollX = right - this.tilingArea.width;
         } else {
-            return this.getScrollPos(this.clampScrollX(this.scrollX));
+            targetScrollX = initialVisibleRange.getLeft();
         }
 
-        const overscroll = this.getTargetOverscroll(targetScrollX, left < initialScrollPos.getLeft());
+        this.setScroll(targetScrollX, false);
-        return this.getScrollPos(this.clampScrollX(targetScrollX + overscroll));
     }
 
-    private getTargetOverscroll(targetScrollX: number, scrollLeft: boolean) {
+    public scrollCenterRange(range: Desktop.Range) {
-        if (this.config.overscroll === 0) {
+        const windowCenter = range.getLeft() + range.getWidth() / 2;
-            return 0;
-        }
-        const visibleColumnsWidth = this.grid.getVisibleColumnsWidth(this.getScrollPos(targetScrollX), true);
-        const remainingSpace = this.tilingArea.width - visibleColumnsWidth;
-        const overscrollX = Math.min(this.config.overscroll, Math.round(remainingSpace / 2));
-        const direction = scrollLeft ? -1 : 1;
-        return overscrollX * direction;
-    }
-
-    public scrollToColumn(column: Column) {
-        this.setScroll(this.getScrollPosForColumn(column).x, true);
-    }
-
-    public scrollCenterColumn(column: Column) {
-        const windowCenter = column.getLeft() + column.getWidth() / 2;
         const screenCenter = this.scrollX + this.tilingArea.width / 2;
         this.adjustScroll(Math.round(windowCenter - screenCenter), false);
     }
 
+    public scrollCenterVisible(focusedColumn: Column) {
+        const columnRange = new Desktop.ColumnRange(focusedColumn);
+        const visibleRange = this.getCurrentVisibleRange();
+        columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal);
+        this.scrollCenterRange(columnRange);
+    }
+
     public autoAdjustScroll() {
         const focusedColumn = this.grid.getLastFocusedColumn();
-        if (focusedColumn === null) {
+        if (focusedColumn === null || focusedColumn.grid !== this.grid) {
-            this.removeOverscroll();
-            return;
-        }
-
-        if (focusedColumn.grid !== this.grid) {
             return;
         }
 
         this.scrollToColumn(focusedColumn);
     }
 
-    private getScrollPos(scrollX: number) {
+    public scrollToColumn(column: Column) {
-        return new Desktop.ScrollPos(scrollX, this.tilingArea.width);
+        if (this.dirtyScroll || !column.isVisible(this.getCurrentVisibleRange(), true)) {
+            this.config.scroller.scrollToColumn(this, column);
+        }
     }
 
-    public getCurrentScrollPos() {
+    private getVisibleRange(scrollX: number) {
-        return this.getScrollPos(this.scrollX);
+        return new Desktop.RangeImpl(scrollX, this.tilingArea.width);
+    }
+
+    public getCurrentVisibleRange() {
+        return this.getVisibleRange(this.scrollX);
     }
 
     private clampScrollX(x: number) {
-        let minScroll = 0;
+        return this.config.clamper.clampScrollX(this, x);
-        let maxScroll = this.grid.getWidth() - this.tilingArea.width;
-        if (maxScroll < 0) {
-            const centerScroll = Math.round(maxScroll / 2);
-            minScroll = centerScroll;
-            maxScroll = centerScroll;
-        }
-        return clamp(x, minScroll, maxScroll);
     }
 
-    private setScroll(x: number, force: boolean) {
+    public setScroll(x: number, force: boolean) {
         const oldScrollX = this.scrollX;
         this.scrollX = force ? x : this.clampScrollX(x);
         if (this.scrollX !== oldScrollX) {
             this.onLayoutChanged();
         }
-    }
+        this.dirtyScroll = false;
-
-    private applyScrollPos(scrollPos: Desktop.ScrollPos) {
-        this.setScroll(scrollPos.x, true);
     }
 
     public adjustScroll(dx: number, force: boolean) {
         this.setScroll(this.scrollX + dx, force);
     }
 
-    private removeOverscroll() {
+    public equalizeVisibleColumnsWidths() {
-        this.setScroll(this.scrollX, false);
+        const visibleRange = this.getCurrentVisibleRange();
+        const visibleColumns = Array.from(this.grid.getVisibleColumns(visibleRange, true));
+
+        let remainingWidth = this.tilingArea.width - (visibleColumns.length-1) * this.grid.config.gapsInnerHorizontal;
+        let remainingColumns = visibleColumns.length;
+
+        const minWidths = visibleColumns.map(column => column.getMinWidth()).sort((a, b) => b - a);
+        for (const minWidth of minWidths) {
+            if (minWidth > remainingWidth / remainingColumns) {
+                remainingWidth -= minWidth;
+                remainingColumns--;
+            }
+        }
+
+        const avgWidth = remainingWidth / remainingColumns;
+        for (const column of visibleColumns) {
+            const minWidth = column.getMinWidth();
+            if (minWidth > avgWidth) {
+                column.setWidth(minWidth, true);
+            } else {
+                const columnWidth = Math.round(remainingWidth / remainingColumns);
+                column.setWidth(columnWidth, true);
+                remainingWidth -= column.getWidth();
+                remainingColumns--;
+            }
+        }
+
+        this.scrollCenterRange(Desktop.RangeImpl.fromRanges(
+            visibleColumns[0],
+            visibleColumns[visibleColumns.length - 1],
+        ));
     }
 
     public arrange() {
@@ -151,16 +165,18 @@ class Desktop {
         if (!this.dirty) {
             return;
         }
-        this.grid.arrange(this.tilingArea.x - this.scrollX);
+        this.grid.arrange(this.tilingArea.x - this.scrollX, this.getCurrentVisibleRange());
         this.dirty = false;
     }
 
     public onLayoutChanged() {
         this.dirty = true;
+        this.dirtyScroll = true;
     }
 
     public onPinsChanged() {
         this.dirty = true;
+        this.dirtyScroll = true;
         this.dirtyPins = true;
     }
 
@@ -175,12 +191,19 @@ namespace Desktop {
         marginBottom: number,
         marginLeft: number,
         marginRight: number,
-        overscroll: number,
+        scroller: Desktop.Scroller,
+        clamper: Desktop.Clamper,
     };
 
-    export class ScrollPos {
+    export type Range = {
-        public readonly x: number;
+        getLeft(): number;
-        public readonly width: number;
+        getRight(): number;
+        getWidth(): number;
+    }
+
+    export class RangeImpl {
+        private readonly x: number;
+        private readonly width: number;
 
         constructor(x: number, width: number) {
             this.x = x;
@@ -194,5 +217,95 @@ namespace Desktop {
         public getRight() {
             return this.x + this.width;
         }
+
+        public getWidth() {
+            return this.width;
+        }
+
+        public static fromRanges(leftRange: Range, rightRange: Range) {
+            const left = leftRange.getLeft();
+            const right = rightRange.getRight();
+            return new RangeImpl(left, right - left);
+        }
+    }
+
+    export class ColumnRange {
+        private left: Column;
+        private right: Column;
+        private width: number;
+
+        constructor(initialColumn: Column) {
+            this.left = initialColumn;
+            this.right = initialColumn;
+            this.width = initialColumn.getWidth();
+        }
+
+        public addNeighbors(visibleRange: Desktop.Range, gap: number) {
+            const grid = this.left.grid;
+
+            const columnRange = this;
+            function canFit(column: Column) {
+                return columnRange.width + gap + column.getWidth() <= visibleRange.getWidth();
+            }
+            function isUsable(column: Column|null) {
+                return column !== null && canFit(column);
+            }
+
+            let leftColumn = grid.getPrevColumn(this.left);
+            let rightColumn = grid.getNextColumn(this.right);
+            function checkColumns() {
+                if (!isUsable(leftColumn)) {
+                    leftColumn = null;
+                }
+                if (!isUsable(rightColumn)) {
+                    rightColumn = null;
+                }
+            }
+            checkColumns();
+
+            const visibleCenter = visibleRange.getLeft() + visibleRange.getWidth() / 2;
+            while (leftColumn !== null || rightColumn !== null) {
+                const leftToCenter = leftColumn === null ? Infinity : Math.abs(leftColumn.getLeft() - visibleCenter);
+                const rightToCenter = rightColumn === null ? Infinity : Math.abs(rightColumn.getRight() - visibleCenter);
+                if (leftToCenter < rightToCenter) {
+                    this.addLeft(leftColumn!, gap);
+                    leftColumn = grid.getPrevColumn(leftColumn!);
+                } else {
+                    this.addRight(rightColumn!, gap);
+                    rightColumn = grid.getNextColumn(rightColumn!);
+                }
+                checkColumns();
+            }
+        }
+
+        public addLeft(column: Column, gap: number) {
+            this.left = column;
+            this.width += column.getWidth() + gap;
+        }
+
+        public addRight(column: Column, gap: number) {
+            this.right = column;
+            this.width += column.getWidth() + gap;
+        }
+
+        public getLeft() {
+            return this.left.getLeft();
+        }
+
+        public getRight() {
+            return this.right.getRight();
+        }
+
+        public getWidth() {
+            return this.width;
+        }
+    }
+
+    export type Scroller = {
+        scrollToColumn(desktop: Desktop, column: Column): void;
+    }
+
+    export type Clamper = {
+        clampScrollX(desktop: Desktop, x: number): number;
     }
 }

src/layout/Grid.ts

@@ -1,3 +1,5 @@
+import Range = Desktop.Range;
+
 class Grid {
     public readonly desktop: Desktop;
     public readonly config: LayoutConfig;
@@ -41,6 +43,10 @@ class Grid {
         return this.width;
     }
 
+    public isUserResizing() {
+        return this.userResize;
+    }
+
     public getPrevColumn(column: Column) {
         return this.columns.getPrev(column);
     }
@@ -88,39 +94,41 @@ class Grid {
         this.width = x - this.config.gapsInnerHorizontal;
     }
 
-    public getLeftmostVisibleColumn(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+    public getLeftmostVisibleColumn(visibleRange: Desktop.Range, fullyVisible: boolean) {
-        const scrollX = scrollPos.getLeft();
         for (const column of this.columns.iterator()) {
-            const x = fullyVisible ? column.getLeft() : column.getRight() + (this.config.gapsInnerHorizontal - 1);
+            if (column.isVisible(visibleRange, fullyVisible)) {
-            if (x >= scrollX) {
                 return column;
             }
         }
         return null;
     }
 
-    public getRightmostVisibleColumn(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+    public getRightmostVisibleColumn(visibleRange: Desktop.Range, fullyVisible: boolean) {
-        const scrollX = scrollPos.getRight();
         let last = null;
         for (const column of this.columns.iterator()) {
-            const x = fullyVisible ? column.getRight() : column.getLeft() - (this.config.gapsInnerHorizontal - 1);
+            if (column.isVisible(visibleRange, fullyVisible)) {
-            if (x <= scrollX) {
                 last = column;
-            } else {
+            } else if (last !== null) {
                 break;
             }
         }
         return last;
     }
 
-    public getVisibleColumnsWidth(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+    public *getVisibleColumns(visibleRange: Desktop.Range, fullyVisible: boolean) {
+        for (const column of this.columns.iterator()) {
+            if (column.isVisible(visibleRange, fullyVisible)) {
+                yield column;
+            }
+        }
+    }
+
+    public getVisibleColumnsWidth(visibleRange: Desktop.Range, fullyVisible: boolean) {
         let width = 0;
         let nVisible = 0;
-        for (const column of this.columns.iterator()) {
+        for (const column of this.getVisibleColumns(visibleRange, fullyVisible)) {
-            if (column.isVisible(scrollPos, fullyVisible)) {
+            width += column.getWidth();
-                width += column.getWidth();
+            nVisible++;
-                nVisible++;
-            }
         }
 
         if (nVisible > 0) {
@@ -130,84 +138,9 @@ class Grid {
         return width;
     }
 
-    private getLeftOffScreenColumn(scrollPos: Desktop.ScrollPos) {
+    public arrange(x: number, visibleRange: Range) {
-        const leftVisible = this.getLeftmostVisibleColumn(scrollPos, true);
-        if (leftVisible === null) {
-            return null;
-        }
-        return this.getPrevColumn(leftVisible);
-    }
-
-    private getRightOffScreenColumn(scrollPos: Desktop.ScrollPos) {
-        const rightVisible = this.getRightmostVisibleColumn(scrollPos, true);
-        if (rightVisible === null) {
-            return null;
-        }
-        return this.getNextColumn(rightVisible);
-    }
-
-    public increaseColumnWidth(column: Column) {
-        const scrollPos = this.desktop.getScrollPosForColumn(column);
-        if (this.width < scrollPos.width) {
-            column.adjustWidth(scrollPos.width - this.width, true);
-            return;
-        }
-
-        let leftColumn = this.getLeftmostVisibleColumn(scrollPos, false);
-        if (leftColumn === column) {
-            leftColumn = null;
-        }
-        let rightColumn = this.getRightmostVisibleColumn(scrollPos, false);
-        if (rightColumn === column) {
-            rightColumn = null;
-        }
-        if (leftColumn === null && rightColumn === null) {
-            return;
-        }
-
-        const leftVisibleWidth = leftColumn === null ? Infinity : leftColumn.getRight() - scrollPos.getLeft();
-        const rightVisibleWidth = rightColumn === null ? Infinity : scrollPos.getRight() - rightColumn.getLeft();
-        const expandLeft = leftVisibleWidth < rightVisibleWidth;
-        const widthDelta = (expandLeft ? leftVisibleWidth : rightVisibleWidth) + this.config.gapsInnerHorizontal;
-        if (expandLeft) {
-            this.desktop.adjustScroll(widthDelta, false);
-        }
-        column.adjustWidth(widthDelta, true);
-    }
-
-    public decreaseColumnWidth(column: Column) {
-        const scrollPos = this.desktop.getScrollPosForColumn(column);
-        if (this.width <= scrollPos.width) {
-            column.setWidth(Math.round(column.getWidth() / 2), true);
-            return;
-        }
-
-        let leftColumn = this.getLeftOffScreenColumn(scrollPos);
-        if (leftColumn === column) {
-            leftColumn = null;
-        }
-        let rightColumn = this.getRightOffScreenColumn(scrollPos);
-        if (rightColumn === column) {
-            rightColumn = null;
-        }
-        if (leftColumn === null && rightColumn === null) {
-            return;
-        }
-
-        const leftInvisibleWidth = leftColumn === null ? Infinity : scrollPos.getLeft() - leftColumn.getLeft();
-        const rightInvisibleWidth = rightColumn === null ? Infinity : rightColumn.getRight() - scrollPos.getRight();
-        const shrinkLeft = leftInvisibleWidth < rightInvisibleWidth;
-        const widthDelta = (shrinkLeft ? leftInvisibleWidth : rightInvisibleWidth);
-        if (shrinkLeft) {
-            const maxDelta = column.getWidth() - column.getMinWidth();
-            this.desktop.adjustScroll(-Math.min(widthDelta, maxDelta), false);
-        }
-        column.adjustWidth(-widthDelta, true);
-    }
-
-    public arrange(x: number) {
         for (const column of this.columns.iterator()) {
-            column.arrange(x);
+            column.arrange(x, visibleRange, this.userResize);
             x += column.getWidth() + this.config.gapsInnerHorizontal;
         }
 
@@ -239,12 +172,12 @@ class Grid {
         this.columns.remove(column);
         this.columnsSetX(nextColumn);
 
+        this.desktop.onLayoutChanged();
         if (passFocus && columnToFocus !== null) {
             columnToFocus.focus();
         } else {
             this.desktop.autoAdjustScroll();
         }
-        this.desktop.onLayoutChanged();
     }
 
     public onColumnMoved(column: Column, prevColumn: Column|null) {
@@ -256,13 +189,13 @@ class Grid {
         this.desktop.autoAdjustScroll();
     }
 
-    public onColumnWidthChanged(column: Column, oldWidth: number, width: number) {
+    public onColumnWidthChanged(column: Column) {
         const nextColumn = this.columns.getNext(column);
         this.columnsSetX(nextColumn);
+        this.desktop.onLayoutChanged();
         if (!this.userResize) {
             this.desktop.autoAdjustScroll();
         }
-        this.desktop.onLayoutChanged();
     }
 
     public onColumnFocused(column: Column) {

src/layout/LayoutConfig.ts

@@ -1,9 +1,11 @@
 type LayoutConfig = {
     gapsInnerHorizontal: number,
     gapsInnerVertical: number,
+    offScreenOpacity: number,
     stackColumnsByDefault: boolean,
     resizeNeighborColumn: boolean,
     reMaximize: boolean,
+    skipSwitcher: boolean,
     tiledKeepBelow: boolean,
     maximizedKeepAbove: boolean,
 };

src/layout/Window.ts

@@ -2,7 +2,7 @@ class Window {
     public column: Column;
     public readonly client: ClientWrapper;
     public height: number;
-    public readonly focusedState: WindowState;
+    public readonly focusedState: Window.State;
     private skipArrange: boolean;
 
     constructor(client: ClientWrapper, column: Column) {
@@ -106,7 +106,7 @@ class Window {
         this.column.grid.desktop.onLayoutChanged();
     }
 
-    public onUserResize(oldGeometry: QRect, resizeNeighborColumn: boolean) {
+    public onUserResize(oldGeometry: QmlRect, resizeNeighborColumn: boolean) {
         const newGeometry = this.client.kwinClient.frameGeometry;
         const widthDelta = newGeometry.width - oldGeometry.width;
         const heightDelta = newGeometry.height - oldGeometry.height;
@@ -142,8 +142,10 @@ class Window {
     }
 }
 
-type WindowState = {
+namespace Window {
-    fullScreen: boolean,
+    export type State = {
-    maximizedHorizontally: boolean,
+        fullScreen: boolean,
-    maximizedVertically: boolean,
+        maximizedHorizontally: boolean,
+        maximizedVertically: boolean,
+    }
 }

src/rules/WindowRuleEnforcer.ts

@@ -31,8 +31,9 @@ class WindowRuleEnforcer {
         manager.connect(kwinClient.captionChanged, () => {
             const shouldTile = enforcer.shouldTile(kwinClient);
             world.do((clientManager, desktopManager) => {
-                if (shouldTile) {
+                const desktop = desktopManager.getDesktopForClient(kwinClient);
-                    clientManager.tileClient(kwinClient);
+                if (shouldTile && desktop !== undefined) {
+                    clientManager.tileClient(kwinClient, desktop.grid);
                 } else {
                     clientManager.untileClient(kwinClient);
                 }
@@ -71,11 +72,11 @@ class WindowRuleEnforcer {
     }
 
     private static joinRegexes(regexes: string[]) {
-        if (regexes.length == 0) {
+        if (regexes.length === 0) {
             return new RegExp("");
         }
 
-        if (regexes.length == 1) {
+        if (regexes.length === 1) {
             return new RegExp("^" + regexes[0] + "$");
         }
 

src/utils/Delayer.ts

@@ -1,5 +1,5 @@
 class Delayer {
-    private readonly timer: QQmlTimer;
+    private readonly timer: QmlTimer;
 
     constructor(delay: number, f: () => void) {
         this.timer = initQmlTimer();

src/workspace.ts

@@ -38,7 +38,7 @@ function initWorkspaceSignalHandlers(world: World) {
         if ((horizontally || vertically) && kwinClient.tile !== null) {
             kwinClient.tile = null;
         }
-        world.doIfTiled(kwinClient, false, (world, desktopManager, window, column, grid) => {
+        world.doIfTiled(kwinClient, false, (clientManager, desktopManager, window, column, grid) => {
             window.onMaximizedChanged(horizontally, vertically);
         });
     });
@@ -60,7 +60,7 @@ function initWorkspaceSignalHandlers(world: World) {
         world.do(() => {}); // re-arrange desktop
     });
 
-    manager.connect(workspace.numberDesktopsChanged, (oldNumberOfVirtualDesktops: number) => {
+    manager.connect(workspace.numberDesktopsChanged, () => {
         world.updateDesktops();
     });
 

src/world/ClientManager.ts

@@ -27,13 +27,13 @@ class ClientManager {
 
     public addClient(kwinClient: KwinClient) {
         console.assert(!this.hasClient(kwinClient));
+        const desktop = this.desktopManager.getDesktopForClient(kwinClient);
 
         let constructState: (client: ClientWrapper) => ClientState.State;
         if (kwinClient.dock) {
             constructState = () => new ClientState.Docked(this.world, kwinClient);
-        } else if (this.windowRuleEnforcer.shouldTile(kwinClient)) {
+        } else if (this.windowRuleEnforcer.shouldTile(kwinClient) && desktop !== undefined) {
-            const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
+            constructState = (client: ClientWrapper) => new ClientState.Tiled(this.world, client, desktop.grid);
-            constructState = (client: ClientWrapper) => new ClientState.Tiled(this.world, client, grid);
         } else {
             constructState = (client: ClientWrapper) => new ClientState.Floating(this.world, client, this.config, false);
         }
@@ -86,12 +86,16 @@ class ClientManager {
             return;
         }
         if (client.stateManager.getState() instanceof ClientState.TiledMinimized) {
-            const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
+            const desktop = this.desktopManager.getDesktopForClient(kwinClient);
-            client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
+            if (desktop !== undefined) {
+                client.stateManager.setState(() => new ClientState.Tiled(this.world, client, desktop.grid), false);
+            } else {
+                client.stateManager.setState(() => new ClientState.Floating(this.world, client, this.config, false), false);
+            }
         }
     }
 
-    public tileClient(kwinClient: KwinClient) {
+    public tileClient(kwinClient: KwinClient, grid: Grid) {
         const client = this.clientMap.get(kwinClient);
         if (client === undefined) {
             return;
@@ -99,7 +103,6 @@ class ClientManager {
         if (client.stateManager.getState() instanceof ClientState.Tiled) {
             return;
         }
-        const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
         client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
     }
 
@@ -147,8 +150,11 @@ class ClientManager {
         const clientState = client.stateManager.getState();
         if ((clientState instanceof ClientState.Floating || clientState instanceof ClientState.Pinned) && Clients.canTileEver(kwinClient)) {
             Clients.makeTileable(kwinClient);
-            const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
+            const desktop = this.desktopManager.getDesktopForClient(kwinClient);
-            client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
+            if (desktop === undefined) {
+                return;
+            }
+            client.stateManager.setState(() => new ClientState.Tiled(this.world, client, desktop.grid), false);
         } else if (clientState instanceof ClientState.Tiled) {
             client.stateManager.setState(() => new ClientState.Floating(this.world, client, this.config, true), false);
         }

src/world/ClientWrapper.ts

@@ -6,7 +6,7 @@ class ClientWrapper {
     private readonly rulesSignalManager: SignalManager | null;
     public preferredWidth: number;
     private readonly manipulatingGeometry: Doer;
-    private lastPlacement: QRect | null; // workaround for issue #19
+    private lastPlacement: QmlRect | null; // workaround for issue #19
 
     constructor(
         kwinClient: KwinClient,
@@ -33,8 +33,15 @@ class ClientWrapper {
                 // window is being manually resized, prevent fighting with the user
                 return;
             }
-            this.lastPlacement = Qt.rect(x, y, width, height);
+            const clientWrapper = this; // workaround for bug in Qt5's JS engine
-            this.kwinClient.frameGeometry = this.lastPlacement;
+            clientWrapper.lastPlacement = Qt.rect(x, y, width, height);
+            clientWrapper.kwinClient.frameGeometry = clientWrapper.lastPlacement;
+            if (clientWrapper.kwinClient.frameGeometry !== clientWrapper.lastPlacement) {
+                // frameGeometry assignment failed. This sometimes happens on Wayland
+                // when a window is off-screen, effectively making it stuck there.
+                clientWrapper.kwinClient.frameGeometry.x = x; // This makes it unstuck.
+                clientWrapper.kwinClient.frameGeometry = clientWrapper.lastPlacement;
+            }
         });
     }
 
@@ -92,7 +99,7 @@ class ClientWrapper {
         return this.kwinClient.shade;
     }
 
-    public isManipulatingGeometry(newGeometry: QRect | null) {
+    public isManipulatingGeometry(newGeometry: QmlRect | null) {
         if (newGeometry !== null && newGeometry === this.lastPlacement) {
             return true;
         }
@@ -108,7 +115,7 @@ class ClientWrapper {
         this.transients.splice(i, 1);
     }
 
-    public ensureTransientsVisible(screenSize: QRect) {
+    public ensureTransientsVisible(screenSize: QmlRect) {
         for (const transient of this.transients) {
             if (transient.stateManager.getState() instanceof ClientState.Floating) {
                 transient.ensureVisible(screenSize);
@@ -117,15 +124,15 @@ class ClientWrapper {
         }
     }
 
-    public ensureVisible(screenSize: QRect) {
+    public ensureVisible(screenSize: QmlRect) {
         if (this.kwinClient.desktop !== workspace.currentDesktop) {
             return;
         }
         const frame = this.kwinClient.frameGeometry;
-        if (frame.left < 0) {
+        if (frame.left < screenSize.left) {
-            frame.x = 0;
+            frame.x = screenSize.left;
-        } else if (frame.right > screenSize.width) {
+        } else if (frame.right > screenSize.right) {
-            frame.x = screenSize.width - frame.width;
+            frame.x = screenSize.right - frame.width;
         }
     }
 

src/world/DesktopManager.ts

@@ -39,7 +39,9 @@ class DesktopManager {
     }
 
     public getDesktopForClient(kwinClient: KwinClient) {
-        console.assert(kwinClient.activities.length === 1 && kwinClient.desktop > 0);
+        if (kwinClient.activities.length !== 1 || kwinClient.desktop <= 0) {
+            return undefined;
+        }
         return this.getDesktop(kwinClient.activities[0], kwinClient.desktop);
     }
 

src/world/PinManager.ts

@@ -13,7 +13,7 @@ class PinManager {
         this.pinnedClients.delete(kwinClient);
     }
 
-    public getAvailableSpace(desktopNumber: number, screen: QRect) {
+    public getAvailableSpace(desktopNumber: number, screen: QmlRect) {
         const baseLot = new PinManager.Lot(screen.top, screen.bottom, screen.left, screen.right);
         let lots = [baseLot];
         for (const client of this.pinnedClients) {
@@ -53,7 +53,7 @@ namespace PinManager {
             public readonly right: number,
         ) {}
 
-        public split(destLots: Lot[], obstacle: QRect) {
+        public split(destLots: Lot[], obstacle: QmlRect) {
             if (!this.contains(obstacle)) {
                 // don't split
                 destLots.push(this);
@@ -74,9 +74,9 @@ namespace PinManager {
             }
         }
 
-        private contains(obstacle: QRect) {
+        private contains(obstacle: QmlRect) {
-            return obstacle.right >= this.left && obstacle.left <= this.right &&
+            return obstacle.right > this.left && obstacle.left < this.right &&
-                obstacle.bottom >= this.top && obstacle.top <= this.bottom;
+                obstacle.bottom > this.top && obstacle.top < this.bottom;
         }
 
         public area() {

src/world/World.ts

@@ -11,7 +11,7 @@ class World {
         this.workspaceSignalManager = initWorkspaceSignalHandlers(this);
 
         this.screenResizedDelayer = new Delayer(1000, () => {
-            // this delay ensures that docks get taken into account by `workspace.clientArea`
+            // this delay ensures that docks are taken into account by `workspace.clientArea`
             const desktopManager = this.desktopManager; // workaround for bug in Qt5's JS engine
             for (const desktop of desktopManager.desktops()) {
                 desktop.onLayoutChanged();
@@ -21,6 +21,18 @@ class World {
 
         this.pinManager = new PinManager();
 
+        const layoutConfig = {
+            gapsInnerHorizontal: config.gapsInnerHorizontal,
+            gapsInnerVertical: config.gapsInnerVertical,
+            offScreenOpacity: config.offScreenOpacity / 100.0,
+            stackColumnsByDefault: config.stackColumnsByDefault,
+            resizeNeighborColumn: config.resizeNeighborColumn,
+            reMaximize: config.reMaximize,
+            skipSwitcher: config.skipSwitcher,
+            tiledKeepBelow: config.tiledKeepBelow,
+            maximizedKeepAbove: config.floatingKeepAbove,
+        };
+
         this.desktopManager = new DesktopManager(
             this.pinManager,
             {
@@ -28,17 +40,13 @@ class World {
                 marginBottom: config.gapsOuterBottom,
                 marginLeft: config.gapsOuterLeft,
                 marginRight: config.gapsOuterRight,
-                overscroll: config.overscroll,
+                scroller: config.scrollingLazy ? new LazyScroller() :
-            },
+                    config.scrollingCentered ? new CenteredScroller() :
-            {
+                    config.scrollingGrouped ? new GroupedScroller() :
-                gapsInnerHorizontal: config.gapsInnerHorizontal,
+                    console.assert(false),
-                gapsInnerVertical: config.gapsInnerVertical,
+                clamper: config.scrollingLazy ? new EdgeClamper() : new CenterClamper(),
-                stackColumnsByDefault: config.stackColumnsByDefault,
-                resizeNeighborColumn: config.resizeNeighborColumn,
-                reMaximize: config.reMaximize,
-                tiledKeepBelow: config.tiledKeepBelow,
-                maximizedKeepAbove: config.floatingKeepAbove,
             },
+            layoutConfig,
             workspace.currentActivity,
         );
         this.clientManager = new ClientManager(config, this, this.desktopManager, this.pinManager);

src/world/clientState/Docked.ts

@@ -16,7 +16,7 @@ namespace ClientState {
 
         private static initSignalManager(world: World, kwinClient: KwinClient) {
             const manager = new SignalManager();
-            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QRect) => {
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
                 world.onScreenResized();
             });
             return manager;

src/world/clientState/Floating.ts

@@ -54,7 +54,7 @@ namespace ClientState {
                         clientManager.pinClient(kwinClient);
                     });
                 }
-            })
+            });
 
             return manager;
         }

src/world/clientState/Manager.ts

@@ -21,6 +21,6 @@ namespace ClientState {
     }
 
     export type State = {
-        destroy(passFocus: boolean): void;
+        destroy(passFocus: boolean): void,
     };
 }

src/world/clientState/Pinned.ts

@@ -41,7 +41,7 @@ namespace ClientState {
                 }
             });
 
-            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QRect) => {
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
                 if (kwinClient.tile === null) {
                     world.do((clientManager, desktopManager) => {
                         clientManager.unpinClient(kwinClient);
@@ -68,7 +68,7 @@ namespace ClientState {
                 oldDesktopNumber = kwinClient.desktop;
             });
 
-            manager.connect(kwinClient.activitiesChanged, (kwinClient: KwinClient) => {
+            manager.connect(kwinClient.activitiesChanged, () => {
                 const desktops = kwinClient.desktop === -1 ? [] : [kwinClient.desktop];
                 const changedActivities = oldActivities.length === 0 || kwinClient.activities.length === 0 ?
                     [] :

src/world/clientState/Tiled.ts

@@ -1,9 +1,11 @@
 namespace ClientState {
     export class Tiled implements State {
         public readonly window: Window;
+        private readonly defaultState: Tiled.WindowState;
         private readonly signalManager: SignalManager;
 
         constructor(world: World, client: ClientWrapper, grid: Grid) {
+            this.defaultState = { skipSwitcher: client.kwinClient.skipSwitcher };
             Tiled.prepareClientForTiling(client, grid.config);
 
             const column = new Column(grid, grid.getLastFocusedColumn() ?? grid.getLastColumn());
@@ -21,7 +23,7 @@ namespace ClientState {
             const client = window.client;
             window.destroy(passFocus);
 
-            Tiled.restoreClientAfterTiling(client, grid.config, grid.desktop.clientArea);
+            Tiled.restoreClientAfterTiling(client, grid.config, this.defaultState, grid.desktop.clientArea);
         }
 
         private static initSignalManager(world: World, window: Window) {
@@ -31,23 +33,25 @@ namespace ClientState {
 
             manager.connect(kwinClient.desktopChanged, () => {
                 world.do((clientManager, desktopManager) => {
-                    if (kwinClient.desktop === -1) {
+                    const desktop = desktopManager.getDesktopForClient(kwinClient);
+                    if (desktop === undefined) {
                         // windows on all desktops are not supported
                         clientManager.untileClient(kwinClient);
                         return;
                     }
-                    Tiled.moveWindowToCorrectGrid(desktopManager, window);
+                    Tiled.moveWindowToGrid(window, desktop.grid);
                 });
             });
 
             manager.connect(kwinClient.activitiesChanged, () => {
                 world.do((clientManager, desktopManager) => {
-                    if (kwinClient.activities.length !== 1) {
+                    const desktop = desktopManager.getDesktopForClient(kwinClient);
+                    if (desktop === undefined) {
                         // windows on multiple activities are not supported
                         clientManager.untileClient(kwinClient);
                         return;
                     }
-                    Tiled.moveWindowToCorrectGrid(desktopManager, window);
+                    Tiled.moveWindowToGrid(window, desktop.grid);
                 });
             })
 
@@ -81,7 +85,7 @@ namespace ClientState {
                 cursorChangedAfterResizeStart = false;
             });
 
-            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QRect) => {
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
                 // on Wayland, this fires after `tileChanged`
                 if (kwinClient.tile !== null) {
                     world.do((clientManager, desktopManager) => {
@@ -104,6 +108,7 @@ namespace ClientState {
                 if (kwinClient.resize) {
                     world.do(() => window.onUserResize(oldGeometry, !cursorChangedAfterResizeStart));
                 } else if (
+                    !window.column.grid.isUserResizing() &&
                     !client.isManipulatingGeometry(newGeometry) &&
                     !Clients.isMaximizedGeometry(kwinClient) &&
                     !Clients.isFullScreenGeometry(kwinClient) // not using `kwinClient.fullScreen` because it may not be set yet at this point
@@ -128,21 +133,20 @@ namespace ClientState {
             return manager;
         }
 
-        private static moveWindowToCorrectGrid(desktopManager: DesktopManager, window: Window) {
+        private static moveWindowToGrid(window: Window, grid: Grid) {
-            const kwinClient = window.client.kwinClient;
+            if (grid === window.column.grid) {
-
+                // window already on the given grid
-            const oldGrid = window.column.grid;
-            const newGrid = desktopManager.getDesktopForClient(kwinClient).grid;
-            if (oldGrid === newGrid) {
-                // window already on the correct grid
                 return;
             }
 
-            const newColumn = new Column(newGrid, newGrid.getLastFocusedColumn() ?? newGrid.getLastColumn());
+            const newColumn = new Column(grid, grid.getLastFocusedColumn() ?? grid.getLastColumn());
             window.moveToColumn(newColumn);
         }
 
         private static prepareClientForTiling(client: ClientWrapper, config: LayoutConfig) {
+            if (config.skipSwitcher) {
+                client.kwinClient.skipSwitcher = true;
+            }
             if (config.tiledKeepBelow) {
                 client.kwinClient.keepBelow = true;
             }
@@ -153,7 +157,10 @@ namespace ClientState {
             client.setMaximize(false, false);
         }
 
-        private static restoreClientAfterTiling(client: ClientWrapper, config: LayoutConfig, screenSize: QRect) {
+        private static restoreClientAfterTiling(client: ClientWrapper, config: LayoutConfig, defaultState: Tiled.WindowState, screenSize: QmlRect) {
+            if (config.skipSwitcher) {
+                client.kwinClient.skipSwitcher = defaultState.skipSwitcher;
+            }
             if (config.tiledKeepBelow) {
                 client.kwinClient.keepBelow = false;
             }
@@ -165,4 +172,10 @@ namespace ClientState {
             client.ensureVisible(screenSize);
         }
     }
+
+    namespace Tiled {
+        export type WindowState = {
+            skipSwitcher: boolean,
+        }
+    }
 }