From e94d3344eb0a07236e457cff95f9c7b7bbef3f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Fri, 29 Jun 2018 08:54:44 +0200 Subject: [PATCH] Use a default window size different from the minimum window size --- src/config/constants.js | 4 +++- src/main/app.js | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/config/constants.js b/src/config/constants.js index e0d25221..101731e4 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -15,8 +15,10 @@ const stringFromEnv = (key: string, def: string): string => process.env[key] || // Size -export const MIN_HEIGHT = intFromEnv('LEDGER_MIN_HEIGHT', 700) +export const DEFAULT_WINDOW_WIDTH = intFromEnv('LEDGER_DEFAULT_WINDOW_WIDTH', 1024) +export const DEFAULT_WINDOW_HEIGHT = intFromEnv('LEDGER_DEFAULT_WINDOW_HEIGHT', 768) export const MIN_WIDTH = intFromEnv('LEDGER_MIN_WIDTH', 1024) +export const MIN_HEIGHT = intFromEnv('LEDGER_MIN_HEIGHT', 700) // time and delays... diff --git a/src/main/app.js b/src/main/app.js index 73633ebd..acd98db2 100644 --- a/src/main/app.js +++ b/src/main/app.js @@ -2,7 +2,12 @@ import { app, BrowserWindow, Menu, screen } from 'electron' import debounce from 'lodash/debounce' -import { MIN_HEIGHT, MIN_WIDTH } from 'config/constants' +import { + MIN_HEIGHT, + MIN_WIDTH, + DEFAULT_WINDOW_WIDTH, + DEFAULT_WINDOW_HEIGHT, +} from 'config/constants' import menu from 'main/menu' import db from 'helpers/db' @@ -77,8 +82,8 @@ function createMainWindow() { const savedDimensions = db.getIn('settings', 'window.MainWindow.dimensions', {}) const savedPositions = db.getIn('settings', 'window.MainWindow.positions', null) - const width = savedDimensions.width || MIN_WIDTH - const height = savedDimensions.height || MIN_HEIGHT + const width = savedDimensions.width || DEFAULT_WINDOW_WIDTH + const height = savedDimensions.height || DEFAULT_WINDOW_HEIGHT const windowOptions = { ...defaultWindowOptions,