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

ClientState.Manager.setState: construct the new state after destroying the old one

Browse Source
This commit is contained in:
Peter Fajdiga
2023-09-02 10:45:02 +02:00
parent 9912a8d917
commit 681ae38d85
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/world/ClientManager.ts
View File

@@ -32,10 +32,10 @@ class ClientManager {
this.clientMap.set(kwinClient, client);
if (kwinClient.dock) {
client.stateManager.setState(new ClientState.Docked(this.world, kwinClient), false);
client.stateManager.setState(() => new ClientState.Docked(this.world, kwinClient), false);
} else if (this.windowRuleEnforcer.shouldTile(kwinClient)) {
const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
client.stateManager.setState(new ClientState.Tiled(this.world, client, grid), false);
client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
}
}
@@ -68,7 +68,7 @@ class ClientManager {
return;
}
if (client.stateManager.getState() instanceof ClientState.Tiled) {
client.stateManager.setState(new ClientState.TiledMinimized(), kwinClient === this.lastFocusedClient);
client.stateManager.setState(() => new ClientState.TiledMinimized(), kwinClient === this.lastFocusedClient);
}
}
@@ -79,7 +79,7 @@ class ClientManager {
}
if (client.stateManager.getState() instanceof ClientState.TiledMinimized) {
const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
client.stateManager.setState(new ClientState.Tiled(this.world, client, grid), false);
client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
}
}
@@ -92,7 +92,7 @@ class ClientManager {
return;
}
const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
client.stateManager.setState(new ClientState.Tiled(this.world, client, grid), false);
client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
}
public untileClient(kwinClient: AbstractClient) {
@@ -101,7 +101,7 @@ class ClientManager {
return;
}
if (client.stateManager.getState() instanceof ClientState.Tiled) {
client.stateManager.setState(new ClientState.Floating(), false);
client.stateManager.setState(() => new ClientState.Floating(), false);
}
}
@@ -115,9 +115,9 @@ class ClientManager {
if (clientState instanceof ClientState.Floating && Clients.canTileEver(kwinClient)) {
Clients.makeTileable(kwinClient);
const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
client.stateManager.setState(new ClientState.Tiled(this.world, client, grid), false);
client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
} else if (clientState instanceof ClientState.Tiled) {
client.stateManager.setState(new ClientState.Floating(), false);
client.stateManager.setState(() => new ClientState.Floating(), false);
}
}

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

@@ -6,9 +6,9 @@ namespace ClientState {
this.state = initialState;
}
public setState(newState: ClientState.State, passFocus: boolean) {
public setState(constructNewState: () => ClientState.State, passFocus: boolean) {
this.state.destroy(passFocus);
this.state = newState;
this.state = constructNewState();
}
public getState() {