Skip to content
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.

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

feat: screen state #1446

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/main/level/sublevels/keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ export const levelKeys = {
userPreferences: "userPreferences",
language: "language",
sqliteMigrationDone: "sqliteMigrationDone",
screenState: "screenState",
};
104 changes: 82 additions & 22 deletions src/main/services/window-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,15 @@ import { HydraApi } from "./hydra-api";
import UserAgent from "user-agents";
import { db, gamesSublevel, levelKeys } from "@main/level";
import { slice, sortBy } from "lodash-es";
import type { UserPreferences } from "@types";
import type { ScreenState, UserPreferences } from "@types";
import { AuthPage } from "@shared";
import { isStaging } from "@main/constants";

export class WindowManager {
public static mainWindow: Electron.BrowserWindow | null = null;

private static loadMainWindowURL(hash = "") {
// HMR for renderer base on electron-vite cli.
// Load the remote URL for development or the local html file for production.
if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
this.mainWindow?.loadURL(
`${process.env["ELECTRON_RENDERER_URL"]}#/${hash}`
);
} else {
this.mainWindow?.loadFile(
path.join(__dirname, "../renderer/index.html"),
{
hash,
}
);
}
}

public static createMainWindow() {
if (this.mainWindow) return;

this.mainWindow = new BrowserWindow({
private static initialConfigInitializationMainWindow: Electron.BrowserWindowConstructorOptions =
{
width: 1200,
height: 720,
minWidth: 1024,
Expand All @@ -63,7 +44,69 @@ export class WindowManager {
sandbox: false,
},
show: false,
};

private static async saveScreenConfig({
...configScreenWhenClosed
}: {
x: number | undefined;
y: number | undefined;
width: number;
height: number;
isMaximized: boolean;
}) {
await db.put(levelKeys.screenState, configScreenWhenClosed, {
valueEncoding: "json",
});
}

private static async loadScreenConfig() {
const data = await db.get<string, ScreenState>(levelKeys.screenState, {
valueEncoding: "json",
});
return data ?? {};
}
private static updateInitialConfig(
newConfig: Partial<Electron.BrowserWindowConstructorOptions>
) {
this.initialConfigInitializationMainWindow = {
...this.initialConfigInitializationMainWindow,
...newConfig,
};
}

private static loadMainWindowURL(hash = "") {
// HMR for renderer base on electron-vite cli.
// Load the remote URL for development or the local html file for production.
if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
this.mainWindow?.loadURL(
`${process.env["ELECTRON_RENDERER_URL"]}#/${hash}`
);
} else {
this.mainWindow?.loadFile(
path.join(__dirname, "../renderer/index.html"),
{
hash,
}
);
}
}

public static async createMainWindow() {
if (this.mainWindow) return;

const { isMaximized = false, ...configWithoutMaximized } =
await this.loadScreenConfig();

this.updateInitialConfig(configWithoutMaximized);

this.mainWindow = new BrowserWindow(
this.initialConfigInitializationMainWindow
);

if (isMaximized) {
this.mainWindow.maximize();
}

this.mainWindow.webContents.session.webRequest.onBeforeSendHeaders(
(details, callback) => {
Expand Down Expand Up @@ -141,9 +184,26 @@ export class WindowManager {
}
);

if (this.mainWindow) {
const lastBounds = this.mainWindow.getBounds();
const isMaximized = this.mainWindow.isMaximized() ?? false;
const screenConfig = isMaximized
? {
x: undefined,
y: undefined,
height: this.initialConfigInitializationMainWindow.height!,
width: this.initialConfigInitializationMainWindow.width!,
isMaximized: true,
}
: { ...lastBounds, isMaximized };

await this.saveScreenConfig(screenConfig);
}

if (userPreferences?.preferQuitInsteadOfHiding) {
app.quit();
}

WindowManager.mainWindow?.setProgressBar(-1);
WindowManager.mainWindow = null;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ export function HeroPanelActions() {
{game.favorite ? <HeartFillIcon /> : <HeartIcon />}
</Button>


<Button
onClick={() => setShowGameOptionsModal(true)}
theme="outline"
Expand Down
8 changes: 8 additions & 0 deletions src/types/level.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,11 @@ export interface UserPreferences {
repackUpdatesNotificationsEnabled?: boolean;
achievementNotificationsEnabled?: boolean;
}

export interface ScreenState {
x?: number;
y?: number;
height: number;
width: number;
isMaximized: boolean;
}
Loading