dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 00:56:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure window bounds within display on startup #856

Browse Source
This commit is contained in:
Jan Prochazka
2024-07-24 13:20:44 +02:00
parent ebcad6eded
commit e5fb3414fe
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/electron.js
View File

@@ -276,6 +276,28 @@ function fillMissingSettings(value) {
return res;
}
function ensureBoundsVisible(bounds) {
const area = electron.screen.getDisplayMatching(bounds).workArea;
let { x, y, width, height } = bounds;
const isWithinDisplay =
x >= area.x && x + width <= area.x + area.width && y >= area.y && y + height <= area.y + area.height;
if (!isWithinDisplay) {
width = Math.min(width, area.width);
height = Math.min(height, area.height);
if (width < 400) width = 400;
if (height < 300) height = 300;
x = area.x; // + Math.round(area.width - width / 2);
y = area.y; // + Math.round(area.height - height / 2);
}
return { x, y, width, height };
}
function createWindow() {
let settingsJson = {};
try {
@@ -288,7 +310,8 @@ function createWindow() {
settingsJson = fillMissingSettings({});
}
const bounds = initialConfig['winBounds'];
let bounds = initialConfig['winBounds'];
bounds = ensureBoundsVisible(bounds);
useNativeMenu = settingsJson['app.useNativeMenu'];
mainWindow = new BrowserWindow({
@@ -353,6 +376,11 @@ function createWindow() {
mainWindow.on('unmaximize', () => {
mainWindow.webContents.send('setIsMaximized', false);
});
// app.on('browser-window-focus', () => {
// const bounds = ensureBoundsVisible(mainWindow.getBounds());
// mainWindow.setBounds(bounds);
// });
}
if (!apiLoaded) {