phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-22720] Assume maximize setting when AppleActionOnDoubleClick isn't explicitly set (#1214)

Browse Source 
* [MM-22720] Assume maximize setting when AppleActionOnDoubleClick isn't explicitly set

* Forced for macOS only and made same changes to SettingsPage

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Devin Binnie
2020-04-07 14:52:33 -04:00
committed by GitHub
parent 93f7ae9b47
commit 9b5f53a294
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/browser/components/MainPage.jsx
View File

@@ -547,14 +547,16 @@ export default class MainPage extends React.Component {
} }
handleDoubleClick = () => { handleDoubleClick = () => {
const doubleClickAction = remote.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string'); if (process.platform === 'darwin') {
const win = remote.getCurrentWindow(); const doubleClickAction = remote.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string');
if (doubleClickAction === 'Minimize') { const win = remote.getCurrentWindow();
win.minimize(); if (doubleClickAction === 'Minimize') {
} else if (doubleClickAction === 'Maximize' && !win.isMaximized()) { win.minimize();
win.maximize(); } else if (!win.isMaximized()) {
} else if (doubleClickAction === 'Maximize' && win.isMaximized()) { win.maximize();
win.unmaximize(); } else if (win.isMaximized()) {
win.unmaximize();
}
} }
} }

18
src/browser/components/SettingsPage.jsx
View File

@@ -467,14 +467,16 @@ export default class SettingsPage extends React.Component {
} }
handleDoubleClick = () => { handleDoubleClick = () => {
const doubleClickAction = remote.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string'); if (process.platform === 'darwin') {
const win = remote.getCurrentWindow(); const doubleClickAction = remote.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string');
if (doubleClickAction === 'Minimize') { const win = remote.getCurrentWindow();
win.minimize(); if (doubleClickAction === 'Minimize') {
} else if (doubleClickAction === 'Maximize' && !win.isMaximized()) { win.minimize();
win.maximize(); } else if (!win.isMaximized()) {
} else if (doubleClickAction === 'Maximize' && win.isMaximized()) { win.maximize();
win.unmaximize(); } else if (win.isMaximized()) {
win.unmaximize();
}
} }
} }