Compare commits
5 Commits
v0.2.0
...
feat/bad-r
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d911f434af | ||
|
|
5aef762e5f | ||
|
|
c4d4768d29 | ||
|
|
fe069b1de0 | ||
|
|
2446520ced |
14
extension.ts
14
extension.ts
@@ -53,6 +53,11 @@ export default class aerospike extends Extension {
|
|||||||
this.refreshKeybinding('join-with-right');
|
this.refreshKeybinding('join-with-right');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.settings.connect('changed::reset-window-sizes', () => {
|
||||||
|
log(`Reset window sizes keybinding changed to: ${this.settings.get_strv('reset-window-sizes')}`);
|
||||||
|
this.refreshKeybinding('reset-window-sizes');
|
||||||
|
});
|
||||||
|
|
||||||
this.settings.connect('changed::dropdown-option', () => {
|
this.settings.connect('changed::dropdown-option', () => {
|
||||||
log(`Dropdown option changed to: ${this.settings.get_string('dropdown-option')}`);
|
log(`Dropdown option changed to: ${this.settings.get_string('dropdown-option')}`);
|
||||||
});
|
});
|
||||||
@@ -88,6 +93,11 @@ export default class aerospike extends Extension {
|
|||||||
Logger.info('Keybinding 4 was pressed!');
|
Logger.info('Keybinding 4 was pressed!');
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
case 'reset-window-sizes':
|
||||||
|
this.bindKeybinding('reset-window-sizes', () => {
|
||||||
|
this.windowManager.resetAllWindowSizes();
|
||||||
|
});
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,6 +124,10 @@ export default class aerospike extends Extension {
|
|||||||
this.bindKeybinding('join-with-right', () => {
|
this.bindKeybinding('join-with-right', () => {
|
||||||
Logger.info('Keybinding 4 was pressed!');
|
Logger.info('Keybinding 4 was pressed!');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.bindKeybinding('reset-window-sizes', () => {
|
||||||
|
this.windowManager.resetAllWindowSizes();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private bindKeybinding(settingName: string, callback: () => void) {
|
private bindKeybinding(settingName: string, callback: () => void) {
|
||||||
|
|||||||
4
justfile
4
justfile
@@ -24,11 +24,11 @@ build-package: build
|
|||||||
|
|
||||||
install: build
|
install: build
|
||||||
mkdir -p ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}
|
mkdir -p ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}
|
||||||
rm -rf /.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
|
rm -rf ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
|
||||||
cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
|
cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
|
||||||
|
|
||||||
run:
|
run:
|
||||||
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --nested --wayland
|
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --devkit
|
||||||
|
|
||||||
install-and-run: install run
|
install-and-run: install run
|
||||||
|
|
||||||
|
|||||||
@@ -37,5 +37,11 @@
|
|||||||
<description>Keyboard shortcut for triggering action 4</description>
|
<description>Keyboard shortcut for triggering action 4</description>
|
||||||
</key>
|
</key>
|
||||||
|
|
||||||
|
<key name="reset-window-sizes" type="as">
|
||||||
|
<default><![CDATA[['<Alt>z']]]></default>
|
||||||
|
<summary>Reset all window sizes</summary>
|
||||||
|
<description>Remove all custom window sizes and return to equal distribution</description>
|
||||||
|
</key>
|
||||||
|
|
||||||
</schema>
|
</schema>
|
||||||
</schemalist>
|
</schemalist>
|
||||||
@@ -16,12 +16,13 @@ export default class WindowContainer {
|
|||||||
_tiledWindowLookup: Map<number, WindowWrapper>;
|
_tiledWindowLookup: Map<number, WindowWrapper>;
|
||||||
_orientation: Orientation = Orientation.HORIZONTAL;
|
_orientation: Orientation = Orientation.HORIZONTAL;
|
||||||
_workArea: Rect;
|
_workArea: Rect;
|
||||||
|
_customSizes: Map<number, number>; // Maps index to custom width (horizontal) or height (vertical)
|
||||||
|
|
||||||
constructor(workspaceArea: Rect,) {
|
constructor(workspaceArea: Rect,) {
|
||||||
// this._id = monitorId;
|
|
||||||
this._tiledItems = [];
|
this._tiledItems = [];
|
||||||
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
||||||
this._workArea = workspaceArea;
|
this._workArea = workspaceArea;
|
||||||
|
this._customSizes = new Map<number, number>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -34,7 +35,6 @@ export default class WindowContainer {
|
|||||||
// Add window to managed windows
|
// Add window to managed windows
|
||||||
this._tiledItems.push(winWrap);
|
this._tiledItems.push(winWrap);
|
||||||
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
||||||
// winWrap.setParent(this);
|
|
||||||
queueEvent({
|
queueEvent({
|
||||||
name: "tiling-windows",
|
name: "tiling-windows",
|
||||||
callback: () => {
|
callback: () => {
|
||||||
@@ -76,6 +76,8 @@ export default class WindowContainer {
|
|||||||
this._tiledWindowLookup.delete(win_id);
|
this._tiledWindowLookup.delete(win_id);
|
||||||
const index = this._getIndexOfWindow(win_id)
|
const index = this._getIndexOfWindow(win_id)
|
||||||
this._tiledItems.splice(index, 1);
|
this._tiledItems.splice(index, 1);
|
||||||
|
// Shift custom sizes after removed index
|
||||||
|
this._shiftCustomSizesAfterRemoval(index);
|
||||||
} else {
|
} else {
|
||||||
for (const item of this._tiledItems) {
|
for (const item of this._tiledItems) {
|
||||||
if (item instanceof WindowContainer) {
|
if (item instanceof WindowContainer) {
|
||||||
@@ -86,6 +88,100 @@ export default class WindowContainer {
|
|||||||
this.tileWindows()
|
this.tileWindows()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_shiftCustomSizesAfterRemoval(removedIndex: number): void {
|
||||||
|
Logger.log(`=== _shiftCustomSizesAfterRemoval called ===`);
|
||||||
|
Logger.log(`Removed index: ${removedIndex}`);
|
||||||
|
Logger.log(`Total items after removal: ${this._tiledItems.length}`);
|
||||||
|
Logger.log(`Custom sizes Map size: ${this._customSizes.size}`);
|
||||||
|
|
||||||
|
// Convert Map to readable string
|
||||||
|
let customSizesStr = "{ ";
|
||||||
|
this._customSizes.forEach((size, index) => {
|
||||||
|
customSizesStr += `${index}: ${size}px, `;
|
||||||
|
});
|
||||||
|
customSizesStr += "}";
|
||||||
|
Logger.log(`Custom sizes before shift: ${customSizesStr}`);
|
||||||
|
|
||||||
|
// Calculate the removed window's size (could be custom or flexible)
|
||||||
|
let removedSize = this._customSizes.get(removedIndex);
|
||||||
|
|
||||||
|
if (removedSize === undefined) {
|
||||||
|
// Window didn't have custom size, calculate its flexible size
|
||||||
|
// Count items BEFORE removal (add 1 to current length)
|
||||||
|
const numItemsBeforeRemoval = this._tiledItems.length + 1;
|
||||||
|
let totalCustomSize = 0;
|
||||||
|
let numFlexibleItemsBeforeRemoval = 0;
|
||||||
|
|
||||||
|
this._customSizes.forEach((size, index) => {
|
||||||
|
totalCustomSize += size;
|
||||||
|
// Don't count this in flexible if it's the removed index
|
||||||
|
});
|
||||||
|
numFlexibleItemsBeforeRemoval = numItemsBeforeRemoval - this._customSizes.size;
|
||||||
|
|
||||||
|
const containerSize = this._orientation === Orientation.HORIZONTAL ? this._workArea.width : this._workArea.height;
|
||||||
|
const remainingSize = containerSize - totalCustomSize;
|
||||||
|
removedSize = numFlexibleItemsBeforeRemoval > 0 ? Math.floor(remainingSize / numFlexibleItemsBeforeRemoval) : 0;
|
||||||
|
|
||||||
|
Logger.log(`Removed window was flexible, calculated size: ${removedSize}px (${numFlexibleItemsBeforeRemoval} flexible windows before removal)`);
|
||||||
|
} else {
|
||||||
|
Logger.log(`Removed window had custom size: ${removedSize}px`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rebuild the custom sizes map with shifted indices
|
||||||
|
const newCustomSizes = new Map<number, number>();
|
||||||
|
this._customSizes.forEach((size, index) => {
|
||||||
|
if (index < removedIndex) {
|
||||||
|
// Keep indices before removal
|
||||||
|
Logger.log(`Keeping index ${index} with size ${size}`);
|
||||||
|
newCustomSizes.set(index, size);
|
||||||
|
} else if (index > removedIndex) {
|
||||||
|
// Shift down indices after removal
|
||||||
|
Logger.log(`Shifting index ${index} -> ${index - 1} with size ${size}`);
|
||||||
|
newCustomSizes.set(index - 1, size);
|
||||||
|
}
|
||||||
|
// Skip the removed index
|
||||||
|
});
|
||||||
|
|
||||||
|
Logger.log(`New custom sizes Map size after shift: ${newCustomSizes.size}`);
|
||||||
|
let afterShiftStr = "{ ";
|
||||||
|
newCustomSizes.forEach((size, index) => {
|
||||||
|
afterShiftStr += `${index}: ${size}px, `;
|
||||||
|
});
|
||||||
|
afterShiftStr += "}";
|
||||||
|
Logger.log(`Custom sizes after index shift: ${afterShiftStr}`);
|
||||||
|
|
||||||
|
// Distribute removed window's size among remaining custom-sized windows only
|
||||||
|
// Flexible windows will naturally absorb their share through the bounds calculation
|
||||||
|
const remainingWindowCount = this._tiledItems.length;
|
||||||
|
const numCustomWindows = newCustomSizes.size;
|
||||||
|
|
||||||
|
if (removedSize > 0 && remainingWindowCount > 0 && numCustomWindows > 0) {
|
||||||
|
const sizePerCustomWindow = Math.floor(removedSize / numCustomWindows);
|
||||||
|
|
||||||
|
Logger.log(`Distributing ${removedSize}px among ${numCustomWindows} custom-sized windows (${sizePerCustomWindow}px each)`);
|
||||||
|
Logger.log(`Flexible windows will naturally absorb remaining space`);
|
||||||
|
|
||||||
|
// Add proportional size only to windows that already have custom sizes
|
||||||
|
newCustomSizes.forEach((size, index) => {
|
||||||
|
const newSize = size + sizePerCustomWindow;
|
||||||
|
Logger.log(`Index ${index}: ${size}px + ${sizePerCustomWindow}px = ${newSize}px`);
|
||||||
|
newCustomSizes.set(index, newSize);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
Logger.log(`Not distributing space - removedSize: ${removedSize}, remainingWindows: ${remainingWindowCount}, customWindows: ${numCustomWindows}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
let finalStr = "{ ";
|
||||||
|
newCustomSizes.forEach((size, index) => {
|
||||||
|
finalStr += `${index}: ${size}px, `;
|
||||||
|
});
|
||||||
|
finalStr += "}";
|
||||||
|
Logger.log(`Final custom sizes: ${finalStr}`);
|
||||||
|
|
||||||
|
this._customSizes = newCustomSizes;
|
||||||
|
Logger.log(`=== _shiftCustomSizesAfterRemoval complete ===`);
|
||||||
|
}
|
||||||
|
|
||||||
disconnectSignals(): void {
|
disconnectSignals(): void {
|
||||||
this._tiledItems.forEach((item) => {
|
this._tiledItems.forEach((item) => {
|
||||||
if (item instanceof WindowContainer) {
|
if (item instanceof WindowContainer) {
|
||||||
@@ -102,18 +198,15 @@ export default class WindowContainer {
|
|||||||
this._tiledWindowLookup.clear()
|
this._tiledWindowLookup.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
tileWindows() {
|
tileWindows(skipRetry: boolean = false) {
|
||||||
Logger.log("TILING WINDOWS IN CONTAINER")
|
Logger.log("TILING WINDOWS IN CONTAINER")
|
||||||
|
|
||||||
Logger.log("WorkArea", this._workArea);
|
Logger.log("WorkArea", this._workArea);
|
||||||
|
this._tileItems(skipRetry)
|
||||||
// Get all windows for current workspaceArea
|
|
||||||
this._tileItems()
|
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
_tileItems() {
|
_tileItems(skipRetry: boolean = false) {
|
||||||
if (this._tiledItems.length === 0) {
|
if (this._tiledItems.length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -123,7 +216,7 @@ export default class WindowContainer {
|
|||||||
if (item instanceof WindowContainer) {
|
if (item instanceof WindowContainer) {
|
||||||
item.move(rect);
|
item.move(rect);
|
||||||
} else {
|
} else {
|
||||||
item.safelyResizeWindow(rect);
|
item.safelyResizeWindow(rect, 2, skipRetry);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -137,30 +230,88 @@ export default class WindowContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getVerticalBounds(): Rect[] {
|
getVerticalBounds(): Rect[] {
|
||||||
const items = this._tiledItems
|
// Calculate available height after accounting for custom-sized windows
|
||||||
const containerHeight = Math.floor(this._workArea.height / items.length);
|
let totalCustomHeight = 0;
|
||||||
return items.map((_, index) => {
|
let numFlexibleItems = 0;
|
||||||
const y = this._workArea.y + (index * containerHeight);
|
|
||||||
return {
|
this._tiledItems.forEach((item, index) => {
|
||||||
|
if (this._customSizes.has(index)) {
|
||||||
|
totalCustomHeight += this._customSizes.get(index)!;
|
||||||
|
} else {
|
||||||
|
numFlexibleItems++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Ensure custom sizes don't exceed container height
|
||||||
|
if (totalCustomHeight > this._workArea.height) {
|
||||||
|
Logger.warn("Custom heights exceed container, resetting all sizes");
|
||||||
|
this._customSizes.clear();
|
||||||
|
totalCustomHeight = 0;
|
||||||
|
numFlexibleItems = this._tiledItems.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
const remainingHeight = this._workArea.height - totalCustomHeight;
|
||||||
|
const flexHeight = numFlexibleItems > 0 ? Math.floor(remainingHeight / numFlexibleItems) : 0;
|
||||||
|
|
||||||
|
// Build the bounds array
|
||||||
|
let currentY = this._workArea.y;
|
||||||
|
return this._tiledItems.map((item, index) => {
|
||||||
|
let height = flexHeight;
|
||||||
|
if (this._customSizes.has(index)) {
|
||||||
|
height = this._customSizes.get(index)!;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rect = {
|
||||||
x: this._workArea.x,
|
x: this._workArea.x,
|
||||||
y: y,
|
y: currentY,
|
||||||
width: this._workArea.width,
|
width: this._workArea.width,
|
||||||
height: containerHeight
|
height: height
|
||||||
} as Rect;
|
} as Rect;
|
||||||
|
currentY += height;
|
||||||
|
return rect;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getHorizontalBounds(): Rect[] {
|
getHorizontalBounds(): Rect[] {
|
||||||
const windowWidth = Math.floor(this._workArea.width / this._tiledItems.length);
|
// Calculate available width after accounting for custom-sized windows
|
||||||
|
let totalCustomWidth = 0;
|
||||||
|
let numFlexibleItems = 0;
|
||||||
|
|
||||||
return this._tiledItems.map((_, index) => {
|
this._tiledItems.forEach((item, index) => {
|
||||||
const x = this._workArea.x + (index * windowWidth);
|
if (this._customSizes.has(index)) {
|
||||||
return {
|
totalCustomWidth += this._customSizes.get(index)!;
|
||||||
x: x,
|
} else {
|
||||||
|
numFlexibleItems++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Ensure custom sizes don't exceed container width
|
||||||
|
if (totalCustomWidth > this._workArea.width) {
|
||||||
|
Logger.warn("Custom widths exceed container, resetting all sizes");
|
||||||
|
this._customSizes.clear();
|
||||||
|
totalCustomWidth = 0;
|
||||||
|
numFlexibleItems = this._tiledItems.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
const remainingWidth = this._workArea.width - totalCustomWidth;
|
||||||
|
const flexWidth = numFlexibleItems > 0 ? Math.floor(remainingWidth / numFlexibleItems) : 0;
|
||||||
|
|
||||||
|
// Build the bounds array
|
||||||
|
let currentX = this._workArea.x;
|
||||||
|
return this._tiledItems.map((item, index) => {
|
||||||
|
let width = flexWidth;
|
||||||
|
if (this._customSizes.has(index)) {
|
||||||
|
width = this._customSizes.get(index)!;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rect = {
|
||||||
|
x: currentX,
|
||||||
y: this._workArea.y,
|
y: this._workArea.y,
|
||||||
width: windowWidth,
|
width: width,
|
||||||
height: this._workArea.height
|
height: this._workArea.height
|
||||||
} as Rect;
|
} as Rect;
|
||||||
|
currentX += width;
|
||||||
|
return rect;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,7 +338,7 @@ export default class WindowContainer {
|
|||||||
Logger.error("Item not found in container during drag op", item.getWindowId());
|
Logger.error("Item not found in container during drag op", item.getWindowId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let new_index = this.getIndexOfItemNested(item);
|
let new_index = original_index;
|
||||||
this.getBounds().forEach((rect, index) => {
|
this.getBounds().forEach((rect, index) => {
|
||||||
if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
|
if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
|
||||||
new_index = index;
|
new_index = index;
|
||||||
@@ -201,5 +352,133 @@ export default class WindowContainer {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
windowManuallyResized(win_id: number): void {
|
||||||
|
const window = this.getWindow(win_id);
|
||||||
|
if (!window) {
|
||||||
|
// Check nested containers
|
||||||
|
for (const item of this._tiledItems) {
|
||||||
|
if (item instanceof WindowContainer) {
|
||||||
|
item.windowManuallyResized(win_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find the index of the window
|
||||||
|
const index = this._getIndexOfWindow(win_id);
|
||||||
|
if (index === -1) {
|
||||||
|
Logger.error("Window not found in container during resize");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rect = window.getRect();
|
||||||
|
if (this._orientation === Orientation.HORIZONTAL) {
|
||||||
|
this._customSizes.set(index, rect.width);
|
||||||
|
Logger.log(`Window at index ${index} manually resized to width: ${rect.width}`);
|
||||||
|
} else {
|
||||||
|
this._customSizes.set(index, rect.height);
|
||||||
|
Logger.log(`Window at index ${index} manually resized to height: ${rect.height}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resetAllWindowSizes(): void {
|
||||||
|
Logger.log("Clearing all custom window sizes in container");
|
||||||
|
this._customSizes.clear();
|
||||||
|
// Also clear nested containers
|
||||||
|
for (const item of this._tiledItems) {
|
||||||
|
if (item instanceof WindowContainer) {
|
||||||
|
item.resetAllWindowSizes();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
windowResizing(win_id: number, resizeOp: Meta.GrabOp): void {
|
||||||
|
const window = this.getWindow(win_id);
|
||||||
|
if (!window) {
|
||||||
|
// Check nested containers
|
||||||
|
for (const item of this._tiledItems) {
|
||||||
|
if (item instanceof WindowContainer) {
|
||||||
|
item.windowResizing(win_id, resizeOp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the resize direction matches the container orientation
|
||||||
|
const isHorizontalResize = resizeOp === Meta.GrabOp.RESIZING_E || resizeOp === Meta.GrabOp.RESIZING_W;
|
||||||
|
const isVerticalResize = resizeOp === Meta.GrabOp.RESIZING_N || resizeOp === Meta.GrabOp.RESIZING_S;
|
||||||
|
|
||||||
|
if ((this._orientation === Orientation.HORIZONTAL && !isHorizontalResize) ||
|
||||||
|
(this._orientation === Orientation.VERTICAL && !isVerticalResize)) {
|
||||||
|
// Resize direction doesn't match container orientation, ignore
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find the index of the window
|
||||||
|
const index = this._getIndexOfWindow(win_id);
|
||||||
|
if (index === -1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the new size
|
||||||
|
const rect = window.getRect();
|
||||||
|
const newSize = this._orientation === Orientation.HORIZONTAL ? rect.width : rect.height;
|
||||||
|
const oldSize = this._customSizes.get(index);
|
||||||
|
|
||||||
|
if (oldSize === undefined) {
|
||||||
|
// First time resizing this window, just set the size
|
||||||
|
this._customSizes.set(index, newSize);
|
||||||
|
this.tileWindows(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate the delta (how much the window changed)
|
||||||
|
const delta = newSize - oldSize;
|
||||||
|
|
||||||
|
// If delta is 0, the window didn't actually resize (hit its minimum)
|
||||||
|
if (delta === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine which adjacent window to adjust based on resize direction
|
||||||
|
let adjacentIndex = -1;
|
||||||
|
if (resizeOp === Meta.GrabOp.RESIZING_E || resizeOp === Meta.GrabOp.RESIZING_S) {
|
||||||
|
// Resizing right/down edge - adjust the next window
|
||||||
|
adjacentIndex = index + 1;
|
||||||
|
} else if (resizeOp === Meta.GrabOp.RESIZING_W || resizeOp === Meta.GrabOp.RESIZING_N) {
|
||||||
|
// Resizing left/up edge - adjust the previous window
|
||||||
|
adjacentIndex = index - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update current window size
|
||||||
|
this._customSizes.set(index, newSize);
|
||||||
|
|
||||||
|
// Adjust adjacent window only if it has a custom size
|
||||||
|
// When both windows have custom sizes, always apply opposite delta to maintain total width
|
||||||
|
let oldAdjacentSize: number | undefined = undefined;
|
||||||
|
if (adjacentIndex >= 0 && adjacentIndex < this._tiledItems.length &&
|
||||||
|
this._customSizes.has(adjacentIndex)) {
|
||||||
|
const adjacentItem = this._tiledItems[adjacentIndex];
|
||||||
|
if (adjacentItem instanceof WindowWrapper) {
|
||||||
|
oldAdjacentSize = this._customSizes.get(adjacentIndex)!;
|
||||||
|
const newAdjacentSize = oldAdjacentSize - delta;
|
||||||
|
|
||||||
|
// Check if adjacent window allows resize
|
||||||
|
if (!adjacentItem.getWindow().allows_resize()) {
|
||||||
|
Logger.log("Adjacent window doesn't allow resize, reverting");
|
||||||
|
this._customSizes.set(index, oldSize);
|
||||||
|
} else {
|
||||||
|
// Always apply the opposite delta to the adjacent window
|
||||||
|
// This keeps the total width constant
|
||||||
|
this._customSizes.set(adjacentIndex, newAdjacentSize);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call tileWindows during resize to update all window positions
|
||||||
|
// Skip retry logic during active resize to avoid jitter
|
||||||
|
this.tileWindows(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -68,7 +68,6 @@ export default class Monitor {
|
|||||||
this._workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(this._id);
|
this._workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(this._id);
|
||||||
const activeWorkspace = global.workspace_manager.get_active_workspace();
|
const activeWorkspace = global.workspace_manager.get_active_workspace();
|
||||||
this._workspaces[activeWorkspace.index()].move(this._workArea);
|
this._workspaces[activeWorkspace.index()].move(this._workArea);
|
||||||
this._workspaces[activeWorkspace.index()].tileWindows()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
removeWorkspace(workspaceId: number): void {
|
removeWorkspace(workspaceId: number): void {
|
||||||
@@ -83,4 +82,32 @@ export default class Monitor {
|
|||||||
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
windowManuallyResized(win_id: number): void {
|
||||||
|
// Find which workspace contains the window and notify it
|
||||||
|
for (const container of this._workspaces) {
|
||||||
|
const win = container.getWindow(win_id);
|
||||||
|
if (win) {
|
||||||
|
container.windowManuallyResized(win_id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resetAllWindowSizes(): void {
|
||||||
|
for (const container of this._workspaces) {
|
||||||
|
container.resetAllWindowSizes();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
windowResizing(win_id: number, resizeOp: Meta.GrabOp): void {
|
||||||
|
// Find which workspace contains the window and notify it
|
||||||
|
for (const container of this._workspaces) {
|
||||||
|
const win = container.getWindow(win_id);
|
||||||
|
if (win) {
|
||||||
|
container.windowResizing(win_id, resizeOp);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -104,6 +104,9 @@ export class WindowWrapper {
|
|||||||
this._window.connect("position-changed", (_metaWindow) => {
|
this._window.connect("position-changed", (_metaWindow) => {
|
||||||
windowManager.handleWindowPositionChanged(this);
|
windowManager.handleWindowPositionChanged(this);
|
||||||
}),
|
}),
|
||||||
|
this._window.connect("size-changed", (_metaWindow) => {
|
||||||
|
windowManager.handleWindowSizeChanged(this);
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,12 +125,10 @@ export class WindowWrapper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
safelyResizeWindow(rect: Rect, _retry: number = 2): void {
|
safelyResizeWindow(rect: Rect, _retry: number = 2, _skipRetry: boolean = false): void {
|
||||||
// Keep minimal logging
|
// Keep minimal logging
|
||||||
if (this._dragging) {
|
// Note: we allow resizing even during drag operations to support position updates
|
||||||
Logger.info("STOPPED RESIZE BECAUSE ITEM IS BEING DRAGGED")
|
// The dragging flag only prevents REORDERING, not position/size changes
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Logger.log("SAFELY RESIZE", rect.x, rect.y, rect.width, rect.height);
|
// Logger.log("SAFELY RESIZE", rect.x, rect.y, rect.width, rect.height);
|
||||||
const actor = this._window.get_compositor_private();
|
const actor = this._window.get_compositor_private();
|
||||||
|
|
||||||
@@ -143,12 +144,12 @@ export class WindowWrapper {
|
|||||||
// Logger.info("RESIZING MOVING")
|
// Logger.info("RESIZING MOVING")
|
||||||
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
||||||
let new_rect = this._window.get_frame_rect();
|
let new_rect = this._window.get_frame_rect();
|
||||||
if ( _retry > 0 && (new_rect.x != rect.x || rect.y != new_rect.y || rect.width < new_rect.width || rect.height < new_rect.height)) {
|
if (!_skipRetry && _retry > 0 && (new_rect.x != rect.x || rect.y != new_rect.y || rect.width < new_rect.width || rect.height < new_rect.height)) {
|
||||||
Logger.warn("RESIZING FAILED AS SMALLER", new_rect.x, new_rect.y, new_rect.width, new_rect.height, rect.x, rect.y, rect.width, rect.height);
|
Logger.warn("RESIZING FAILED AS SMALLER", new_rect.x, new_rect.y, new_rect.width, new_rect.height, rect.x, rect.y, rect.width, rect.height);
|
||||||
queueEvent({
|
queueEvent({
|
||||||
name: "attempting_delayed_resize",
|
name: "attempting_delayed_resize",
|
||||||
callback: () => {
|
callback: () => {
|
||||||
this.safelyResizeWindow(rect, _retry-1);
|
this.safelyResizeWindow(rect, _retry-1, _skipRetry);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ export interface IWindowManager {
|
|||||||
|
|
||||||
handleWindowPositionChanged(winWrap: WindowWrapper): void;
|
handleWindowPositionChanged(winWrap: WindowWrapper): void;
|
||||||
|
|
||||||
|
handleWindowSizeChanged(winWrap: WindowWrapper): void;
|
||||||
|
|
||||||
syncActiveWindow(): number | null;
|
syncActiveWindow(): number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,6 +47,8 @@ export default class WindowManager implements IWindowManager {
|
|||||||
_grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
|
_grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
|
||||||
_grabbedWindowId: number = _UNUSED_WINDOW_ID;
|
_grabbedWindowId: number = _UNUSED_WINDOW_ID;
|
||||||
_changingGrabbedMonitor: boolean = false;
|
_changingGrabbedMonitor: boolean = false;
|
||||||
|
_resizingWindow: boolean = false;
|
||||||
|
_resizeOp: Meta.GrabOp | null = null;
|
||||||
|
|
||||||
_showingOverview: boolean = false;
|
_showingOverview: boolean = false;
|
||||||
|
|
||||||
@@ -199,20 +203,48 @@ export default class WindowManager implements IWindowManager {
|
|||||||
|
|
||||||
|
|
||||||
handleGrabOpBegin(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
handleGrabOpBegin(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||||
if (op === Meta.GrabOp.MOVING_UNCONSTRAINED){
|
|
||||||
|
|
||||||
}
|
|
||||||
Logger.log("Grab Op Start", op);
|
Logger.log("Grab Op Start", op);
|
||||||
Logger.log(display, window, op)
|
Logger.log(display, window, op)
|
||||||
Logger.log(window.get_monitor())
|
Logger.log(window.get_monitor())
|
||||||
|
|
||||||
|
const isResizing = this._isResizeOperation(op);
|
||||||
|
if (isResizing) {
|
||||||
|
this._resizingWindow = true;
|
||||||
|
this._resizeOp = op;
|
||||||
|
// Don't mark as dragging during resize - we need to update positions freely
|
||||||
|
} else {
|
||||||
this._getWrappedWindow(window)?.startDragging();
|
this._getWrappedWindow(window)?.startDragging();
|
||||||
|
}
|
||||||
|
|
||||||
this._grabbedWindowMonitor = window.get_monitor();
|
this._grabbedWindowMonitor = window.get_monitor();
|
||||||
this._grabbedWindowId = window.get_id();
|
this._grabbedWindowId = window.get_id();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_isResizeOperation(op: Meta.GrabOp): boolean {
|
||||||
|
return op === Meta.GrabOp.RESIZING_E ||
|
||||||
|
op === Meta.GrabOp.RESIZING_W ||
|
||||||
|
op === Meta.GrabOp.RESIZING_N ||
|
||||||
|
op === Meta.GrabOp.RESIZING_S ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_NW ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SE ||
|
||||||
|
op === Meta.GrabOp.RESIZING_SW;
|
||||||
|
}
|
||||||
|
|
||||||
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
||||||
Logger.log("Grab Op End ", op);
|
Logger.log("Grab Op End ", op);
|
||||||
Logger.log("primary display", display.get_primary_monitor())
|
Logger.log("primary display", display.get_primary_monitor())
|
||||||
|
|
||||||
|
// Check if this was a resize operation
|
||||||
|
if (this._isResizeOperation(op)) {
|
||||||
|
const monitor = this._monitors.get(window.get_monitor());
|
||||||
|
if (monitor) {
|
||||||
|
monitor.windowManuallyResized(window.get_id());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this._resizingWindow = false;
|
||||||
|
this._resizeOp = null;
|
||||||
this._grabbedWindowId = _UNUSED_WINDOW_ID;
|
this._grabbedWindowId = _UNUSED_WINDOW_ID;
|
||||||
this._getWrappedWindow(window)?.stopDragging();
|
this._getWrappedWindow(window)?.stopDragging();
|
||||||
this._tileMonitors();
|
this._tileMonitors();
|
||||||
@@ -246,7 +278,7 @@ export default class WindowManager implements IWindowManager {
|
|||||||
let wrapped = this._getAndRemoveWrappedWindow(window);
|
let wrapped = this._getAndRemoveWrappedWindow(window);
|
||||||
if (wrapped === undefined) {
|
if (wrapped === undefined) {
|
||||||
Logger.error("WINDOW NOT DEFINED")
|
Logger.error("WINDOW NOT DEFINED")
|
||||||
wrapped = new WindowWrapper(window, this.handleWindowMinimized);
|
wrapped = new WindowWrapper(window, this.handleWindowMinimized.bind(this));
|
||||||
wrapped.connectWindowSignals(this);
|
wrapped.connectWindowSignals(this);
|
||||||
}
|
}
|
||||||
let new_mon = this._monitors.get(monitorId);
|
let new_mon = this._monitors.get(monitorId);
|
||||||
@@ -259,6 +291,20 @@ export default class WindowManager implements IWindowManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (winWrap.getWindowId() === this._grabbedWindowId) {
|
if (winWrap.getWindowId() === this._grabbedWindowId) {
|
||||||
|
// Check if we're doing a pure NSEW resize - if so, don't allow position-based swapping
|
||||||
|
if (this._resizingWindow && this._resizeOp) {
|
||||||
|
const isPureNSEWResize =
|
||||||
|
this._resizeOp === Meta.GrabOp.RESIZING_E ||
|
||||||
|
this._resizeOp === Meta.GrabOp.RESIZING_W ||
|
||||||
|
this._resizeOp === Meta.GrabOp.RESIZING_N ||
|
||||||
|
this._resizeOp === Meta.GrabOp.RESIZING_S;
|
||||||
|
|
||||||
|
if (isPureNSEWResize) {
|
||||||
|
// Skip itemDragged - don't allow swaps during NSEW resize
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const [mouseX, mouseY, _] = global.get_pointer();
|
const [mouseX, mouseY, _] = global.get_pointer();
|
||||||
|
|
||||||
let monitorIndex = -1;
|
let monitorIndex = -1;
|
||||||
@@ -283,6 +329,16 @@ export default class WindowManager implements IWindowManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public handleWindowSizeChanged(winWrap: WindowWrapper): void {
|
||||||
|
if (this._resizingWindow && winWrap.getWindowId() === this._grabbedWindowId) {
|
||||||
|
// Check if this is a valid resize direction for the container
|
||||||
|
const monitor = this._monitors.get(winWrap.getWindow().get_monitor());
|
||||||
|
if (monitor && this._resizeOp) {
|
||||||
|
monitor.windowResizing(winWrap.getWindowId(), this._resizeOp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public handleWindowMinimized(winWrap: WindowWrapper): void {
|
public handleWindowMinimized(winWrap: WindowWrapper): void {
|
||||||
const monitor_id = winWrap.getWindow().get_monitor()
|
const monitor_id = winWrap.getWindow().get_monitor()
|
||||||
@@ -347,7 +403,7 @@ export default class WindowManager implements IWindowManager {
|
|||||||
public addWindowToMonitor(window: Meta.Window) {
|
public addWindowToMonitor(window: Meta.Window) {
|
||||||
|
|
||||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
||||||
var wrapper = new WindowWrapper(window, this.handleWindowMinimized)
|
var wrapper = new WindowWrapper(window, this.handleWindowMinimized.bind(this))
|
||||||
wrapper.connectWindowSignals(this);
|
wrapper.connectWindowSignals(this);
|
||||||
this._addWindowWrapperToMonitor(wrapper);
|
this._addWindowWrapperToMonitor(wrapper);
|
||||||
|
|
||||||
@@ -419,5 +475,13 @@ export default class WindowManager implements IWindowManager {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public resetAllWindowSizes(): void {
|
||||||
|
Logger.log("Resetting all custom window sizes");
|
||||||
|
this._monitors.forEach((monitor: Monitor) => {
|
||||||
|
monitor.resetAllWindowSizes();
|
||||||
|
});
|
||||||
|
this._tileMonitors();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user