lucasoskorep/aerospike-gnome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: resize bug fixing

Browse Source
This commit is contained in:
Lucas Oskorep
2025-10-16 03:42:58 -04:00
parent 5aef762e5f
commit d911f434af
2 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/wm/container.ts
View File

@@ -92,10 +92,40 @@ export default class WindowContainer {
Logger.log(`=== _shiftCustomSizesAfterRemoval called ===`); Logger.log(`=== _shiftCustomSizesAfterRemoval called ===`);
Logger.log(`Removed index: ${removedIndex}`); Logger.log(`Removed index: ${removedIndex}`);
Logger.log(`Total items after removal: ${this._tiledItems.length}`); Logger.log(`Total items after removal: ${this._tiledItems.length}`);
Logger.log(`Custom sizes before shift:`, this._customSizes); Logger.log(`Custom sizes Map size: ${this._customSizes.size}`);
const removedSize = this._customSizes.get(removedIndex); // Convert Map to readable string
Logger.log(`Removed window's custom size: ${removedSize}`); 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 // Rebuild the custom sizes map with shifted indices
const newCustomSizes = new Map<number, number>(); const newCustomSizes = new Map<number, number>();
@@ -112,28 +142,42 @@ export default class WindowContainer {
// Skip the removed index // Skip the removed index
}); });
Logger.log(`Custom sizes after index shift:`, newCustomSizes); 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 evenly among all remaining windows // Distribute removed window's size among remaining custom-sized windows only
if (removedSize !== undefined && this._tiledItems.length > 1) { // Flexible windows will naturally absorb their share through the bounds calculation
// After removal, _tiledItems will have one fewer item const remainingWindowCount = this._tiledItems.length;
const remainingWindowCount = this._tiledItems.length - 1; const numCustomWindows = newCustomSizes.size;
const sizePerWindow = Math.floor(removedSize / remainingWindowCount);
Logger.log(`Distributing ${removedSize}px evenly among ${remainingWindowCount} remaining windows (${sizePerWindow}px each)`); if (removedSize > 0 && remainingWindowCount > 0 && numCustomWindows > 0) {
const sizePerCustomWindow = Math.floor(removedSize / numCustomWindows);
// Add proportional size to each custom-sized window Logger.log(`Distributing ${removedSize}px among ${numCustomWindows} custom-sized windows (${sizePerCustomWindow}px each)`);
// Flexible windows will automatically get their share through the bounds calculation Logger.log(`Flexible windows will naturally absorb remaining space`);
// Add proportional size only to windows that already have custom sizes
newCustomSizes.forEach((size, index) => { newCustomSizes.forEach((size, index) => {
const newSize = size + sizePerWindow; const newSize = size + sizePerCustomWindow;
Logger.log(`Index ${index}: ${size}px + ${sizePerWindow}px = ${newSize}px`); Logger.log(`Index ${index}: ${size}px + ${sizePerCustomWindow}px = ${newSize}px`);
newCustomSizes.set(index, newSize); newCustomSizes.set(index, newSize);
}); });
} else { } else {
Logger.log(`Not distributing space - removedSize: ${removedSize}, remainingWindowCount: ${this._tiledItems.length - 1}`); Logger.log(`Not distributing space - removedSize: ${removedSize}, remainingWindows: ${remainingWindowCount}, customWindows: ${numCustomWindows}`);
} }
Logger.log(`Final custom sizes:`, newCustomSizes); let finalStr = "{ ";
newCustomSizes.forEach((size, index) => {
finalStr += `${index}: ${size}px, `;
});
finalStr += "}";
Logger.log(`Final custom sizes: ${finalStr}`);
this._customSizes = newCustomSizes; this._customSizes = newCustomSizes;
Logger.log(`=== _shiftCustomSizesAfterRemoval complete ===`); Logger.log(`=== _shiftCustomSizesAfterRemoval complete ===`);
} }
@@ -154,15 +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() this._tileItems(skipRetry)
return true return true
} }
_tileItems() { _tileItems(skipRetry: boolean = false) {
if (this._tiledItems.length === 0) { if (this._tiledItems.length === 0) {
return; return;
} }
@@ -172,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);
} }
}) })
} }
@@ -384,7 +428,7 @@ export default class WindowContainer {
if (oldSize === undefined) { if (oldSize === undefined) {
// First time resizing this window, just set the size // First time resizing this window, just set the size
this._customSizes.set(index, newSize); this._customSizes.set(index, newSize);
this.tileWindows(); this.tileWindows(true);
return; return;
} }
@@ -423,23 +467,17 @@ export default class WindowContainer {
if (!adjacentItem.getWindow().allows_resize()) { if (!adjacentItem.getWindow().allows_resize()) {
Logger.log("Adjacent window doesn't allow resize, reverting"); Logger.log("Adjacent window doesn't allow resize, reverting");
this._customSizes.set(index, oldSize); this._customSizes.set(index, oldSize);
oldAdjacentSize = undefined; // Don't check later
} else { } else {
// Always apply the opposite delta to the adjacent window // Always apply the opposite delta to the adjacent window
// This keeps the total width constant // This keeps the total width constant
this._customSizes.set(adjacentIndex, newAdjacentSize); this._customSizes.set(adjacentIndex, newAdjacentSize);
// Immediately apply resize to adjacent window during drag
const bounds = this.getBounds();
const adjacentRect = bounds[adjacentIndex];
adjacentItem.safelyResizeWindow(adjacentRect);
} }
} }
} }
// Don't call full tileWindows() during resize - just update the adjacent window above // Call tileWindows during resize to update all window positions
// Full tiling and validation will happen in handleGrabOpEnd // Skip retry logic during active resize to avoid jitter
// Skip post-resize validation during real-time resizing this.tileWindows(true);
} }

6
src/wm/window.ts
View File

@@ -125,7 +125,7 @@ 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
// Note: we allow resizing even during drag operations to support position updates // Note: we allow resizing even during drag operations to support position updates
// The dragging flag only prevents REORDERING, not position/size changes // The dragging flag only prevents REORDERING, not position/size changes
@@ -144,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);
} }
}) })
} }