h/karousel
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt.d.ts: rename QmlRect

Browse Source
This commit is contained in:
Peter Fajdiga
2023-12-10 21:06:03 +01:00
parent e7d33030ba
commit 2df6d5d8e6
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/extern/kwin.d.ts vendored
View File

@@ -56,7 +56,7 @@ interface KwinClient {
keepBelow: boolean;
shade: boolean;
minimized: boolean;
frameGeometry: QRect;
frameGeometry: QmlRect;
desktop: number; // -1 means all desktops
tile: Tile;
@@ -69,7 +69,7 @@ interface KwinClient {
moveResizedChanged: QSignal<[void]>;
moveResizeCursorChanged: QSignal<[void]>;
clientStartUserMovedResized: QSignal<[void]>;
frameGeometryChanged: QSignal<[KwinClient, oldGeometry: QRect]>;
frameGeometryChanged: QSignal<[KwinClient, oldGeometry: QmlRect]>;
// Functions
setMaximize(vertically: boolean, horizontally: boolean): void;

4
src/extern/qt.d.ts vendored
View File

@@ -4,7 +4,7 @@ declare const console: {
};
declare const Qt: {
rect(x: number, y: number, width: number, height: number): QRect;
rect(x: number, y: number, width: number, height: number): QmlRect;
createQmlObject(qml: string, parent: QmlObject);
};
@@ -12,7 +12,7 @@ type QmlObject = unknown;
type QByteArray = string;
type QRect = {
type QmlRect = {
x: number;
y: number;
width: number;

6
src/layout/Desktop.ts
View File

@@ -6,8 +6,8 @@ class Desktop {
private scrollX: number;
private dirty: boolean;
private dirtyPins: boolean;
public clientArea: QRect;
public tilingArea: QRect;
public clientArea: QmlRect;
public tilingArea: QmlRect;
constructor(desktopNumber: number, pinManager: PinManager, config: Desktop.Config, layoutConfig: LayoutConfig) {
this.pinManager = pinManager;
@@ -38,7 +38,7 @@ class Desktop {
return workspace.clientArea(ClientAreaOption.PlacementArea, 0, desktopNumber);
}
private static getTilingArea(clientArea: QRect, desktopNumber: number, pinManager: PinManager, config: Desktop.Config) {
private static getTilingArea(clientArea: QmlRect, desktopNumber: number, pinManager: PinManager, config: Desktop.Config) {
const availableSpace = pinManager.getAvailableSpace(desktopNumber, clientArea);
const top = availableSpace.top + config.marginTop;
const bottom = availableSpace.bottom - config.marginBottom;

2
src/layout/Window.ts
View File

@@ -106,7 +106,7 @@ class Window {
this.column.grid.desktop.onLayoutChanged();
}
public onUserResize(oldGeometry: QRect, resizeNeighborColumn: boolean) {
public onUserResize(oldGeometry: QmlRect, resizeNeighborColumn: boolean) {
const newGeometry = this.client.kwinClient.frameGeometry;
const widthDelta = newGeometry.width - oldGeometry.width;
const heightDelta = newGeometry.height - oldGeometry.height;

8
src/world/ClientWrapper.ts
View File

@@ -6,7 +6,7 @@ class ClientWrapper {
private readonly rulesSignalManager: SignalManager | null;
public preferredWidth: number;
private readonly manipulatingGeometry: Doer;
private lastPlacement: QRect | null; // workaround for issue #19
private lastPlacement: QmlRect | null; // workaround for issue #19
constructor(
kwinClient: KwinClient,
@@ -92,7 +92,7 @@ class ClientWrapper {
return this.kwinClient.shade;
}
public isManipulatingGeometry(newGeometry: QRect | null) {
public isManipulatingGeometry(newGeometry: QmlRect | null) {
if (newGeometry !== null && newGeometry === this.lastPlacement) {
return true;
}
@@ -108,7 +108,7 @@ class ClientWrapper {
this.transients.splice(i, 1);
}
public ensureTransientsVisible(screenSize: QRect) {
public ensureTransientsVisible(screenSize: QmlRect) {
for (const transient of this.transients) {
if (transient.stateManager.getState() instanceof ClientState.Floating) {
transient.ensureVisible(screenSize);
@@ -117,7 +117,7 @@ class ClientWrapper {
}
}
public ensureVisible(screenSize: QRect) {
public ensureVisible(screenSize: QmlRect) {
if (this.kwinClient.desktop !== workspace.currentDesktop) {
return;
}

6
src/world/PinManager.ts
View File

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

2
src/world/clientState/Docked.ts
View File

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

2
src/world/clientState/Pinned.ts
View File

@@ -41,7 +41,7 @@ namespace ClientState {
}
});
manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QRect) => {
manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
if (kwinClient.tile === null) {
world.do((clientManager, desktopManager) => {
clientManager.unpinClient(kwinClient);

4
src/world/clientState/Tiled.ts
View File

@@ -83,7 +83,7 @@ namespace ClientState {
cursorChangedAfterResizeStart = false;
});
manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QRect) => {
manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
// on Wayland, this fires after `tileChanged`
if (kwinClient.tile !== null) {
world.do((clientManager, desktopManager) => {
@@ -158,7 +158,7 @@ namespace ClientState {
client.setMaximize(false, false);
}
private static restoreClientAfterTiling(client: ClientWrapper, config: LayoutConfig, defaultState: Tiled.WindowState, screenSize: QRect) {
private static restoreClientAfterTiling(client: ClientWrapper, config: LayoutConfig, defaultState: Tiled.WindowState, screenSize: QmlRect) {
if (config.skipSwitcher) {
client.kwinClient.skipSwitcher = defaultState.skipSwitcher;
}