Compare commits
10 Commits
795d4d5508
...
feat/add-m
| Author | SHA1 | Date | |
|---|---|---|---|
|
696269d8b8 | ||
|
|
fa021b08eb | ||
|
|
8ed5f104b2 | ||
|
|
cbaa802797 | ||
|
|
e2a1792388 | ||
|
|
656e448927 | ||
|
|
93516b31fb | ||
|
|
918c07c419 | ||
|
|
15188b9990 | ||
|
8f6e8582c9 |
35
extension.ts
35
extension.ts
@@ -4,6 +4,7 @@ import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
||||
import Gio from 'gi://Gio';
|
||||
import Shell from 'gi://Shell';
|
||||
import WindowManager from './src/wm/windowManager.js'
|
||||
import {Direction} from './src/wm/container.js'
|
||||
import {Logger} from "./src/utils/logger.js";
|
||||
|
||||
export default class aerospike extends Extension {
|
||||
@@ -19,10 +20,15 @@ export default class aerospike extends Extension {
|
||||
}
|
||||
|
||||
enable() {
|
||||
Logger.log("STARTING AEROSPIKE!")
|
||||
this.bindSettings();
|
||||
this.setupKeybindings();
|
||||
this.windowManager.enable()
|
||||
try {
|
||||
Logger.log("STARTING AEROSPIKE!")
|
||||
this.bindSettings();
|
||||
this.setupKeybindings();
|
||||
this.windowManager.enable()
|
||||
Logger.log("AEROSPIKE ENABLED SUCCESSFULLY")
|
||||
} catch (e) {
|
||||
Logger.error("AEROSPIKE ENABLE FAILED", e);
|
||||
}
|
||||
}
|
||||
|
||||
disable() {
|
||||
@@ -32,13 +38,18 @@ export default class aerospike extends Extension {
|
||||
|
||||
private keybindingActions(): Record<string, () => void> {
|
||||
return {
|
||||
'move-left': () => { Logger.info('Keybinding 1 was pressed!'); },
|
||||
'move-right': () => { Logger.info('Keybinding 2 was pressed!'); },
|
||||
'join-with-left': () => { Logger.info('Keybinding 3 was pressed!'); },
|
||||
'join-with-right': () => { Logger.info('Keybinding 4 was pressed!'); },
|
||||
'print-tree': () => { this.windowManager.printTreeStructure(); },
|
||||
'toggle-orientation': () => { this.windowManager.toggleActiveContainerOrientation(); },
|
||||
'reset-ratios': () => { this.windowManager.resetActiveContainerRatios(); },
|
||||
'toggle-tabbed': () => { this.windowManager.toggleActiveContainerTabbed(); },
|
||||
'focus-left': () => { this.windowManager.focusInDirection(Direction.LEFT); },
|
||||
'focus-right': () => { this.windowManager.focusInDirection(Direction.RIGHT); },
|
||||
'focus-up': () => { this.windowManager.focusInDirection(Direction.UP); },
|
||||
'focus-down': () => { this.windowManager.focusInDirection(Direction.DOWN); },
|
||||
'move-left': () => { this.windowManager.moveInDirection(Direction.LEFT); },
|
||||
'move-right': () => { this.windowManager.moveInDirection(Direction.RIGHT); },
|
||||
'move-up': () => { this.windowManager.moveInDirection(Direction.UP); },
|
||||
'move-down': () => { this.windowManager.moveInDirection(Direction.DOWN); },
|
||||
};
|
||||
}
|
||||
|
||||
@@ -50,14 +61,6 @@ export default class aerospike extends Extension {
|
||||
this.refreshKeybinding(name);
|
||||
});
|
||||
});
|
||||
|
||||
this.settings.connect('changed::dropdown-option', () => {
|
||||
log(`Dropdown option changed to: ${this.settings.get_string('dropdown-option')}`);
|
||||
});
|
||||
|
||||
this.settings.connect('changed::color-selection', () => {
|
||||
log(`Color selection changed to: ${this.settings.get_string('color-selection')}`);
|
||||
});
|
||||
}
|
||||
|
||||
private refreshKeybinding(settingName: string) {
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"@girs/gnome-shell": "49.1.0",
|
||||
"@jest/globals": "^30.0.0",
|
||||
"@types/jest": "^30.0.0",
|
||||
"eslint": "^9.36.0",
|
||||
"eslint": "^10.0.0",
|
||||
"eslint-plugin-jsdoc": "^62.0.0",
|
||||
"jest": "^30.0.0",
|
||||
"ts-jest": "^29.1.2",
|
||||
|
||||
221
pnpm-lock.yaml
generated
221
pnpm-lock.yaml
generated
@@ -43,11 +43,11 @@ importers:
|
||||
specifier: ^30.0.0
|
||||
version: 30.0.0
|
||||
eslint:
|
||||
specifier: ^9.36.0
|
||||
version: 9.39.2
|
||||
specifier: ^10.0.0
|
||||
version: 10.0.0
|
||||
eslint-plugin-jsdoc:
|
||||
specifier: ^62.0.0
|
||||
version: 62.4.1(eslint@9.39.2)
|
||||
version: 62.4.1(eslint@10.0.0)
|
||||
jest:
|
||||
specifier: ^30.0.0
|
||||
version: 30.2.0(@types/node@25.1.0)
|
||||
@@ -252,33 +252,25 @@ packages:
|
||||
resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
|
||||
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
|
||||
|
||||
'@eslint/config-array@0.21.1':
|
||||
resolution: {integrity: sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
'@eslint/config-array@0.23.0':
|
||||
resolution: {integrity: sha512-T5Swqd+PZxBekRuMsIFCySM3NUE8GjuqyksIIsXgkF2GCuiDaqpxKyPkv9VMEKpq5D7r5DLss1tM8tCsvRSjeg==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
'@eslint/config-helpers@0.4.2':
|
||||
resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
'@eslint/config-helpers@0.5.2':
|
||||
resolution: {integrity: sha512-a5MxrdDXEvqnIq+LisyCX6tQMPF/dSJpCfBgBauY+pNZ28yCtSsTvyTYrMhaI+LK26bVyCJfJkT0u8KIj2i1dQ==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
'@eslint/core@0.17.0':
|
||||
resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
'@eslint/core@1.1.0':
|
||||
resolution: {integrity: sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
'@eslint/eslintrc@3.3.3':
|
||||
resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
'@eslint/object-schema@3.0.0':
|
||||
resolution: {integrity: sha512-nWl20RtHQP2A2yvKU6Fee62Xo1AoNRqBLixtyg45zJhU8ljPFCyBK90d8e8XTnPns1RggSf4HH3bM8AhevkPVg==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
'@eslint/js@9.39.2':
|
||||
resolution: {integrity: sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/object-schema@2.1.7':
|
||||
resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
'@eslint/plugin-kit@0.4.1':
|
||||
resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
'@eslint/plugin-kit@0.6.0':
|
||||
resolution: {integrity: sha512-bIZEUzOI1jkhviX2cp5vNyXQc6olzb2ohewQubuYlMXZ2Q/XjBO0x0XhGPvc9fjSIiUN0vw+0hq53BJ4eQSJKQ==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
'@girs/accountsservice-1.0@1.0.0-4.0.0-beta.38':
|
||||
resolution: {integrity: sha512-6QzytM5dztmMynF2bxN73EuNK9ArMFxkP2L8wUC7IH45zBeBOfYcqL85BFh2PmkGmqRk+Rli5EFR8dAkx3Ig5Q==}
|
||||
@@ -425,6 +417,14 @@ packages:
|
||||
resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
|
||||
engines: {node: '>=18.18'}
|
||||
|
||||
'@isaacs/balanced-match@4.0.1':
|
||||
resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==}
|
||||
engines: {node: 20 || >=22}
|
||||
|
||||
'@isaacs/brace-expansion@5.0.1':
|
||||
resolution: {integrity: sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==}
|
||||
engines: {node: 20 || >=22}
|
||||
|
||||
'@isaacs/cliui@8.0.2':
|
||||
resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
|
||||
engines: {node: '>=12'}
|
||||
@@ -574,6 +574,9 @@ packages:
|
||||
'@types/babel__traverse@7.28.0':
|
||||
resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
|
||||
|
||||
'@types/esrecurse@4.3.1':
|
||||
resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==}
|
||||
|
||||
'@types/estree@1.0.8':
|
||||
resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
|
||||
|
||||
@@ -762,9 +765,6 @@ packages:
|
||||
argparse@1.0.10:
|
||||
resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
|
||||
|
||||
argparse@2.0.1:
|
||||
resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
|
||||
|
||||
babel-jest@30.2.0:
|
||||
resolution: {integrity: sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==}
|
||||
engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
|
||||
@@ -949,25 +949,21 @@ packages:
|
||||
peerDependencies:
|
||||
eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
|
||||
|
||||
eslint-scope@8.4.0:
|
||||
resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
eslint-scope@9.1.0:
|
||||
resolution: {integrity: sha512-CkWE42hOJsNj9FJRaoMX9waUFYhqY4jmyLFdAdzZr6VaCg3ynLYx4WnOdkaIifGfH4gsUcBTn4OZbHXkpLD0FQ==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
eslint-visitor-keys@3.4.3:
|
||||
resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
|
||||
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
|
||||
|
||||
eslint-visitor-keys@4.2.1:
|
||||
resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
eslint-visitor-keys@5.0.0:
|
||||
resolution: {integrity: sha512-A0XeIi7CXU7nPlfHS9loMYEKxUaONu/hTEzHTGba9Huu94Cq1hPivf+DE5erJozZOky0LfvXAyrV/tcswpLI0Q==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
|
||||
eslint@9.39.2:
|
||||
resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
eslint@10.0.0:
|
||||
resolution: {integrity: sha512-O0piBKY36YSJhlFSG8p9VUdPV/SxxS4FYDWVpr/9GJuMaepzwlf4J8I4ov1b+ySQfDTPhc3DtLaxcT1fN0yqCg==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
hasBin: true
|
||||
peerDependencies:
|
||||
jiti: '*'
|
||||
@@ -975,10 +971,6 @@ packages:
|
||||
jiti:
|
||||
optional: true
|
||||
|
||||
espree@10.4.0:
|
||||
resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
|
||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||
|
||||
espree@11.1.0:
|
||||
resolution: {integrity: sha512-WFWYhO1fV4iYkqOOvq8FbqIhr2pYfoDY0kCotMkDeNtGpiGGkZ1iov2u8ydjtgM8yF8rzK7oaTbw2NAzbAbehw==}
|
||||
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
|
||||
@@ -1085,15 +1077,12 @@ packages:
|
||||
|
||||
glob@10.5.0:
|
||||
resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}
|
||||
deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
|
||||
hasBin: true
|
||||
|
||||
glob@7.2.3:
|
||||
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
|
||||
deprecated: Glob versions prior to v9 are no longer supported
|
||||
|
||||
globals@14.0.0:
|
||||
resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
|
||||
engines: {node: '>=18'}
|
||||
deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
|
||||
|
||||
graceful-fs@4.2.11:
|
||||
resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
|
||||
@@ -1121,10 +1110,6 @@ packages:
|
||||
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
|
||||
engines: {node: '>= 4'}
|
||||
|
||||
import-fresh@3.3.1:
|
||||
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
|
||||
engines: {node: '>=6'}
|
||||
|
||||
import-local@3.2.0:
|
||||
resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
|
||||
engines: {node: '>=8'}
|
||||
@@ -1329,10 +1314,6 @@ packages:
|
||||
resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
|
||||
hasBin: true
|
||||
|
||||
js-yaml@4.1.1:
|
||||
resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
|
||||
hasBin: true
|
||||
|
||||
jsdoc-type-pratt-parser@7.1.0:
|
||||
resolution: {integrity: sha512-SX7q7XyCwzM/MEDCYz0l8GgGbJAACGFII9+WfNYr5SLEKukHWRy2Jk3iWRe7P+lpYJNs7oQ+OSei4JtKGUjd7A==}
|
||||
engines: {node: '>=20.0.0'}
|
||||
@@ -1384,9 +1365,6 @@ packages:
|
||||
lodash.memoize@4.1.2:
|
||||
resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
|
||||
|
||||
lodash.merge@4.6.2:
|
||||
resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
|
||||
|
||||
lru-cache@10.4.3:
|
||||
resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
|
||||
|
||||
@@ -1414,6 +1392,10 @@ packages:
|
||||
resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
|
||||
engines: {node: '>=6'}
|
||||
|
||||
minimatch@10.1.2:
|
||||
resolution: {integrity: sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==}
|
||||
engines: {node: 20 || >=22}
|
||||
|
||||
minimatch@3.1.2:
|
||||
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
|
||||
|
||||
@@ -1493,10 +1475,6 @@ packages:
|
||||
package-json-from-dist@1.0.1:
|
||||
resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
|
||||
|
||||
parent-module@1.0.1:
|
||||
resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
|
||||
engines: {node: '>=6'}
|
||||
|
||||
parse-imports-exports@0.2.4:
|
||||
resolution: {integrity: sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==}
|
||||
|
||||
@@ -1572,10 +1550,6 @@ packages:
|
||||
resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
|
||||
engines: {node: '>=8'}
|
||||
|
||||
resolve-from@4.0.0:
|
||||
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
|
||||
engines: {node: '>=4'}
|
||||
|
||||
resolve-from@5.0.0:
|
||||
resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
|
||||
engines: {node: '>=8'}
|
||||
@@ -2031,50 +2005,34 @@ snapshots:
|
||||
|
||||
'@es-joy/resolve.exports@1.2.0': {}
|
||||
|
||||
'@eslint-community/eslint-utils@4.9.1(eslint@9.39.2)':
|
||||
'@eslint-community/eslint-utils@4.9.1(eslint@10.0.0)':
|
||||
dependencies:
|
||||
eslint: 9.39.2
|
||||
eslint: 10.0.0
|
||||
eslint-visitor-keys: 3.4.3
|
||||
|
||||
'@eslint-community/regexpp@4.12.2': {}
|
||||
|
||||
'@eslint/config-array@0.21.1':
|
||||
'@eslint/config-array@0.23.0':
|
||||
dependencies:
|
||||
'@eslint/object-schema': 2.1.7
|
||||
'@eslint/object-schema': 3.0.0
|
||||
debug: 4.4.3
|
||||
minimatch: 3.1.2
|
||||
minimatch: 10.1.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@eslint/config-helpers@0.4.2':
|
||||
'@eslint/config-helpers@0.5.2':
|
||||
dependencies:
|
||||
'@eslint/core': 0.17.0
|
||||
'@eslint/core': 1.1.0
|
||||
|
||||
'@eslint/core@0.17.0':
|
||||
'@eslint/core@1.1.0':
|
||||
dependencies:
|
||||
'@types/json-schema': 7.0.15
|
||||
|
||||
'@eslint/eslintrc@3.3.3':
|
||||
'@eslint/object-schema@3.0.0': {}
|
||||
|
||||
'@eslint/plugin-kit@0.6.0':
|
||||
dependencies:
|
||||
ajv: 6.12.6
|
||||
debug: 4.4.3
|
||||
espree: 10.4.0
|
||||
globals: 14.0.0
|
||||
ignore: 5.3.2
|
||||
import-fresh: 3.3.1
|
||||
js-yaml: 4.1.1
|
||||
minimatch: 3.1.2
|
||||
strip-json-comments: 3.1.1
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@eslint/js@9.39.2': {}
|
||||
|
||||
'@eslint/object-schema@2.1.7': {}
|
||||
|
||||
'@eslint/plugin-kit@0.4.1':
|
||||
dependencies:
|
||||
'@eslint/core': 0.17.0
|
||||
'@eslint/core': 1.1.0
|
||||
levn: 0.4.1
|
||||
|
||||
'@girs/accountsservice-1.0@1.0.0-4.0.0-beta.38':
|
||||
@@ -2541,6 +2499,12 @@ snapshots:
|
||||
|
||||
'@humanwhocodes/retry@0.4.3': {}
|
||||
|
||||
'@isaacs/balanced-match@4.0.1': {}
|
||||
|
||||
'@isaacs/brace-expansion@5.0.1':
|
||||
dependencies:
|
||||
'@isaacs/balanced-match': 4.0.1
|
||||
|
||||
'@isaacs/cliui@8.0.2':
|
||||
dependencies:
|
||||
string-width: 5.1.2
|
||||
@@ -2808,6 +2772,8 @@ snapshots:
|
||||
dependencies:
|
||||
'@babel/types': 7.28.6
|
||||
|
||||
'@types/esrecurse@4.3.1': {}
|
||||
|
||||
'@types/estree@1.0.8': {}
|
||||
|
||||
'@types/istanbul-lib-coverage@2.0.6': {}
|
||||
@@ -2942,8 +2908,6 @@ snapshots:
|
||||
dependencies:
|
||||
sprintf-js: 1.0.3
|
||||
|
||||
argparse@2.0.1: {}
|
||||
|
||||
babel-jest@30.2.0(@babel/core@7.28.6):
|
||||
dependencies:
|
||||
'@babel/core': 7.28.6
|
||||
@@ -3110,7 +3074,7 @@ snapshots:
|
||||
|
||||
escape-string-regexp@4.0.0: {}
|
||||
|
||||
eslint-plugin-jsdoc@62.4.1(eslint@9.39.2):
|
||||
eslint-plugin-jsdoc@62.4.1(eslint@10.0.0):
|
||||
dependencies:
|
||||
'@es-joy/jsdoccomment': 0.83.0
|
||||
'@es-joy/resolve.exports': 1.2.0
|
||||
@@ -3118,7 +3082,7 @@ snapshots:
|
||||
comment-parser: 1.4.5
|
||||
debug: 4.4.3
|
||||
escape-string-regexp: 4.0.0
|
||||
eslint: 9.39.2
|
||||
eslint: 10.0.0
|
||||
espree: 11.1.0
|
||||
esquery: 1.7.0
|
||||
html-entities: 2.6.0
|
||||
@@ -3130,39 +3094,36 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
eslint-scope@8.4.0:
|
||||
eslint-scope@9.1.0:
|
||||
dependencies:
|
||||
'@types/esrecurse': 4.3.1
|
||||
'@types/estree': 1.0.8
|
||||
esrecurse: 4.3.0
|
||||
estraverse: 5.3.0
|
||||
|
||||
eslint-visitor-keys@3.4.3: {}
|
||||
|
||||
eslint-visitor-keys@4.2.1: {}
|
||||
|
||||
eslint-visitor-keys@5.0.0: {}
|
||||
|
||||
eslint@9.39.2:
|
||||
eslint@10.0.0:
|
||||
dependencies:
|
||||
'@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2)
|
||||
'@eslint-community/eslint-utils': 4.9.1(eslint@10.0.0)
|
||||
'@eslint-community/regexpp': 4.12.2
|
||||
'@eslint/config-array': 0.21.1
|
||||
'@eslint/config-helpers': 0.4.2
|
||||
'@eslint/core': 0.17.0
|
||||
'@eslint/eslintrc': 3.3.3
|
||||
'@eslint/js': 9.39.2
|
||||
'@eslint/plugin-kit': 0.4.1
|
||||
'@eslint/config-array': 0.23.0
|
||||
'@eslint/config-helpers': 0.5.2
|
||||
'@eslint/core': 1.1.0
|
||||
'@eslint/plugin-kit': 0.6.0
|
||||
'@humanfs/node': 0.16.7
|
||||
'@humanwhocodes/module-importer': 1.0.1
|
||||
'@humanwhocodes/retry': 0.4.3
|
||||
'@types/estree': 1.0.8
|
||||
ajv: 6.12.6
|
||||
chalk: 4.1.2
|
||||
cross-spawn: 7.0.6
|
||||
debug: 4.4.3
|
||||
escape-string-regexp: 4.0.0
|
||||
eslint-scope: 8.4.0
|
||||
eslint-visitor-keys: 4.2.1
|
||||
espree: 10.4.0
|
||||
eslint-scope: 9.1.0
|
||||
eslint-visitor-keys: 5.0.0
|
||||
espree: 11.1.0
|
||||
esquery: 1.7.0
|
||||
esutils: 2.0.3
|
||||
fast-deep-equal: 3.1.3
|
||||
@@ -3173,19 +3134,12 @@ snapshots:
|
||||
imurmurhash: 0.1.4
|
||||
is-glob: 4.0.3
|
||||
json-stable-stringify-without-jsonify: 1.0.1
|
||||
lodash.merge: 4.6.2
|
||||
minimatch: 3.1.2
|
||||
minimatch: 10.1.2
|
||||
natural-compare: 1.4.0
|
||||
optionator: 0.9.4
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
espree@10.4.0:
|
||||
dependencies:
|
||||
acorn: 8.15.0
|
||||
acorn-jsx: 5.3.2(acorn@8.15.0)
|
||||
eslint-visitor-keys: 4.2.1
|
||||
|
||||
espree@11.1.0:
|
||||
dependencies:
|
||||
acorn: 8.15.0
|
||||
@@ -3304,8 +3258,6 @@ snapshots:
|
||||
once: 1.4.0
|
||||
path-is-absolute: 1.0.1
|
||||
|
||||
globals@14.0.0: {}
|
||||
|
||||
graceful-fs@4.2.11: {}
|
||||
|
||||
handlebars@4.7.8:
|
||||
@@ -3327,11 +3279,6 @@ snapshots:
|
||||
|
||||
ignore@5.3.2: {}
|
||||
|
||||
import-fresh@3.3.1:
|
||||
dependencies:
|
||||
parent-module: 1.0.1
|
||||
resolve-from: 4.0.0
|
||||
|
||||
import-local@3.2.0:
|
||||
dependencies:
|
||||
pkg-dir: 4.2.0
|
||||
@@ -3719,10 +3666,6 @@ snapshots:
|
||||
argparse: 1.0.10
|
||||
esprima: 4.0.1
|
||||
|
||||
js-yaml@4.1.1:
|
||||
dependencies:
|
||||
argparse: 2.0.1
|
||||
|
||||
jsdoc-type-pratt-parser@7.1.0: {}
|
||||
|
||||
jsesc@3.1.0: {}
|
||||
@@ -3760,8 +3703,6 @@ snapshots:
|
||||
|
||||
lodash.memoize@4.1.2: {}
|
||||
|
||||
lodash.merge@4.6.2: {}
|
||||
|
||||
lru-cache@10.4.3: {}
|
||||
|
||||
lru-cache@5.1.1:
|
||||
@@ -3787,6 +3728,10 @@ snapshots:
|
||||
|
||||
mimic-fn@2.1.0: {}
|
||||
|
||||
minimatch@10.1.2:
|
||||
dependencies:
|
||||
'@isaacs/brace-expansion': 5.0.1
|
||||
|
||||
minimatch@3.1.2:
|
||||
dependencies:
|
||||
brace-expansion: 1.1.12
|
||||
@@ -3856,10 +3801,6 @@ snapshots:
|
||||
|
||||
package-json-from-dist@1.0.1: {}
|
||||
|
||||
parent-module@1.0.1:
|
||||
dependencies:
|
||||
callsites: 3.1.0
|
||||
|
||||
parse-imports-exports@0.2.4:
|
||||
dependencies:
|
||||
parse-statements: 1.0.11
|
||||
@@ -3918,8 +3859,6 @@ snapshots:
|
||||
dependencies:
|
||||
resolve-from: 5.0.0
|
||||
|
||||
resolve-from@4.0.0: {}
|
||||
|
||||
resolve-from@5.0.0: {}
|
||||
|
||||
semver@6.3.1: {}
|
||||
|
||||
@@ -1,40 +1,72 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<schemalist>
|
||||
<schema id="org.gnome.shell.extensions.aerospike" path="/org/gnome/shell/extensions/aerospike/">
|
||||
<key name="dropdown-option" type="s">
|
||||
<default>'option1'</default>
|
||||
<summary>Dropdown selection</summary>
|
||||
<description>Option selected from the dropdown menu</description>
|
||||
|
||||
<key name="focus-left" type="as">
|
||||
<default><![CDATA[['<Super>h']]]></default>
|
||||
<summary>Focus window to the left</summary>
|
||||
<description>Move focus to the window to the left of the current window. In tabbed mode, switches to the previous tab.</description>
|
||||
</key>
|
||||
|
||||
<key name="color-selection" type="s">
|
||||
<default>'rgb(255,0,0)'</default>
|
||||
<summary>Selected color</summary>
|
||||
<description>Color chosen from the color picker</description>
|
||||
<key name="focus-right" type="as">
|
||||
<default><![CDATA[['<Super>l']]]></default>
|
||||
<summary>Focus window to the right</summary>
|
||||
<description>Move focus to the window to the right of the current window. In tabbed mode, switches to the next tab.</description>
|
||||
</key>
|
||||
|
||||
<key name="focus-up" type="as">
|
||||
<default><![CDATA[['<Super>k']]]></default>
|
||||
<summary>Focus window above</summary>
|
||||
<description>Move focus to the window above the current window.</description>
|
||||
</key>
|
||||
|
||||
<key name="focus-down" type="as">
|
||||
<default><![CDATA[['<Super>j']]]></default>
|
||||
<summary>Focus window below</summary>
|
||||
<description>Move focus to the window below the current window.</description>
|
||||
</key>
|
||||
|
||||
|
||||
<key name="move-left" type="as">
|
||||
<default><![CDATA[['<Super>1']]]></default>
|
||||
<summary>Keybinding for action 1</summary>
|
||||
<description>Keyboard shortcut for triggering action 1</description>
|
||||
<default><![CDATA[['<Super><Shift>h']]]></default>
|
||||
<summary>Move window to the left</summary>
|
||||
<description>Move the active window one position to the left within its container</description>
|
||||
</key>
|
||||
|
||||
<key name="move-right" type="as">
|
||||
<default><![CDATA[['<Super>2']]]></default>
|
||||
<summary>Keybinding for action 2</summary>
|
||||
<description>Keyboard shortcut for triggering action 2</description>
|
||||
<default><![CDATA[['<Super><Shift>l']]]></default>
|
||||
<summary>Move window to the right</summary>
|
||||
<description>Move the active window one position to the right within its container</description>
|
||||
</key>
|
||||
|
||||
<key name="join-with-left" type="as">
|
||||
<default><![CDATA[['<Super>3']]]></default>
|
||||
<summary>Keybinding for action 3</summary>
|
||||
<description>Keyboard shortcut for triggering action 3</description>
|
||||
<key name="move-up" type="as">
|
||||
<default><![CDATA[['<Super><Shift>k']]]></default>
|
||||
<summary>Move window up</summary>
|
||||
<description>Move the active window one position up within its container</description>
|
||||
</key>
|
||||
|
||||
<key name="join-with-right" type="as">
|
||||
<default><![CDATA[['<Super>4']]]></default>
|
||||
<summary>Keybinding for action 4</summary>
|
||||
<description>Keyboard shortcut for triggering action 4</description>
|
||||
<key name="move-down" type="as">
|
||||
<default><![CDATA[['<Super><Shift>j']]]></default>
|
||||
<summary>Move window down</summary>
|
||||
<description>Move the active window one position down within its container</description>
|
||||
</key>
|
||||
|
||||
<key name="toggle-orientation" type="as">
|
||||
<default><![CDATA[['<Super>comma']]]></default>
|
||||
<summary>Toggle active container orientation</summary>
|
||||
<description>Toggles the orientation of the container holding the active window between horizontal and vertical</description>
|
||||
</key>
|
||||
|
||||
<key name="reset-ratios" type="as">
|
||||
<default><![CDATA[['<Super>z']]]></default>
|
||||
<summary>Reset container ratios to equal splits</summary>
|
||||
<description>Resets all window size ratios in the active window's container to equal splits</description>
|
||||
</key>
|
||||
|
||||
<key name="toggle-tabbed" type="as">
|
||||
<default><![CDATA[['<Super>slash']]]></default>
|
||||
<summary>Toggle tabbed container mode</summary>
|
||||
<description>Toggles the active window's container between tabbed and accordion layout modes</description>
|
||||
</key>
|
||||
|
||||
<key name="print-tree" type="as">
|
||||
@@ -43,17 +75,5 @@
|
||||
<description>Prints the current tree of containers and windows per monitor to logs</description>
|
||||
</key>
|
||||
|
||||
<key name="toggle-orientation" type="as">
|
||||
<default><![CDATA[['<Super><Shift>comma']]]></default>
|
||||
<summary>Toggle active container orientation</summary>
|
||||
<description>Toggles the orientation of the container holding the active window between horizontal and vertical</description>
|
||||
</key>
|
||||
|
||||
<key name="reset-ratios" type="as">
|
||||
<default><![CDATA[['<Primary>z']]]></default>
|
||||
<summary>Reset container ratios to equal splits</summary>
|
||||
<description>Resets all window size ratios in the active window's container to equal splits</description>
|
||||
</key>
|
||||
|
||||
</schema>
|
||||
</schemalist>
|
||||
@@ -20,25 +20,38 @@ jest.mock('../utils/events.js', () => ({
|
||||
|
||||
describe('Container Logic Tests', () => {
|
||||
describe('Orientation Toggle Logic', () => {
|
||||
enum Orientation {
|
||||
enum Layout {
|
||||
HORIZONTAL = 0,
|
||||
VERTICAL = 1,
|
||||
TABBED = 2,
|
||||
}
|
||||
|
||||
const toggleOrientation = (current: Orientation): Orientation => {
|
||||
return current === Orientation.HORIZONTAL
|
||||
? Orientation.VERTICAL
|
||||
: Orientation.HORIZONTAL;
|
||||
const toggleOrientation = (current: Layout): Layout => {
|
||||
if (current === Layout.TABBED) return Layout.HORIZONTAL;
|
||||
return current === Layout.HORIZONTAL
|
||||
? Layout.VERTICAL
|
||||
: Layout.HORIZONTAL;
|
||||
};
|
||||
|
||||
test('should toggle from HORIZONTAL to VERTICAL', () => {
|
||||
const result = toggleOrientation(Orientation.HORIZONTAL);
|
||||
expect(result).toBe(Orientation.VERTICAL);
|
||||
const result = toggleOrientation(Layout.HORIZONTAL);
|
||||
expect(result).toBe(Layout.VERTICAL);
|
||||
});
|
||||
|
||||
test('should toggle from VERTICAL to HORIZONTAL', () => {
|
||||
const result = toggleOrientation(Orientation.VERTICAL);
|
||||
expect(result).toBe(Orientation.HORIZONTAL);
|
||||
const result = toggleOrientation(Layout.VERTICAL);
|
||||
expect(result).toBe(Layout.HORIZONTAL);
|
||||
});
|
||||
|
||||
test('should toggle from TABBED to HORIZONTAL', () => {
|
||||
const result = toggleOrientation(Layout.TABBED);
|
||||
expect(result).toBe(Layout.HORIZONTAL);
|
||||
});
|
||||
|
||||
test('enum reverse mapping should return string names', () => {
|
||||
expect(Layout[Layout.HORIZONTAL]).toBe('HORIZONTAL');
|
||||
expect(Layout[Layout.VERTICAL]).toBe('VERTICAL');
|
||||
expect(Layout[Layout.TABBED]).toBe('TABBED');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -100,6 +113,71 @@ describe('Container Logic Tests', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('Tabbed Bounds Calculation', () => {
|
||||
const TAB_BAR_HEIGHT = 24;
|
||||
|
||||
test('should give all items the same content rect in tabbed mode', () => {
|
||||
const workArea = { x: 100, y: 0, width: 1000, height: 500 };
|
||||
const itemCount = 3;
|
||||
|
||||
const contentRect = {
|
||||
x: workArea.x,
|
||||
y: workArea.y + TAB_BAR_HEIGHT,
|
||||
width: workArea.width,
|
||||
height: workArea.height - TAB_BAR_HEIGHT,
|
||||
};
|
||||
|
||||
const bounds = Array.from({ length: itemCount }, () => contentRect);
|
||||
|
||||
expect(bounds.length).toBe(3);
|
||||
// All bounds should be identical
|
||||
bounds.forEach(b => {
|
||||
expect(b.x).toBe(100);
|
||||
expect(b.y).toBe(TAB_BAR_HEIGHT);
|
||||
expect(b.width).toBe(1000);
|
||||
expect(b.height).toBe(500 - TAB_BAR_HEIGHT);
|
||||
});
|
||||
});
|
||||
|
||||
test('tab bar rect should occupy top of work area', () => {
|
||||
const workArea = { x: 200, y: 50, width: 800, height: 600 };
|
||||
|
||||
const tabBarRect = {
|
||||
x: workArea.x,
|
||||
y: workArea.y,
|
||||
width: workArea.width,
|
||||
height: TAB_BAR_HEIGHT,
|
||||
};
|
||||
|
||||
expect(tabBarRect.x).toBe(200);
|
||||
expect(tabBarRect.y).toBe(50);
|
||||
expect(tabBarRect.width).toBe(800);
|
||||
expect(tabBarRect.height).toBe(TAB_BAR_HEIGHT);
|
||||
});
|
||||
|
||||
test('active tab index should clamp after removal', () => {
|
||||
let activeTabIndex = 2;
|
||||
const itemCount = 2; // after removing one from 3
|
||||
|
||||
if (activeTabIndex >= itemCount) {
|
||||
activeTabIndex = itemCount - 1;
|
||||
}
|
||||
|
||||
expect(activeTabIndex).toBe(1);
|
||||
});
|
||||
|
||||
test('active tab index should stay at 0 when first item removed', () => {
|
||||
let activeTabIndex = 0;
|
||||
const itemCount = 2; // after removing one from 3
|
||||
|
||||
if (activeTabIndex >= itemCount) {
|
||||
activeTabIndex = itemCount - 1;
|
||||
}
|
||||
|
||||
expect(activeTabIndex).toBe(0);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Window Index Finding', () => {
|
||||
test('should find window index in array', () => {
|
||||
const windows = [
|
||||
|
||||
@@ -2,7 +2,7 @@ import Adw from 'gi://Adw';
|
||||
import Gio from 'gi://Gio';
|
||||
import Gtk from 'gi://Gtk';
|
||||
import Gdk from 'gi://Gdk';
|
||||
import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
|
||||
import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import {EntryRow} from "./keybindings.js";
|
||||
|
||||
@@ -11,160 +11,115 @@ export default class AerospikeExtensions extends ExtensionPreferences {
|
||||
// Create settings object
|
||||
const settings = this.getSettings('org.gnome.shell.extensions.aerospike');
|
||||
|
||||
// Create a preferences page
|
||||
const page = new Adw.PreferencesPage({
|
||||
title: _('Settings'),
|
||||
icon_name: 'preferences-system-symbolic',
|
||||
// Create keybindings page (top-level)
|
||||
const keybindingsPage = new Adw.PreferencesPage({
|
||||
title: _('Keybindings'),
|
||||
icon_name: 'input-keyboard-symbolic',
|
||||
});
|
||||
window.add(page);
|
||||
window.add(keybindingsPage);
|
||||
|
||||
const keybindingMap = this.createKeybindingMap();
|
||||
|
||||
// Create options group
|
||||
const optionsGroup = new Adw.PreferencesGroup({
|
||||
title: _('Options'),
|
||||
});
|
||||
page.add(optionsGroup);
|
||||
|
||||
// Add dropdown
|
||||
const dropdownRow = new Adw.ComboRow({
|
||||
title: _('Select an option'),
|
||||
});
|
||||
optionsGroup.add(dropdownRow);
|
||||
|
||||
// Create dropdown model
|
||||
const dropdownModel = new Gtk.StringList();
|
||||
dropdownModel.append(_('Option 1'));
|
||||
dropdownModel.append(_('Option 2'));
|
||||
dropdownModel.append(_('Option 3'));
|
||||
dropdownModel.append(_('Option 4'));
|
||||
|
||||
dropdownRow.set_model(dropdownModel);
|
||||
|
||||
// Set the active option based on settings
|
||||
const currentOption = settings.get_string('dropdown-option');
|
||||
switch (currentOption) {
|
||||
case 'option1':
|
||||
dropdownRow.set_selected(0);
|
||||
break;
|
||||
case 'option2':
|
||||
dropdownRow.set_selected(1);
|
||||
break;
|
||||
case 'option3':
|
||||
dropdownRow.set_selected(2);
|
||||
break;
|
||||
case 'option4':
|
||||
dropdownRow.set_selected(3);
|
||||
break;
|
||||
default:
|
||||
dropdownRow.set_selected(0);
|
||||
}
|
||||
|
||||
// Connect dropdown change signal
|
||||
dropdownRow.connect('notify::selected', () => {
|
||||
const selected = dropdownRow.get_selected();
|
||||
let optionValue: string;
|
||||
|
||||
switch (selected) {
|
||||
case 0:
|
||||
optionValue = 'option1';
|
||||
break;
|
||||
case 1:
|
||||
optionValue = 'option2';
|
||||
break;
|
||||
case 2:
|
||||
optionValue = 'option3';
|
||||
break;
|
||||
case 3:
|
||||
optionValue = 'option4';
|
||||
break;
|
||||
default:
|
||||
optionValue = 'option1';
|
||||
}
|
||||
|
||||
settings.set_string('dropdown-option', optionValue);
|
||||
});
|
||||
|
||||
// Add color button
|
||||
const colorRow = new Adw.ActionRow({
|
||||
title: _('Choose a color'),
|
||||
});
|
||||
optionsGroup.add(colorRow);
|
||||
|
||||
const colorButton = new Gtk.ColorButton();
|
||||
colorRow.add_suffix(colorButton);
|
||||
colorRow.set_activatable_widget(colorButton);
|
||||
|
||||
// Set current color from settings
|
||||
const colorStr = settings.get_string('color-selection');
|
||||
const rgba = new Gdk.RGBA();
|
||||
rgba.parse(colorStr);
|
||||
colorButton.set_rgba(rgba);
|
||||
|
||||
// Connect color button signal
|
||||
colorButton.connect('color-set', () => {
|
||||
const color = colorButton.get_rgba().to_string();
|
||||
settings.set_string('color-selection', color);
|
||||
});
|
||||
|
||||
// Create keybindings group
|
||||
const keybindingsGroup = new Adw.PreferencesGroup({
|
||||
title: _('Keyboard Shortcuts'),
|
||||
// Top-level Keybindings header group with syntax help
|
||||
const keybindingsHeader = new Adw.PreferencesGroup({
|
||||
title: _('Keybindings'),
|
||||
description: `${_("Syntax")}: <Super>h, <Shift>g, <Super><Shift>h
|
||||
${_("Legend")}: <Super> - ${_("Windows key")}, <Primary> - ${_("Control key")}
|
||||
${_("Delete text to unset. Press Return key to accept.")}`,
|
||||
});
|
||||
page.add(keybindingsGroup);
|
||||
keybindingsPage.add(keybindingsHeader);
|
||||
|
||||
// Add keybinding rows as EntryRows with proper mapping
|
||||
// Use the helper function to create the map object
|
||||
const keybindingMap = this.createKeybindingMap();
|
||||
|
||||
keybindingsGroup.add(
|
||||
// --- Focus group ---
|
||||
const focusGroup = new Adw.PreferencesGroup({
|
||||
title: _('Focus'),
|
||||
});
|
||||
keybindingsPage.add(focusGroup);
|
||||
|
||||
focusGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 1'),
|
||||
title: _('Focus Left'),
|
||||
settings: settings,
|
||||
bind: 'focus-left',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
focusGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Focus Right'),
|
||||
settings: settings,
|
||||
bind: 'focus-right',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
focusGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Focus Up'),
|
||||
settings: settings,
|
||||
bind: 'focus-up',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
focusGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Focus Down'),
|
||||
settings: settings,
|
||||
bind: 'focus-down',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
// --- Move group ---
|
||||
const moveGroup = new Adw.PreferencesGroup({
|
||||
title: _('Move'),
|
||||
});
|
||||
keybindingsPage.add(moveGroup);
|
||||
|
||||
moveGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Move Left'),
|
||||
settings: settings,
|
||||
bind: 'move-left',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
|
||||
moveGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 2'),
|
||||
title: _('Move Right'),
|
||||
settings: settings,
|
||||
bind: 'move-right',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
|
||||
moveGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 3'),
|
||||
title: _('Move Up'),
|
||||
settings: settings,
|
||||
bind: 'join-with-left',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Action 4'),
|
||||
settings: settings,
|
||||
bind: 'join-with-right',
|
||||
bind: 'move-up',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
moveGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Print Tree Structure'),
|
||||
title: _('Move Down'),
|
||||
settings: settings,
|
||||
bind: 'print-tree',
|
||||
bind: 'move-down',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
// --- Container Interactions group ---
|
||||
const containerGroup = new Adw.PreferencesGroup({
|
||||
title: _('Container Interactions'),
|
||||
});
|
||||
keybindingsPage.add(containerGroup);
|
||||
|
||||
containerGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Toggle Orientation'),
|
||||
settings: settings,
|
||||
@@ -173,7 +128,7 @@ export default class AerospikeExtensions extends ExtensionPreferences {
|
||||
})
|
||||
);
|
||||
|
||||
keybindingsGroup.add(
|
||||
containerGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Reset Container Ratios to Equal'),
|
||||
settings: settings,
|
||||
@@ -182,6 +137,30 @@ export default class AerospikeExtensions extends ExtensionPreferences {
|
||||
})
|
||||
);
|
||||
|
||||
containerGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Toggle Tabbed Mode'),
|
||||
settings: settings,
|
||||
bind: 'toggle-tabbed',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
// --- Debugging group ---
|
||||
const debuggingGroup = new Adw.PreferencesGroup({
|
||||
title: _('Debugging'),
|
||||
});
|
||||
keybindingsPage.add(debuggingGroup);
|
||||
|
||||
debuggingGroup.add(
|
||||
new EntryRow({
|
||||
title: _('Print Tree Structure'),
|
||||
settings: settings,
|
||||
bind: 'print-tree',
|
||||
map: keybindingMap
|
||||
})
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
// Helper function to create a keybinding mapping object
|
||||
|
||||
@@ -2,10 +2,19 @@ import {WindowWrapper} from "./window.js";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import queueEvent from "../utils/events.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
import {TabBar, TAB_BAR_HEIGHT} from "./tabBar.js";
|
||||
|
||||
enum Orientation {
|
||||
HORIZONTAL = 0,
|
||||
VERTICAL = 1,
|
||||
export enum Layout {
|
||||
ACC_HORIZONTAL = 0,
|
||||
ACC_VERTICAL = 1,
|
||||
TABBED = 2,
|
||||
}
|
||||
|
||||
export enum Direction {
|
||||
LEFT = 'left',
|
||||
RIGHT = 'right',
|
||||
UP = 'up',
|
||||
DOWN = 'down',
|
||||
}
|
||||
|
||||
// Returns equal ratios summing exactly to 1.0, with float drift absorbed by the last slot.
|
||||
@@ -22,10 +31,17 @@ export default class WindowContainer {
|
||||
|
||||
_tiledItems: (WindowWrapper | WindowContainer)[];
|
||||
_tiledWindowLookup: Map<number, WindowWrapper>;
|
||||
_orientation: Orientation = Orientation.HORIZONTAL;
|
||||
_orientation: Layout = Layout.ACC_HORIZONTAL;
|
||||
_workArea: Rect;
|
||||
|
||||
// -- Accordion Mode States
|
||||
|
||||
_splitRatios: number[];
|
||||
|
||||
// -- Tabbed mode state -----------------------------------------------------
|
||||
_activeTabIndex: number = 0;
|
||||
_tabBar: TabBar | null = null;
|
||||
|
||||
constructor(workspaceArea: Rect) {
|
||||
this._tiledItems = [];
|
||||
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
||||
@@ -33,54 +49,180 @@ export default class WindowContainer {
|
||||
this._splitRatios = [];
|
||||
}
|
||||
|
||||
// ─── Helpers ────────────────────────────────────────────────────────────────
|
||||
// --- Helpers ----------------------------------------------------------------
|
||||
|
||||
private _resetRatios(): void {
|
||||
this._splitRatios = equalRatios(this._tiledItems.length);
|
||||
}
|
||||
|
||||
private _addRatioForNewWindow(): void {
|
||||
/**
|
||||
* Proportionally shrink existing ratios to carve out space for a new item
|
||||
* at the given index. If no index is supplied the ratio is appended at the end.
|
||||
*/
|
||||
private _addRatioForNewWindow(index?: number): void {
|
||||
const n = this._tiledItems.length;
|
||||
if (n <= 1) {
|
||||
this._splitRatios = [1.0];
|
||||
return;
|
||||
}
|
||||
const newRatio = 1 / n;
|
||||
const scale = 1 - newRatio;
|
||||
const scaled = this._splitRatios.map(r => r * scale);
|
||||
const scale = 1 - newRatio;
|
||||
const scaled = this._splitRatios.map(r => r * scale);
|
||||
const partialSum = scaled.reduce((a, b) => a + b, 0) + newRatio;
|
||||
scaled[scaled.length - 1] += (1.0 - partialSum);
|
||||
this._splitRatios = [...scaled, newRatio];
|
||||
|
||||
const insertAt = index ?? scaled.length;
|
||||
scaled.splice(insertAt, 0, newRatio);
|
||||
this._splitRatios = scaled;
|
||||
}
|
||||
|
||||
private _totalDimension(): number {
|
||||
return this._orientation === Orientation.HORIZONTAL
|
||||
return this._orientation === Layout.ACC_HORIZONTAL
|
||||
? this._workArea.width
|
||||
: this._workArea.height;
|
||||
}
|
||||
|
||||
// ─── Public API ─────────────────────────────────────────────────────────────
|
||||
isTabbed(): boolean {
|
||||
return this._orientation === Layout.TABBED;
|
||||
}
|
||||
|
||||
// --- Public API -------------------------------------------------------------
|
||||
|
||||
move(rect: Rect): void {
|
||||
this._workArea = rect;
|
||||
this.tileWindows();
|
||||
this.drawWindows();
|
||||
}
|
||||
|
||||
toggleOrientation(): void {
|
||||
this._orientation = this._orientation === Orientation.HORIZONTAL
|
||||
? Orientation.VERTICAL
|
||||
: Orientation.HORIZONTAL;
|
||||
Logger.info(`Container orientation toggled to ${this._orientation === Orientation.HORIZONTAL ? 'HORIZONTAL' : 'VERTICAL'}`);
|
||||
this.tileWindows();
|
||||
if (this._orientation === Layout.TABBED) {
|
||||
// Tabbed → Horizontal: restore accordion mode
|
||||
this.setAccordion(Layout.ACC_HORIZONTAL);
|
||||
} else {
|
||||
this._orientation = this._orientation === Layout.ACC_HORIZONTAL
|
||||
? Layout.ACC_VERTICAL
|
||||
: Layout.ACC_HORIZONTAL;
|
||||
Logger.info(`Container orientation toggled to ${Layout[this._orientation]}`);
|
||||
this.drawWindows();
|
||||
}
|
||||
}
|
||||
|
||||
addWindow(winWrap: WindowWrapper): void {
|
||||
this._tiledItems.push(winWrap);
|
||||
/**
|
||||
* Switch this container to tabbed mode.
|
||||
*/
|
||||
setTabbed(): void {
|
||||
if (this._orientation === Layout.TABBED) return;
|
||||
|
||||
Logger.info("Container switching to TABBED mode");
|
||||
this._orientation = Layout.TABBED;
|
||||
|
||||
// Clamp active tab index
|
||||
if (this._activeTabIndex < 0 || this._activeTabIndex >= this._tiledItems.length) {
|
||||
this._activeTabIndex = 0;
|
||||
}
|
||||
|
||||
// Create tab bar
|
||||
this._tabBar = new TabBar((index) => {
|
||||
this.setActiveTab(index);
|
||||
});
|
||||
|
||||
this.drawWindows();
|
||||
}
|
||||
|
||||
/**
|
||||
* Switch this container back to accordion (H or V) mode.
|
||||
*/
|
||||
setAccordion(orientation: Layout.ACC_HORIZONTAL | Layout.ACC_VERTICAL): void {
|
||||
if (this._orientation !== Layout.TABBED) {
|
||||
// Already accordion — just set the orientation
|
||||
this._orientation = orientation;
|
||||
this.drawWindows();
|
||||
return;
|
||||
}
|
||||
|
||||
Logger.info(`Container switching from TABBED to ${Layout[orientation]}`);
|
||||
this._orientation = orientation;
|
||||
|
||||
// Destroy tab bar
|
||||
if (this._tabBar) {
|
||||
this._tabBar.destroy();
|
||||
this._tabBar = null;
|
||||
}
|
||||
|
||||
// Show all windows (they may have been hidden in tabbed mode)
|
||||
this._showAllWindows();
|
||||
|
||||
this.drawWindows();
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the active tab by index. Shows that window, hides others, updates tab bar.
|
||||
*/
|
||||
setActiveTab(index: number): void {
|
||||
if (!this.isTabbed()) return;
|
||||
if (index < 0 || index >= this._tiledItems.length) return;
|
||||
|
||||
this._activeTabIndex = index;
|
||||
Logger.info(`Active tab set to ${index}`);
|
||||
|
||||
this._applyTabVisibility();
|
||||
this._updateTabBar();
|
||||
|
||||
// Tile to resize the active window to the content area
|
||||
this.drawWindows();
|
||||
}
|
||||
|
||||
getActiveTabIndex(): number {
|
||||
return this._activeTabIndex;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the given window is a tab in this container, make it the active tab.
|
||||
* Returns true if the window was found and activated.
|
||||
*/
|
||||
focusWindowTab(windowId: number): boolean {
|
||||
if (!this.isTabbed()) return false;
|
||||
|
||||
const index = this._getIndexOfWindow(windowId);
|
||||
if (index !== -1 && index !== this._activeTabIndex) {
|
||||
this.setActiveTab(index);
|
||||
return true;
|
||||
}
|
||||
return index !== -1;
|
||||
}
|
||||
|
||||
hideTabBar(): void {
|
||||
this._tabBar?.hide();
|
||||
}
|
||||
|
||||
showTabBar(): void {
|
||||
if (this.isTabbed() && this._tabBar) {
|
||||
this._tabBar.show();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a window to this container.
|
||||
* If `index` is omitted the window is appended at the end.
|
||||
* A negative index (e.g. -1) is treated as "append at end".
|
||||
*/
|
||||
addWindow(winWrap: WindowWrapper, index?: number): void {
|
||||
const insertAt = (index === undefined || index < 0)
|
||||
? this._tiledItems.length
|
||||
: Math.min(index, this._tiledItems.length);
|
||||
|
||||
this._tiledItems.splice(insertAt, 0, winWrap);
|
||||
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
||||
this._addRatioForNewWindow();
|
||||
this._addRatioForNewWindow(insertAt);
|
||||
|
||||
if (this.isTabbed()) {
|
||||
// TODO: make it so that when tabs are added they are made the current active tab
|
||||
this._applyTabVisibility();
|
||||
this._updateTabBar();
|
||||
}
|
||||
|
||||
queueEvent({
|
||||
name: "tiling-windows",
|
||||
callback: () => this.tileWindows(),
|
||||
callback: () => this.drawWindows(),
|
||||
}, 100);
|
||||
}
|
||||
|
||||
@@ -111,13 +253,28 @@ export default class WindowContainer {
|
||||
|
||||
removeWindow(win_id: number): void {
|
||||
if (this._tiledWindowLookup.has(win_id)) {
|
||||
// Get index before deleting from lookup to avoid race condition
|
||||
const index = this._getIndexOfWindow(win_id);
|
||||
this._tiledWindowLookup.delete(win_id);
|
||||
if (index !== -1) {
|
||||
// If removing the window that was hidden in tabbed mode,
|
||||
// make sure to show it first so it doesn't stay invisible
|
||||
const item = this._tiledItems[index];
|
||||
if (item instanceof WindowWrapper) {
|
||||
item.showWindow();
|
||||
}
|
||||
this._tiledItems.splice(index, 1);
|
||||
}
|
||||
this._resetRatios();
|
||||
|
||||
if (this.isTabbed()) {
|
||||
if (this._tiledItems.length === 0) {
|
||||
this._activeTabIndex = 0;
|
||||
} else if (this._activeTabIndex >= this._tiledItems.length) {
|
||||
this._activeTabIndex = this._tiledItems.length - 1;
|
||||
}
|
||||
this._applyTabVisibility();
|
||||
this._updateTabBar();
|
||||
}
|
||||
} else {
|
||||
for (const item of this._tiledItems) {
|
||||
if (item instanceof WindowContainer) {
|
||||
@@ -125,7 +282,7 @@ export default class WindowContainer {
|
||||
}
|
||||
}
|
||||
}
|
||||
this.tileWindows();
|
||||
this.drawWindows();
|
||||
}
|
||||
|
||||
disconnectSignals(): void {
|
||||
@@ -139,37 +296,159 @@ export default class WindowContainer {
|
||||
}
|
||||
|
||||
removeAllWindows(): void {
|
||||
// tabbed mode hides all windows - this ensures they are available before removal
|
||||
this._showAllWindows();
|
||||
|
||||
if (this._tabBar) {
|
||||
this._tabBar.destroy();
|
||||
this._tabBar = null;
|
||||
}
|
||||
|
||||
this._tiledItems = [];
|
||||
this._tiledWindowLookup.clear();
|
||||
this._splitRatios = [];
|
||||
this._activeTabIndex = 0;
|
||||
}
|
||||
|
||||
tileWindows(): void {
|
||||
drawWindows(): void {
|
||||
Logger.log("TILING WINDOWS IN CONTAINER");
|
||||
Logger.log("WorkArea", this._workArea);
|
||||
this._tileItems();
|
||||
|
||||
if (this.isTabbed()) {
|
||||
this._tileTab();
|
||||
} else {
|
||||
this._tileAccordion();
|
||||
}
|
||||
}
|
||||
|
||||
_tileItems() {
|
||||
_tileAccordion() {
|
||||
if (this._tiledItems.length === 0) return;
|
||||
|
||||
const bounds = this.getBounds();
|
||||
Logger.info(`_tileItems: ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}] bounds=[${bounds.map(b => `(${b.x},${b.y},${b.width},${b.height})`).join(', ')}]`);
|
||||
Logger.info(`_tileAccordion: ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}] bounds=[${bounds.map(b => `(${b.x},${b.y},${b.width},${b.height})`).join(', ')}]`);
|
||||
this._tiledItems.forEach((item, index) => {
|
||||
const rect = bounds[index];
|
||||
if (item instanceof WindowContainer) {
|
||||
item.move(rect);
|
||||
} else {
|
||||
Logger.info(`_tileItems: window[${index}] id=${item.getWindowId()} dragging=${item._dragging} → rect=(${rect.x},${rect.y},${rect.width},${rect.height})`);
|
||||
Logger.info(`_tileAccordion: window[${index}] id=${item.getWindowId()} dragging=${item._dragging} → rect=(${rect.x},${rect.y},${rect.width},${rect.height})`);
|
||||
item.safelyResizeWindow(rect);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ─── Bounds Calculation ──────────────────────────────────────────────────────
|
||||
private _tileTab(): void {
|
||||
if (this._tiledItems.length === 0) return;
|
||||
|
||||
const tabBarRect: Rect = {
|
||||
x: this._workArea.x,
|
||||
y: this._workArea.y,
|
||||
width: this._workArea.width,
|
||||
height: TAB_BAR_HEIGHT,
|
||||
};
|
||||
|
||||
const contentRect: Rect = {
|
||||
x: this._workArea.x,
|
||||
y: this._workArea.y + TAB_BAR_HEIGHT,
|
||||
width: this._workArea.width,
|
||||
height: this._workArea.height - TAB_BAR_HEIGHT,
|
||||
};
|
||||
|
||||
// Position and show the tab bar
|
||||
if (this._tabBar) {
|
||||
this._tabBar.setPosition(tabBarRect);
|
||||
if (!this._tabBar.isVisible()) {
|
||||
this._rebuildAndShowTabBar();
|
||||
}
|
||||
}
|
||||
|
||||
this._applyTabVisibility();
|
||||
|
||||
const activeItem = this._tiledItems[this._activeTabIndex];
|
||||
if (activeItem) {
|
||||
if (activeItem instanceof WindowContainer) {
|
||||
activeItem.move(contentRect);
|
||||
} else {
|
||||
Logger.info(`_tileTabbed: active tab[${this._activeTabIndex}] id=${activeItem.getWindowId()} → rect=(${contentRect.x},${contentRect.y},${contentRect.width},${contentRect.height})`);
|
||||
activeItem.safelyResizeWindow(contentRect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the active tab window, hide all others.
|
||||
*/
|
||||
private _applyTabVisibility(): void {
|
||||
this._tiledItems.forEach((item, index) => {
|
||||
if (item instanceof WindowWrapper) {
|
||||
if (index === this._activeTabIndex) {
|
||||
item.showWindow();
|
||||
} else {
|
||||
item.hideWindow();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Show all windows (used when leaving tabbed mode).
|
||||
*/
|
||||
private _showAllWindows(): void {
|
||||
this._tiledItems.forEach((item) => {
|
||||
if (item instanceof WindowWrapper) {
|
||||
item.showWindow();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Rebuild the tab bar buttons and show it.
|
||||
*/
|
||||
private _rebuildAndShowTabBar(): void {
|
||||
if (!this._tabBar) return;
|
||||
|
||||
const windowItems = this._tiledItems.filter(
|
||||
(item): item is WindowWrapper => item instanceof WindowWrapper
|
||||
);
|
||||
|
||||
this._tabBar.rebuild(windowItems, this._activeTabIndex);
|
||||
this._tabBar.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Public entry point to refresh tab titles (e.g. when a window title changes).
|
||||
*/
|
||||
refreshTabTitles(): void {
|
||||
this._updateTabBar();
|
||||
}
|
||||
|
||||
/**
|
||||
* Update tab bar state (active highlight, titles) without a full rebuild.
|
||||
*/
|
||||
private _updateTabBar(): void {
|
||||
if (!this._tabBar) return;
|
||||
|
||||
// Rebuild is cheap — just recreate buttons from the current items
|
||||
const windowItems = this._tiledItems.filter(
|
||||
(item): item is WindowWrapper => item instanceof WindowWrapper
|
||||
);
|
||||
|
||||
this._tabBar.rebuild(windowItems, this._activeTabIndex);
|
||||
}
|
||||
|
||||
getBounds(): Rect[] {
|
||||
return this._orientation === Orientation.HORIZONTAL
|
||||
if (this._orientation === Layout.TABBED) {
|
||||
// In tabbed mode, all items share the same content rect
|
||||
const contentRect: Rect = {
|
||||
x: this._workArea.x,
|
||||
y: this._workArea.y + TAB_BAR_HEIGHT,
|
||||
width: this._workArea.width,
|
||||
height: this._workArea.height - TAB_BAR_HEIGHT,
|
||||
};
|
||||
return this._tiledItems.map(() => contentRect);
|
||||
}
|
||||
|
||||
return this._orientation === Layout.ACC_HORIZONTAL
|
||||
? this._computeBounds('horizontal')
|
||||
: this._computeBounds('vertical');
|
||||
}
|
||||
@@ -187,14 +466,15 @@ export default class WindowContainer {
|
||||
used += size;
|
||||
|
||||
return isHorizontal
|
||||
? { x: this._workArea.x + offset, y: this._workArea.y, width: size, height: this._workArea.height }
|
||||
: { x: this._workArea.x, y: this._workArea.y + offset, width: this._workArea.width, height: size };
|
||||
? {x: this._workArea.x + offset, y: this._workArea.y, width: size, height: this._workArea.height}
|
||||
: {x: this._workArea.x, y: this._workArea.y + offset, width: this._workArea.width, height: size};
|
||||
});
|
||||
}
|
||||
|
||||
// ─── Boundary Adjustment ─────────────────────────────────────────────────────
|
||||
|
||||
adjustBoundary(boundaryIndex: number, deltaPixels: number): boolean {
|
||||
// No boundary adjustment in tabbed mode
|
||||
if (this.isTabbed()) return false;
|
||||
|
||||
if (boundaryIndex < 0 || boundaryIndex >= this._tiledItems.length - 1) {
|
||||
Logger.warn(`adjustBoundary: invalid boundaryIndex ${boundaryIndex}`);
|
||||
return false;
|
||||
@@ -204,22 +484,22 @@ export default class WindowContainer {
|
||||
if (totalDim === 0) return false;
|
||||
|
||||
const ratioDelta = deltaPixels / totalDim;
|
||||
const newLeft = this._splitRatios[boundaryIndex] + ratioDelta;
|
||||
const newRight = this._splitRatios[boundaryIndex + 1] - ratioDelta;
|
||||
const newLeft = this._splitRatios[boundaryIndex] + ratioDelta;
|
||||
const newRight = this._splitRatios[boundaryIndex + 1] - ratioDelta;
|
||||
|
||||
if (newLeft <= 0 || newRight <= 0) {
|
||||
Logger.log(`adjustBoundary: clamped — newLeft=${newLeft.toFixed(3)}, newRight=${newRight.toFixed(3)}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
this._splitRatios[boundaryIndex] = newLeft;
|
||||
this._splitRatios[boundaryIndex] = newLeft;
|
||||
this._splitRatios[boundaryIndex + 1] = newRight;
|
||||
|
||||
Logger.info(`adjustBoundary: boundary=${boundaryIndex} ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}]`);
|
||||
return true;
|
||||
}
|
||||
|
||||
// ─── Container Lookup ────────────────────────────────────────────────────────
|
||||
// --- Container Lookup --------------------------------------------------------
|
||||
|
||||
getContainerForWindow(win_id: number): WindowContainer | null {
|
||||
for (const item of this._tiledItems) {
|
||||
@@ -248,6 +528,12 @@ export default class WindowContainer {
|
||||
|
||||
// TODO: update this to work with nested containers - all other logic should already be working
|
||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
||||
// In tabbed mode, dragging reorders tabs but doesn't change layout
|
||||
if (this.isTabbed()) {
|
||||
// Don't reorder during tabbed mode — tabs have a fixed visual layout
|
||||
return;
|
||||
}
|
||||
|
||||
const original_index = this.getIndexOfItemNested(item);
|
||||
|
||||
if (original_index === -1) {
|
||||
@@ -266,12 +552,153 @@ export default class WindowContainer {
|
||||
Logger.info(`itemDragged: swapped slots ${original_index}<->${new_index}, ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}]`);
|
||||
[this._tiledItems[original_index], this._tiledItems[new_index]] =
|
||||
[this._tiledItems[new_index], this._tiledItems[original_index]];
|
||||
this.tileWindows();
|
||||
this.drawWindows();
|
||||
}
|
||||
}
|
||||
|
||||
resetRatios(): void {
|
||||
this._resetRatios();
|
||||
this.tileWindows();
|
||||
this.drawWindows();
|
||||
}
|
||||
|
||||
// --- Directional Move (swap) ------------------------------------------------
|
||||
|
||||
/**
|
||||
* Swap the window at `windowId` with its neighbour in the given direction.
|
||||
* Returns true if the swap occurred, false if the window is already at the edge
|
||||
* or the direction is perpendicular to the container axis.
|
||||
*/
|
||||
swapWindowInDirection(windowId: number, direction: Direction): boolean {
|
||||
const currentIndex = this._getIndexOfWindow(windowId);
|
||||
if (currentIndex === -1) return false;
|
||||
|
||||
if (this.isTabbed()) {
|
||||
// Tabbed: left/up = swap toward start, right/down = swap toward end
|
||||
const delta = (direction === Direction.LEFT || direction === Direction.UP) ? -1 : 1;
|
||||
const newIndex = currentIndex + delta;
|
||||
if (newIndex < 0 || newIndex >= this._tiledItems.length) return false;
|
||||
|
||||
this._swapItems(currentIndex, newIndex);
|
||||
this._activeTabIndex = newIndex;
|
||||
this._updateTabBar();
|
||||
this.drawWindows();
|
||||
return true;
|
||||
}
|
||||
|
||||
// Accordion mode — only swap along the container's axis
|
||||
const isAlongAxis =
|
||||
(this._orientation === Layout.ACC_HORIZONTAL && (direction === Direction.LEFT || direction === Direction.RIGHT)) ||
|
||||
(this._orientation === Layout.ACC_VERTICAL && (direction === Direction.UP || direction === Direction.DOWN));
|
||||
|
||||
if (!isAlongAxis) return false;
|
||||
|
||||
const delta = (direction === Direction.LEFT || direction === Direction.UP) ? -1 : 1;
|
||||
const newIndex = currentIndex + delta;
|
||||
if (newIndex < 0 || newIndex >= this._tiledItems.length) return false;
|
||||
|
||||
this._swapItems(currentIndex, newIndex);
|
||||
this.drawWindows();
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Swap two items in `_tiledItems` and their corresponding split ratios.
|
||||
*/
|
||||
private _swapItems(indexA: number, indexB: number): void {
|
||||
[this._tiledItems[indexA], this._tiledItems[indexB]] =
|
||||
[this._tiledItems[indexB], this._tiledItems[indexA]];
|
||||
[this._splitRatios[indexA], this._splitRatios[indexB]] =
|
||||
[this._splitRatios[indexB], this._splitRatios[indexA]];
|
||||
}
|
||||
|
||||
// --- Directional Navigation ------------------------------------------------
|
||||
|
||||
/**
|
||||
* Given a window inside this container and a direction, return the window ID
|
||||
* that should receive focus, or null if the edge of the container is reached.
|
||||
*
|
||||
* Behaviour by layout mode:
|
||||
* - ACC_HORIZONTAL: left/right moves to the prev/next item; up/down → null
|
||||
* - ACC_VERTICAL: up/down moves to the prev/next item; left/right → null
|
||||
* - TABBED: left/right moves to the prev/next tab; up/down → null
|
||||
*/
|
||||
getAdjacentWindowId(windowId: number, direction: Direction): number | null {
|
||||
const currentIndex = this._getIndexOfWindow(windowId);
|
||||
if (currentIndex === -1) return null;
|
||||
|
||||
if (this.isTabbed()) {
|
||||
// Tabbed: left/right cycle through tabs
|
||||
if (direction === Direction.LEFT || direction === Direction.UP) {
|
||||
const newIndex = currentIndex - 1;
|
||||
if (newIndex < 0) return null;
|
||||
return this._windowIdAtIndex(newIndex);
|
||||
}
|
||||
if (direction === Direction.RIGHT || direction === Direction.DOWN) {
|
||||
const newIndex = currentIndex + 1;
|
||||
if (newIndex >= this._tiledItems.length) return null;
|
||||
return this._windowIdAtIndex(newIndex);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// Accordion mode – only navigate along the container's axis
|
||||
const isAlongAxis =
|
||||
(this._orientation === Layout.ACC_HORIZONTAL && (direction === Direction.LEFT || direction === Direction.RIGHT)) ||
|
||||
(this._orientation === Layout.ACC_VERTICAL && (direction === Direction.UP || direction === Direction.DOWN));
|
||||
|
||||
if (!isAlongAxis) return null;
|
||||
|
||||
const delta = (direction === Direction.LEFT || direction === Direction.UP) ? -1 : 1;
|
||||
const newIndex = currentIndex + delta;
|
||||
if (newIndex < 0 || newIndex >= this._tiledItems.length) return null;
|
||||
|
||||
return this._windowIdAtIndex(newIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the "representative" window ID for the item at `index`.
|
||||
* If the item is a WindowWrapper, return its ID directly.
|
||||
* If it's a nested WindowContainer, return the first (or last) leaf window.
|
||||
*/
|
||||
private _windowIdAtIndex(index: number): number | null {
|
||||
const item = this._tiledItems[index];
|
||||
if (!item) return null;
|
||||
|
||||
if (item instanceof WindowWrapper) {
|
||||
return item.getWindowId();
|
||||
}
|
||||
if (item instanceof WindowContainer) {
|
||||
return item._firstLeafWindowId();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the window ID of the first leaf window in this container (depth-first).
|
||||
*/
|
||||
_firstLeafWindowId(): number | null {
|
||||
for (const item of this._tiledItems) {
|
||||
if (item instanceof WindowWrapper) return item.getWindowId();
|
||||
if (item instanceof WindowContainer) {
|
||||
const id = item._firstLeafWindowId();
|
||||
if (id !== null) return id;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the window ID of the last leaf window in this container (depth-first from end).
|
||||
*/
|
||||
_lastLeafWindowId(): number | null {
|
||||
for (let i = this._tiledItems.length - 1; i >= 0; i--) {
|
||||
const item = this._tiledItems[i];
|
||||
if (item instanceof WindowWrapper) return item.getWindowId();
|
||||
if (item instanceof WindowContainer) {
|
||||
const id = item._lastLeafWindowId();
|
||||
if (id !== null) return id;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import {WindowWrapper} from "./window.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import Meta from "gi://Meta";
|
||||
|
||||
import WindowContainer from "./container.js";
|
||||
|
||||
@@ -53,9 +52,9 @@ export default class Monitor {
|
||||
}
|
||||
}
|
||||
|
||||
addWindow(winWrap: WindowWrapper) {
|
||||
addWindow(winWrap: WindowWrapper, index?: number) {
|
||||
const window_workspace = winWrap.getWindow().get_workspace().index();
|
||||
this._workspaces[window_workspace].addWindow(winWrap);
|
||||
this._workspaces[window_workspace].addWindow(winWrap, index);
|
||||
}
|
||||
|
||||
tileWindows(): void {
|
||||
@@ -73,6 +72,31 @@ export default class Monitor {
|
||||
this._workspaces.push(new WindowContainer(this._workArea));
|
||||
}
|
||||
|
||||
focusWindowTab(windowId: number): void {
|
||||
for (const container of this._workspaces) {
|
||||
if (container.focusWindowTab(windowId)) return;
|
||||
}
|
||||
}
|
||||
|
||||
refreshTabTitlesForWindow(winWrap: WindowWrapper): void {
|
||||
const wsId = winWrap.getWorkspace();
|
||||
if (wsId >= 0 && wsId < this._workspaces.length) {
|
||||
this._workspaces[wsId].refreshTabTitles();
|
||||
}
|
||||
}
|
||||
|
||||
hideTabBars(): void {
|
||||
for (const container of this._workspaces) {
|
||||
container.hideTabBar();
|
||||
}
|
||||
}
|
||||
|
||||
showTabBars(): void {
|
||||
for (const container of this._workspaces) {
|
||||
container.showTabBar();
|
||||
}
|
||||
}
|
||||
|
||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
||||
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
||||
}
|
||||
|
||||
131
src/wm/tabBar.ts
Normal file
131
src/wm/tabBar.ts
Normal file
@@ -0,0 +1,131 @@
|
||||
import Clutter from 'gi://Clutter';
|
||||
import Pango from 'gi://Pango';
|
||||
import St from 'gi://St';
|
||||
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import {WindowWrapper} from "./window.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
|
||||
export const TAB_BAR_HEIGHT = 24;
|
||||
|
||||
type TabClickedCallback = (index: number) => void;
|
||||
|
||||
export class TabBar {
|
||||
private _bar: St.BoxLayout;
|
||||
private _buttons: St.Button[] = [];
|
||||
private _activeIndex: number = 0;
|
||||
private _onTabClicked: TabClickedCallback;
|
||||
private _visible: boolean = false;
|
||||
|
||||
constructor(onTabClicked: TabClickedCallback) {
|
||||
this._onTabClicked = onTabClicked;
|
||||
this._bar = new St.BoxLayout({
|
||||
style_class: 'aerospike-tab-bar',
|
||||
vertical: false,
|
||||
reactive: true,
|
||||
can_focus: false,
|
||||
track_hover: false,
|
||||
});
|
||||
// Force all tabs to equal width regardless of text length
|
||||
(this._bar.layout_manager as Clutter.BoxLayout).homogeneous = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Rebuild all tab buttons from the current list of window items.
|
||||
*/
|
||||
rebuild(items: WindowWrapper[], activeIndex: number): void {
|
||||
// Remove old buttons
|
||||
this._bar.destroy_all_children();
|
||||
this._buttons = [];
|
||||
|
||||
items.forEach((item, index) => {
|
||||
const label = new St.Label({
|
||||
text: item.getTabLabel(),
|
||||
style_class: 'aerospike-tab-label',
|
||||
y_align: Clutter.ActorAlign.CENTER,
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
x_expand: true,
|
||||
});
|
||||
label.clutter_text.ellipsize = Pango.EllipsizeMode.END;
|
||||
|
||||
const button = new St.Button({
|
||||
style_class: 'aerospike-tab',
|
||||
reactive: true,
|
||||
can_focus: false,
|
||||
track_hover: true,
|
||||
x_expand: true,
|
||||
child: label,
|
||||
});
|
||||
|
||||
button.connect('clicked', () => {
|
||||
this._onTabClicked(index);
|
||||
});
|
||||
|
||||
this._bar.add_child(button);
|
||||
this._buttons.push(button);
|
||||
});
|
||||
|
||||
this.setActive(activeIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update just the title text of a single tab (e.g. when a window title changes).
|
||||
*/
|
||||
updateTabTitle(index: number, title: string): void {
|
||||
if (index < 0 || index >= this._buttons.length) return;
|
||||
const label = this._buttons[index].get_child() as St.Label;
|
||||
if (label) label.set_text(title);
|
||||
}
|
||||
|
||||
/**
|
||||
* Highlight the active tab and dim the rest.
|
||||
*/
|
||||
setActive(index: number): void {
|
||||
this._activeIndex = index;
|
||||
this._buttons.forEach((btn, i) => {
|
||||
if (i === index) {
|
||||
btn.add_style_class_name('aerospike-tab-active');
|
||||
} else {
|
||||
btn.remove_style_class_name('aerospike-tab-active');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Position and size the tab bar at the given screen rect.
|
||||
*/
|
||||
setPosition(rect: Rect): void {
|
||||
this._bar.set_position(rect.x, rect.y);
|
||||
this._bar.set_size(rect.width, rect.height);
|
||||
}
|
||||
|
||||
show(): void {
|
||||
if (this._visible) return;
|
||||
this._visible = true;
|
||||
Main.layoutManager.uiGroup.add_child(this._bar);
|
||||
this._bar.show();
|
||||
Logger.log("TabBar shown");
|
||||
}
|
||||
|
||||
hide(): void {
|
||||
if (!this._visible) return;
|
||||
this._visible = false;
|
||||
this._bar.hide();
|
||||
if (this._bar.get_parent()) {
|
||||
Main.layoutManager.uiGroup.remove_child(this._bar);
|
||||
}
|
||||
Logger.log("TabBar hidden");
|
||||
}
|
||||
|
||||
destroy(): void {
|
||||
this.hide();
|
||||
this._bar.destroy_all_children();
|
||||
this._buttons = [];
|
||||
this._bar.destroy();
|
||||
Logger.log("TabBar destroyed");
|
||||
}
|
||||
|
||||
isVisible(): boolean {
|
||||
return this._visible;
|
||||
}
|
||||
}
|
||||
@@ -47,6 +47,31 @@ export class WindowWrapper {
|
||||
return this._window.get_frame_rect();
|
||||
}
|
||||
|
||||
getTabLabel(): string {
|
||||
const rawAppName = this._window.get_wm_class() ?? '';
|
||||
// Strip reverse-domain prefix (e.g. "org.gnome.Nautilus" -> "Nautilus")
|
||||
const lastName = rawAppName.includes('.')
|
||||
? (rawAppName.split('.').pop() ?? rawAppName)
|
||||
: rawAppName;
|
||||
// Capitalize first letter
|
||||
const appName = lastName.charAt(0).toUpperCase() + lastName.slice(1);
|
||||
const title = this._window.get_title() ?? 'Untitled';
|
||||
if (appName && appName.toLowerCase() !== title.toLowerCase()) {
|
||||
return `${appName} | ${title}`;
|
||||
}
|
||||
return title;
|
||||
}
|
||||
|
||||
hideWindow(): void {
|
||||
const actor = this._window.get_compositor_private() as Clutter.Actor | null;
|
||||
if (actor) actor.hide();
|
||||
}
|
||||
|
||||
showWindow(): void {
|
||||
const actor = this._window.get_compositor_private() as Clutter.Actor | null;
|
||||
if (actor) actor.show();
|
||||
}
|
||||
|
||||
startDragging(): void {
|
||||
this._dragging = true;
|
||||
}
|
||||
@@ -89,6 +114,9 @@ export class WindowWrapper {
|
||||
this._window.connect("size-changed", () => {
|
||||
windowManager.handleWindowPositionChanged(this);
|
||||
}),
|
||||
this._window.connect('notify::title', () => {
|
||||
windowManager.handleWindowTitleChanged(this);
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -119,6 +147,10 @@ export class WindowWrapper {
|
||||
}
|
||||
|
||||
actor.remove_all_transitions();
|
||||
|
||||
// Move first to guarantee the window reaches the correct position even
|
||||
// if the subsequent resize is clamped by minimum-size hints.
|
||||
this._window.move_frame(true, rect.x, rect.y);
|
||||
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
||||
|
||||
const new_rect = this._window.get_frame_rect();
|
||||
@@ -129,13 +161,27 @@ export class WindowWrapper {
|
||||
Math.abs(new_rect.height - rect.height) > WindowWrapper.RESIZE_TOLERANCE;
|
||||
|
||||
if (_retry > 0 && mismatch) {
|
||||
Logger.warn("RESIZE MISMATCH, retrying",
|
||||
`want(${rect.x},${rect.y},${rect.width},${rect.height})`,
|
||||
`got(${new_rect.x},${new_rect.y},${new_rect.width},${new_rect.height})`);
|
||||
queueEvent({
|
||||
name: `delayed_resize_${this.getWindowId()}`,
|
||||
callback: () => this.safelyResizeWindow(rect, _retry - 1),
|
||||
}, 50);
|
||||
// If the window's actual size is larger than requested, it has a
|
||||
// minimum-size constraint — retrying won't help. Just make sure
|
||||
// it's at the correct position with its actual size.
|
||||
const sizeConstrained =
|
||||
new_rect.width > rect.width + WindowWrapper.RESIZE_TOLERANCE ||
|
||||
new_rect.height > rect.height + WindowWrapper.RESIZE_TOLERANCE;
|
||||
|
||||
if (sizeConstrained) {
|
||||
Logger.info("Window has min-size constraint, accepting actual size",
|
||||
`want(${rect.x},${rect.y},${rect.width},${rect.height})`,
|
||||
`actual(${new_rect.x},${new_rect.y},${new_rect.width},${new_rect.height})`);
|
||||
this._window.move_frame(true, rect.x, rect.y);
|
||||
} else {
|
||||
Logger.warn("RESIZE MISMATCH, retrying",
|
||||
`want(${rect.x},${rect.y},${rect.width},${rect.height})`,
|
||||
`got(${new_rect.x},${new_rect.y},${new_rect.width},${new_rect.height})`);
|
||||
queueEvent({
|
||||
name: `delayed_resize_${this.getWindowId()}`,
|
||||
callback: () => this.safelyResizeWindow(rect, _retry - 1),
|
||||
}, 50);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import {WindowWrapper} from './window.js';
|
||||
import * as Main from "resource:///org/gnome/shell/ui/main.js";
|
||||
import {Logger} from "../utils/logger.js";
|
||||
import Monitor from "./monitor.js";
|
||||
import WindowContainer from "./container.js";
|
||||
import WindowContainer, {Direction, Layout} from "./container.js";
|
||||
import {Rect} from "../utils/rect.js";
|
||||
|
||||
|
||||
@@ -22,6 +22,8 @@ export interface IWindowManager {
|
||||
|
||||
handleWindowPositionChanged(winWrap: WindowWrapper): void;
|
||||
|
||||
handleWindowTitleChanged(winWrap: WindowWrapper): void;
|
||||
|
||||
syncActiveWindow(): number | null;
|
||||
}
|
||||
|
||||
@@ -44,7 +46,7 @@ export default class WindowManager implements IWindowManager {
|
||||
_changingGrabbedMonitor: boolean = false;
|
||||
_showingOverview: boolean = false;
|
||||
|
||||
// ── Resize-drag tracking ──────────────────────────────────────────────────
|
||||
// -- Resize-drag tracking --------------------------------------------------
|
||||
_isResizeDrag: boolean = false;
|
||||
_resizeDragWindowId: number = _UNUSED_WINDOW_ID;
|
||||
_resizeDragOp: Meta.GrabOp = Meta.GrabOp.NONE;
|
||||
@@ -103,6 +105,7 @@ export default class WindowManager implements IWindowManager {
|
||||
}),
|
||||
global.display.connect("in-fullscreen-changed", () => {
|
||||
Logger.log("IN FULL SCREEN CHANGED");
|
||||
this._syncFullscreenTabBars();
|
||||
}),
|
||||
);
|
||||
|
||||
@@ -132,10 +135,16 @@ export default class WindowManager implements IWindowManager {
|
||||
Logger.log("HIDING OVERVIEW")
|
||||
this._showingOverview = false;
|
||||
this._tileMonitors();
|
||||
for (const monitor of this._monitors.values()) {
|
||||
monitor.showTabBars();
|
||||
}
|
||||
}),
|
||||
Main.overview.connect("showing", () => {
|
||||
this._showingOverview = true;
|
||||
Logger.log("SHOWING OVERVIEW");
|
||||
for (const monitor of this._monitors.values()) {
|
||||
monitor.hideTabBars();
|
||||
}
|
||||
}),
|
||||
];
|
||||
}
|
||||
@@ -329,7 +338,7 @@ export default class WindowManager implements IWindowManager {
|
||||
const itemIndex = container._getIndexOfWindow(winId);
|
||||
if (itemIndex === -1) return;
|
||||
|
||||
const isHorizontal = container._orientation === 0;
|
||||
const isHorizontal = container._orientation === Layout.ACC_HORIZONTAL;
|
||||
|
||||
// E/S edge → boundary after the item; W/N edge → boundary before it.
|
||||
let adjusted = false;
|
||||
@@ -350,7 +359,7 @@ export default class WindowManager implements IWindowManager {
|
||||
if (adjusted) {
|
||||
this._isTiling = true;
|
||||
try {
|
||||
container.tileWindows();
|
||||
container.drawWindows();
|
||||
} finally {
|
||||
this._isTiling = false;
|
||||
}
|
||||
@@ -413,6 +422,11 @@ export default class WindowManager implements IWindowManager {
|
||||
this._tileMonitors();
|
||||
}
|
||||
|
||||
handleWindowTitleChanged(window: WindowWrapper): void {
|
||||
const mon_id = window._window.get_monitor();
|
||||
this._monitors.get(mon_id)?.refreshTabTitlesForWindow(window);
|
||||
}
|
||||
|
||||
public addWindowToMonitor(window: Meta.Window) {
|
||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
||||
var wrapper = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap))
|
||||
@@ -428,12 +442,24 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
}
|
||||
|
||||
private _syncFullscreenTabBars(): void {
|
||||
for (const [monitorId, monitor] of this._monitors.entries()) {
|
||||
if (global.display.get_monitor_in_fullscreen(monitorId)) {
|
||||
monitor.hideTabBars();
|
||||
} else if (!this._showingOverview) {
|
||||
monitor.showTabBars();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_tileMonitors(): void {
|
||||
this._isTiling = true;
|
||||
try {
|
||||
for (const monitor of this._monitors.values()) {
|
||||
monitor.tileWindows();
|
||||
}
|
||||
} catch (e) {
|
||||
Logger.error("_tileMonitors FAILED", e);
|
||||
} finally {
|
||||
this._isTiling = false;
|
||||
}
|
||||
@@ -478,6 +504,10 @@ export default class WindowManager implements IWindowManager {
|
||||
if (focusWindow) {
|
||||
this._activeWindowId = focusWindow.get_id();
|
||||
Logger.debug(`Active window changed to: ${this._activeWindowId} (${focusWindow.get_title()})`);
|
||||
|
||||
// If the focused window is inside a tabbed container, make it the active tab
|
||||
const monId = focusWindow.get_monitor();
|
||||
this._monitors.get(monId)?.focusWindowTab(this._activeWindowId);
|
||||
} else {
|
||||
this._activeWindowId = null;
|
||||
Logger.debug('No active window');
|
||||
@@ -512,6 +542,226 @@ export default class WindowManager implements IWindowManager {
|
||||
}
|
||||
}
|
||||
|
||||
public toggleActiveContainerTabbed(): void {
|
||||
if (this._activeWindowId === null) {
|
||||
Logger.warn("No active window, cannot toggle tabbed mode");
|
||||
return;
|
||||
}
|
||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
||||
if (container) {
|
||||
if (container.isTabbed()) {
|
||||
container.setAccordion(Layout.ACC_HORIZONTAL);
|
||||
} else {
|
||||
// Set the active tab to the focused window
|
||||
const activeIndex = container._getIndexOfWindow(this._activeWindowId);
|
||||
if (activeIndex !== -1) {
|
||||
container._activeTabIndex = activeIndex;
|
||||
}
|
||||
container.setTabbed();
|
||||
}
|
||||
this._tileMonitors();
|
||||
} else {
|
||||
Logger.warn("Could not find container for active window");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Move the active window in the given direction.
|
||||
*
|
||||
* 1. Find the container holding the active window.
|
||||
* 2. Try to swap within the container (adjacent neighbour).
|
||||
* 3. If already at the container edge, move the window to the
|
||||
* nearest monitor in that direction instead.
|
||||
* 4. Re-tile to apply the new layout.
|
||||
*/
|
||||
public moveInDirection(direction: Direction): void {
|
||||
if (this._activeWindowId === null) {
|
||||
Logger.warn("No active window, cannot move in direction");
|
||||
return;
|
||||
}
|
||||
|
||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
||||
if (!container) {
|
||||
Logger.warn("Could not find container for active window");
|
||||
return;
|
||||
}
|
||||
|
||||
const swapped = container.swapWindowInDirection(this._activeWindowId, direction);
|
||||
if (swapped) {
|
||||
Logger.info(`Moved window ${this._activeWindowId} ${direction}`);
|
||||
this._tileMonitors();
|
||||
return;
|
||||
}
|
||||
|
||||
this._moveWindowCrossMonitor(this._activeWindowId, direction);
|
||||
}
|
||||
|
||||
/**
|
||||
* Move focus to the adjacent window in the given direction.
|
||||
*
|
||||
* 1. Find the container holding the active window.
|
||||
* 2. Ask the container for the adjacent window in that direction.
|
||||
* 3. If the container returns null (at the edge), try cross-monitor navigation.
|
||||
* 4. Activate (focus) the target window.
|
||||
*/
|
||||
public focusInDirection(direction: Direction): void {
|
||||
if (this._activeWindowId === null) {
|
||||
Logger.warn("No active window, cannot focus in direction");
|
||||
return;
|
||||
}
|
||||
|
||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
||||
if (!container) {
|
||||
Logger.warn("Could not find container for active window");
|
||||
return;
|
||||
}
|
||||
|
||||
const targetId = container.getAdjacentWindowId(this._activeWindowId, direction);
|
||||
if (targetId !== null) {
|
||||
this._activateWindowById(targetId);
|
||||
return;
|
||||
}
|
||||
|
||||
// At the edge of the container — try cross-monitor navigation
|
||||
const crossMonitorId = this._findCrossMonitorWindow(direction);
|
||||
if (crossMonitorId !== null) {
|
||||
this._activateWindowById(crossMonitorId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Focus a window by its ID. Finds the Meta.Window and calls activate().
|
||||
*/
|
||||
private _activateWindowById(windowId: number): void {
|
||||
for (const monitor of this._monitors.values()) {
|
||||
const wrapped = monitor.getWindow(windowId);
|
||||
if (wrapped) {
|
||||
const metaWindow = wrapped.getWindow();
|
||||
metaWindow.activate(global.get_current_time());
|
||||
return;
|
||||
}
|
||||
}
|
||||
Logger.warn(`_activateWindowById: window ${windowId} not found in any monitor`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the adjacent monitor in the given direction from a current monitor.
|
||||
* Returns the monitor ID or null if none exists in that direction.
|
||||
*/
|
||||
private _findAdjacentMonitorId(currentMonitorId: number, direction: Direction): number | null {
|
||||
const currentMonitor = this._monitors.get(currentMonitorId)!;
|
||||
const currentArea = currentMonitor._workArea;
|
||||
const currentCenterX = currentArea.x + currentArea.width / 2;
|
||||
const currentCenterY = currentArea.y + currentArea.height / 2;
|
||||
|
||||
let bestMonitorId: number | null = null;
|
||||
let bestDistance = Infinity;
|
||||
|
||||
for (const [monId, monitor] of this._monitors.entries()) {
|
||||
if (monId === currentMonitorId) continue;
|
||||
|
||||
const area = monitor._workArea;
|
||||
const centerX = area.x + area.width / 2;
|
||||
const centerY = area.y + area.height / 2;
|
||||
|
||||
let isInDirection = false;
|
||||
let distance = Infinity;
|
||||
|
||||
switch (direction) {
|
||||
case Direction.LEFT:
|
||||
isInDirection = centerX < currentCenterX;
|
||||
distance = currentCenterX - centerX;
|
||||
break;
|
||||
case Direction.RIGHT:
|
||||
isInDirection = centerX > currentCenterX;
|
||||
distance = centerX - currentCenterX;
|
||||
break;
|
||||
case Direction.UP:
|
||||
isInDirection = centerY < currentCenterY;
|
||||
distance = currentCenterY - centerY;
|
||||
break;
|
||||
case Direction.DOWN:
|
||||
isInDirection = centerY > currentCenterY;
|
||||
distance = centerY - currentCenterY;
|
||||
break;
|
||||
}
|
||||
|
||||
if (isInDirection && distance < bestDistance) {
|
||||
bestDistance = distance;
|
||||
bestMonitorId = monId;
|
||||
}
|
||||
}
|
||||
|
||||
return bestMonitorId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the monitor ID that contains the given window, or null.
|
||||
*/
|
||||
private _findMonitorIdForWindow(windowId: number): number | null {
|
||||
for (const [monId, monitor] of this._monitors.entries()) {
|
||||
if (monitor.getWindow(windowId) !== undefined) return monId;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* When at the edge of a container, find the nearest window on the adjacent
|
||||
* monitor in the given direction.
|
||||
*
|
||||
* On the target monitor, picks the edge-most window:
|
||||
* - Navigating LEFT/UP → last (far-edge) leaf window
|
||||
* - Navigating RIGHT/DOWN → first (near-edge) leaf window
|
||||
*/
|
||||
private _findCrossMonitorWindow(direction: Direction): number | null {
|
||||
if (this._activeWindowId === null) return null;
|
||||
|
||||
const currentMonitorId = this._findMonitorIdForWindow(this._activeWindowId);
|
||||
if (currentMonitorId === null) return null;
|
||||
|
||||
const targetMonitorId = this._findAdjacentMonitorId(currentMonitorId, direction);
|
||||
if (targetMonitorId === null) return null;
|
||||
|
||||
const targetMonitor = this._monitors.get(targetMonitorId)!;
|
||||
const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
|
||||
if (activeWorkspaceIndex >= targetMonitor._workspaces.length) return null;
|
||||
|
||||
const targetContainer = targetMonitor._workspaces[activeWorkspaceIndex];
|
||||
if (targetContainer._tiledItems.length === 0) return null;
|
||||
|
||||
return (direction === Direction.LEFT || direction === Direction.UP)
|
||||
? targetContainer._lastLeafWindowId()
|
||||
: targetContainer._firstLeafWindowId();
|
||||
}
|
||||
|
||||
/**
|
||||
* Move a window to the adjacent monitor in the given direction.
|
||||
*
|
||||
* The window is inserted at the "entry edge" of the target container:
|
||||
* - Moving RIGHT/DOWN → position 0 (near edge)
|
||||
* - Moving LEFT/UP → end of the container (far edge)
|
||||
*/
|
||||
private _moveWindowCrossMonitor(windowId: number, direction: Direction): void {
|
||||
const currentMonitorId = this._findMonitorIdForWindow(windowId);
|
||||
if (currentMonitorId === null) return;
|
||||
|
||||
const targetMonitorId = this._findAdjacentMonitorId(currentMonitorId, direction);
|
||||
if (targetMonitorId === null) return;
|
||||
|
||||
const currentMonitor = this._monitors.get(currentMonitorId)!;
|
||||
const wrapped = currentMonitor.getWindow(windowId);
|
||||
if (!wrapped) return;
|
||||
|
||||
const targetMonitor = this._monitors.get(targetMonitorId)!;
|
||||
const insertIndex = (direction === Direction.RIGHT || direction === Direction.DOWN) ? 0 : undefined;
|
||||
|
||||
currentMonitor.removeWindow(wrapped);
|
||||
targetMonitor.addWindow(wrapped, insertIndex);
|
||||
|
||||
this._tileMonitors();
|
||||
Logger.info(`Moved window ${windowId} to monitor ${targetMonitorId} (${direction})`);
|
||||
}
|
||||
|
||||
public printTreeStructure(): void {
|
||||
Logger.info("=".repeat(80));
|
||||
Logger.info("WINDOW TREE STRUCTURE");
|
||||
@@ -531,8 +781,11 @@ export default class WindowManager implements IWindowManager {
|
||||
monitor._workspaces.forEach((workspace, workspaceIndex) => {
|
||||
const isActiveWorkspace = workspaceIndex === activeWorkspaceIndex;
|
||||
Logger.info(` Workspace ${workspaceIndex}${isActiveWorkspace && isActiveMonitor ? ' *' : ''}:`);
|
||||
Logger.info(` Orientation: ${workspace._orientation === 0 ? 'HORIZONTAL' : 'VERTICAL'}`);
|
||||
Logger.info(` Orientation: ${Layout[workspace._orientation]}`);
|
||||
Logger.info(` Items: ${workspace._tiledItems.length}`);
|
||||
if (workspace.isTabbed()) {
|
||||
Logger.info(` Active Tab: ${workspace._activeTabIndex}`);
|
||||
}
|
||||
this._printContainerTree(workspace, 4);
|
||||
});
|
||||
});
|
||||
@@ -547,7 +800,7 @@ export default class WindowManager implements IWindowManager {
|
||||
if (item instanceof WindowContainer) {
|
||||
const containsActive = this._activeWindowId !== null &&
|
||||
item.getWindow(this._activeWindowId) !== undefined;
|
||||
Logger.info(`${indent}[${index}] Container (${item._orientation === 0 ? 'HORIZONTAL' : 'VERTICAL'})${containsActive ? ' *' : ''}:`);
|
||||
Logger.info(`${indent}[${index}] Container (${Layout[item._orientation]})${containsActive ? ' *' : ''}:`);
|
||||
Logger.info(`${indent} Items: ${item._tiledItems.length}`);
|
||||
Logger.info(`${indent} Work Area: x=${item._workArea.x}, y=${item._workArea.y}, w=${item._workArea.width}, h=${item._workArea.height}`);
|
||||
this._printContainerTree(item, indentLevel + 4);
|
||||
|
||||
@@ -1,37 +1,33 @@
|
||||
/* Add your custom extension styling here */
|
||||
.active-window-border {
|
||||
/*border: 2px solid rgba(191, 0, 255, 0.8);*/
|
||||
/*border-radius: 3px;*/
|
||||
|
||||
/* border-image-source: linear-gradient(to left, #743ad5, #d53a9d);*/
|
||||
/* !*border: 4px solid transparent;*!*/
|
||||
/* !*border-radius: 5px;*!*/
|
||||
|
||||
/* !*!* Gradient border using border-image *!*/
|
||||
/* border-image: linear-gradient(45deg, red, orange, yellow, green, blue, indigo, violet) 1;*/
|
||||
|
||||
.aerospike-tab-bar {
|
||||
background-color: rgba(30, 30, 30, 0.95);
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
|
||||
spacing: 1px;
|
||||
padding: 2px 2px 0 2px;
|
||||
}
|
||||
|
||||
/*.border-gradient-purple {*/
|
||||
/* border-image-source: linear-gradient(to left, #743ad5, #d53a9d);*/
|
||||
/*}*/
|
||||
.aerospike-tab {
|
||||
background-color: rgba(50, 50, 50, 0.8);
|
||||
border-radius: 6px 6px 0 0;
|
||||
padding: 2px 12px;
|
||||
margin: 0 1px;
|
||||
color: rgba(255, 255, 255, 0.5);
|
||||
font-size: 11px;
|
||||
font-weight: 400;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/*@keyframes rainbow-border {*/
|
||||
/* 0% {*/
|
||||
/* border-image: linear-gradient(0deg, red, orange, yellow, green, blue, indigo, violet, red) 1;*/
|
||||
/* }*/
|
||||
/* 100% {*/
|
||||
/* border-image: linear-gradient(360deg, red, orange, yellow, green, blue, indigo, violet, red) 1;*/
|
||||
/* }*/
|
||||
/*}*/
|
||||
.aerospike-tab:hover {
|
||||
background-color: rgba(70, 70, 70, 0.9);
|
||||
color: rgba(255, 255, 255, 0.8);
|
||||
}
|
||||
|
||||
/*.active-window-border {*/
|
||||
/* border: 4px solid transparent;*/
|
||||
/* border-radius: 5px;*/
|
||||
.aerospike-tab-active {
|
||||
background-color: rgba(80, 80, 80, 1);
|
||||
color: rgba(255, 255, 255, 1);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
/* !* Initial gradient border *!*/
|
||||
/* border-image: linear-gradient(0deg, red, orange, yellow, green, blue, indigo, violet, red) 1;*/
|
||||
|
||||
/* !* Apply animation *!*/
|
||||
/* animation: rainbow-border 5s linear infinite;*/
|
||||
/*}*/
|
||||
.aerospike-tab-label {
|
||||
font-size: 11px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user