if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #223 from KiranNiranjan/ELECTRON-196

Browse Source 
Electron-196 (Pop-out min-height)
This commit is contained in:
Vikas Shashidhar 2017-10-31 15:32:43 +05:30 committed by GitHub
commit 1a848d2c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/windowMgr.js
View File

@ -40,7 +40,11 @@ let sandboxed = false;
const preloadMainScript = path.join(__dirname, 'preload/_preloadMain.js');
const MIN_WIDTH = 300;
const MIN_HEIGHT = 600;
const MIN_HEIGHT = 300;
// Default window size for pop-out windows
const DEFAULT_WIDTH = 300;
const DEFAULT_HEIGHT = 600;
/**
* Adds a window key
@ -293,8 +297,8 @@ function doCreateMainWindow(initialUrl, initialBounds) {
let x = 0;
let y = 0;
let width = newWinOptions.width || MIN_WIDTH;
let height = newWinOptions.height || MIN_HEIGHT;
let width = newWinOptions.width || DEFAULT_WIDTH;
let height = newWinOptions.height || DEFAULT_HEIGHT;
// try getting x and y position from query parameters
let query = newWinParsedUrl && querystring.parse(newWinParsedUrl.query);
@ -323,8 +327,8 @@ function doCreateMainWindow(initialUrl, initialBounds) {
/* eslint-disable no-param-reassign */
newWinOptions.x = x;
newWinOptions.y = y;
newWinOptions.width = Math.max(width, MIN_WIDTH);
newWinOptions.height = Math.max(height, MIN_HEIGHT);
newWinOptions.width = Math.max(width, DEFAULT_WIDTH);
newWinOptions.height = Math.max(height, DEFAULT_HEIGHT);
newWinOptions.minWidth = MIN_WIDTH;
newWinOptions.minHeight = MIN_HEIGHT;
newWinOptions.alwaysOnTop = alwaysOnTop;