Skip to content

Commit

Permalink
Merge pull request #532 from input-output-hk/fix/daef-537-correctly-p…
Browse files Browse the repository at this point in the history
…revent-max-window-size-in-electron

Fix/daef 537 correctly prevent max-window-size in electron
  • Loading branch information
DominikGuzei authored Nov 7, 2017
2 parents 48161a6 + 5a56e05 commit 74c307a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Changelog
- Fix error message text for A to A transaction error ([PR 484](https://github.com/input-output-hk/daedalus/pull/484))
- Fix "label prop type" checkbox issue in react-polymorph ([PR 487](https://github.com/input-output-hk/daedalus/pull/487))
- Remove all drag and drop instructions from UI ([PR 495](https://github.com/input-output-hk/daedalus/pull/495))
- Correctly prevent max-window-size in electron ([PR 532](https://github.com/input-output-hk/daedalus/pull/532))

### Chores

Expand Down
9 changes: 0 additions & 9 deletions electron/main.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,6 @@ app.on('ready', async () => {
mainWindow.setMenu(menu);
}

// Unset max height/width in fullscreen
mainWindow.on('enter-full-screen', () => {
mainWindow.setMaximumSize(2147483647, 2147483647);
});

mainWindow.on('leave-full-screen', () => {
mainWindow.setMaximumSize(1500, 2500);
});

// Hide application window on Cmd+H hotkey (OSX only!)
if (process.platform === 'darwin') {
app.on('activate', () => {
Expand Down

0 comments on commit 74c307a

Please sign in to comment.