mirror of
https://github.com/balena-io/etcher.git
synced 2025-04-20 05:17:18 +00:00
f7b22467ee
From the documentation: > `useContentSize` Boolean - The `width` and `height` would be used as web > page’s size, which means the actual window’s size will include window > frame’s size and be slightly larger. Default is `false`. The original issue is that when you specify a width/height, the actual size that you get is slighly smaller, since the OS title bar is included in the size you provide. By using the `useContentSize` option, we ensure the `WebView` gets the intended size, no matter the title bar. This PR invalidates: https://github.com/resin-io/etcher/pull/244 Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
73 lines
2.0 KiB
JavaScript
73 lines
2.0 KiB
JavaScript
/*
|
|
* Copyright 2016 Resin.io
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const electron = require('electron');
|
|
const path = require('path');
|
|
const elevate = require('./elevate');
|
|
let mainWindow = null;
|
|
|
|
electron.app.on('window-all-closed', electron.app.quit);
|
|
|
|
electron.app.on('ready', function() {
|
|
|
|
// No menu bar
|
|
electron.Menu.setApplicationMenu(null);
|
|
|
|
elevate.require(electron.app, function(error) {
|
|
|
|
if (error) {
|
|
electron.dialog.showErrorBox('Elevation Error', error.message);
|
|
return process.exit(1);
|
|
}
|
|
|
|
mainWindow = new electron.BrowserWindow({
|
|
width: 800,
|
|
height: 380,
|
|
useContentSize: true,
|
|
show: false,
|
|
resizable: false,
|
|
fullscreen: false,
|
|
titleBarStyle: 'hidden-inset',
|
|
icon: path.join(__dirname, '..', 'assets', 'icon.png')
|
|
});
|
|
|
|
// Prevent flash of white when starting the application
|
|
// https://github.com/atom/electron/issues/2172
|
|
mainWindow.webContents.on('did-finish-load', function() {
|
|
|
|
// The flash of white is still present for a very short
|
|
// while after the WebView reports it finished loading
|
|
setTimeout(function() {
|
|
mainWindow.show();
|
|
}, 100);
|
|
|
|
});
|
|
|
|
mainWindow.on('closed', function() {
|
|
mainWindow = null;
|
|
});
|
|
|
|
electron.globalShortcut.register('CmdOrCtrl+Alt+I', function() {
|
|
mainWindow.webContents.openDevTools();
|
|
});
|
|
|
|
mainWindow.loadURL(`file://${path.join(__dirname, 'index.html')}`);
|
|
});
|
|
});
|
|
|