Skip to content

Implement reversible span selection behavior #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hitex wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement reversible span selection behavior #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions src/components/tilingsystem/tilingLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,23 @@ export default class TilingLayout extends LayoutWidget<DynamicTilePreview> {

public hoverTilesInRect(rect: Mtk.Rectangle, reset: boolean) {
const newPreviewsArray: DynamicTilePreview[] = [];
const sourcePreviews = reset
? this._previews.filter((preview) => {
if (preview.canRestore) return true;

this._previews.forEach((preview) => {
this.remove_child(preview);
preview.destroy();
return false;
})
: this._previews;

sourcePreviews.forEach((preview) => {
const sourceRect =
reset && preview.canRestore
? preview.originalRect
: preview.rect;
const [hasIntersection, rectangles] = this._subtractRectangles(
preview.rect,
sourceRect,
rect,
);
if (hasIntersection) {
Expand Down Expand Up @@ -237,26 +250,23 @@ export default class TilingLayout extends LayoutWidget<DynamicTilePreview> {
this.set_child_above_sibling(innerPreview, preview);
newPreviewsArray.push(innerPreview);
}
preview.open(
rectangles[maxIndex].union(
preview.rect.intersect(rect)[1],
),
false
);
if (!reset) {
preview.open(
rectangles[maxIndex].union(
preview.rect.intersect(rect)[1],
),
false
);
}
preview.open(rectangles[maxIndex], true);
newPreviewsArray.push(preview);
} else {
preview.close();
newPreviewsArray.push(preview);
}
} else if (reset /* && !preview.originalRect.intersect(rect)[0]*/) {
if (preview.restore(true)) {
preview.open(undefined, true);
newPreviewsArray.push(preview);
} else {
this.remove_child(preview);
preview.destroy();
}
} else if (reset) {
preview.open(preview.originalRect.copy(), true);
newPreviewsArray.push(preview);
} else {
preview.open(undefined, true);
newPreviewsArray.push(preview);
Expand Down
44 changes: 37 additions & 7 deletions src/components/tilingsystem/tilingManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ export class TilingManager {
private _movingWindowTimerDuration: number = 15;
private _lastCursorPos: { x: number; y: number } | null = null;
private _grabStartPosition: { x: number; y: number } | null = null;
private _spanMultipleTilesAnchorRect: Mtk.Rectangle | null = null;
private _lastSpanMultipleTilesHoveredRect: Mtk.Rectangle | null = null;
private _wasSpanMultipleTilesActivated: boolean;
private _wasTilingSystemActivated: boolean;
private _snapAssistingInfo: SnapAssistingInfo;
Expand Down Expand Up @@ -496,6 +498,11 @@ export class TilingManager {
this._edgeTilingManager.workarea = this._workArea;
}

private _resetSpanSelectionState() {
this._spanMultipleTilesAnchorRect = null;
this._lastSpanMultipleTilesHoveredRect = null;
}

private _onWindowGrabBegin(window: Meta.Window, grabOp: number) {
if (this._isGrabbingWindow) return;

Expand Down Expand Up @@ -556,6 +563,7 @@ export class TilingManager {
}

this._isGrabbingWindow = true;
this._resetSpanSelectionState();
this._movingWindowTimerId = GLib.timeout_add(
GLib.PRIORITY_DEFAULT_IDLE,
this._movingWindowTimerDuration,
Expand Down Expand Up @@ -607,6 +615,7 @@ export class TilingManager {
) {
tilingLayout.close();
this._selectedTilesPreview.close(true);
this._resetSpanSelectionState();
this._snapAssist.close(true);
this._snapAssistingInfo.update(undefined);
this._edgeTilingManager.abortEdgeTiling();
Expand Down Expand Up @@ -724,6 +733,7 @@ export class TilingManager {
if (tilingLayout.showing) {
tilingLayout.close();
this._selectedTilesPreview.close(true);
this._resetSpanSelectionState();
}

if (
Expand All @@ -739,6 +749,7 @@ export class TilingManager {
} else {
if (this._edgeTilingManager.isPerformingEdgeTiling()) {
this._selectedTilesPreview.close(true);
this._resetSpanSelectionState();
this._edgeTilingManager.abortEdgeTiling();
}

Expand All @@ -762,35 +773,52 @@ export class TilingManager {
// close selection tile if we were performing edge-tiling
if (this._edgeTilingManager.isPerformingEdgeTiling()) {
this._selectedTilesPreview.close(true);
this._resetSpanSelectionState();
this._edgeTilingManager.abortEdgeTiling();
}
}
// if it was snap assisting then close the selection tile preview. We may reopen it if that's the case
if (this._snapAssistingInfo.isSnapAssisting) {
this._selectedTilesPreview.close(true);
this._resetSpanSelectionState();
this._snapAssistingInfo.update(undefined);
}

// if the pointer is inside the current selection and ALT key status is not changed, then there is nothing to do
if (
!allowSpanMultipleTiles &&
!changedSpanMultipleTiles &&
isPointInsideRect(currPointerPos, this._selectedTilesPreview.rect)
)
return GLib.SOURCE_CONTINUE;

let selectionRect = tilingLayout.getTileBelow(
let hoveredTileRect = tilingLayout.getTileBelow(
currPointerPos,
changedSpanMultipleTiles && !allowSpanMultipleTiles,
);
if (!selectionRect) return GLib.SOURCE_CONTINUE;
if (!hoveredTileRect) return GLib.SOURCE_CONTINUE;

selectionRect = selectionRect.copy();
if (allowSpanMultipleTiles && this._selectedTilesPreview.showing) {
selectionRect = selectionRect.union(
this._selectedTilesPreview.rect,
let selectionRect = hoveredTileRect.copy();
if (allowSpanMultipleTiles) {
if (
!changedSpanMultipleTiles &&
this._lastSpanMultipleTilesHoveredRect?.equal(hoveredTileRect)
)
return GLib.SOURCE_CONTINUE;
if (
changedSpanMultipleTiles ||
!this._spanMultipleTilesAnchorRect
) {
this._spanMultipleTilesAnchorRect = hoveredTileRect.copy();
}
selectionRect = this._spanMultipleTilesAnchorRect.union(
selectionRect,
);
this._lastSpanMultipleTilesHoveredRect = hoveredTileRect.copy();
} else {
this._resetSpanSelectionState();
}
tilingLayout.hoverTilesInRect(selectionRect, !allowSpanMultipleTiles);
tilingLayout.hoverTilesInRect(selectionRect, true);

this.openSelectionTilePreview(selectionRect, true, true, window);

Expand All @@ -800,6 +828,7 @@ export class TilingManager {
private _onWindowGrabEnd(window: Meta.Window) {
this._isGrabbingWindow = false;
this._grabStartPosition = null;
this._resetSpanSelectionState();

this._signals.disconnect(window);
TouchPointer.get().reset();
Expand Down Expand Up @@ -1006,6 +1035,7 @@ export class TilingManager {
// if there isn't a tile hovered, then close selection
if (tile.width === 0 || tile.height === 0) {
this._selectedTilesPreview.close(true);
this._resetSpanSelectionState();
this._snapAssistingInfo.update(undefined);
return;
}
Expand Down