Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minimized window focusing #1304

Merged
merged 4 commits into from Mar 8, 2019

Conversation

Projects
None yet
2 participants
@skoruppa
Copy link
Contributor

skoruppa commented Feb 22, 2019

Trying to fix #1300 by myself. Adding Window.restore() and Window.focus() helps addressing minimized window

@adlk adlk changed the base branch from master to develop Mar 5, 2019

@adlk

This comment has been minimized.

Copy link
Contributor

adlk commented Mar 5, 2019

@skoruppa please add specific testing instructions

@skoruppa

This comment has been minimized.

Copy link
Contributor Author

skoruppa commented Mar 5, 2019

@adlk I think I can just copy here what I have already wrote in #1300
Three cases:

Case 1

  • Minimize Franz's window
  • Wait for new message
  • Click on the notification
  • Franz's window should be unminimized and brought to the front. Additionally the service from which notification came should be focused

Case 2

  • Minimize Franz's window
  • Click Franz's tray icon and select "Show Franz"
  • Franz's window should be unminimized and brought to the front

Case 3

  • Close Franz's window to tray icon
  • Try to run Franz again from launcher/app menu
  • Franz's window should be opened and brought to the front
@adlk

This comment has been minimized.

Copy link
Contributor

adlk commented Mar 5, 2019

@skoruppa OS was Ubuntu 18.04.2 LTS?

@skoruppa

This comment has been minimized.

Copy link
Contributor Author

skoruppa commented Mar 5, 2019

exactly

@adlk

This comment has been minimized.

Copy link
Contributor

adlk commented Mar 5, 2019

I've just tested this on Windows and adding mainWindow.restore() leads to unwanted side effects.
E.g. if you have maximized your window and want to reopen it restore will unmaximize the window. So please, do not remove the OS checks.

@skoruppa

This comment has been minimized.

Copy link
Contributor Author

skoruppa commented Mar 6, 2019

Oh, I didn't check that but there is exactly same behavior on Linux. However, I still insist to leave mainWindow.restore() there. Maybe we could just check if window is minimized with mainWindow.isMinimized() before we restore it?

@adlk

This comment has been minimized.

Copy link
Contributor

adlk commented Mar 8, 2019

LGTM :shipit:

thanks for your effort!

@adlk adlk merged commit 5b02c4d into meetfranz:develop Mar 8, 2019

1 check failed

continuous-integration/appveyor/pr AppVeyor build failed
Details

@adlk adlk referenced this pull request Mar 18, 2019

Merged

Release/5.0.1 beta.1 #1344

adlk added a commit that referenced this pull request Mar 18, 2019

Release/5.0.1 beta.1 (#1344)
* Add lerna

* Add theme

* Add forms

* Add misty config to build theme & forms

* reset packages version

* Publish

 - @meetfranz/forms@1.0.0
 - @meetfranz/theme@1.0.0

* Reset package version

* restructure packages

* try ci with lerna

* Fix missing packages in build

* move storybook to root + typescript

TODO: fix modules

* Add lerna instructions

* Merge

* wip

* Make packages work in electron, node and web

* Finalize packages & replace storybook with homegrown `uidev`

* Bring package-lock back in sync

* Publish

 - @meetfranz/forms@1.0.1
 - @meetfranz/theme@1.0.1

* fix webpack issue

* expose legacy styles

* Add toggle element to @meetfranz/forms

* start typings package

* Update package.json

* Add buttons

* Update theme

* add types

* Add mdi icons to buttons

* Publish

 - @meetfranz/forms@1.0.2
 - @meetfranz/theme@1.0.2
 - @meetfranz/typings@0.0.1

* Button, add missing success state

* Update lerna packages

* Try to disable automatic npm ci

* Try to get a working bundle

* Add href and type to button component

* Update packages

* update versions

* cleanup

* Update package versions

[ci skip]

* Update versions

* Add withTheme context to button

* Update & reuse electron-rebuild

* feat(Windows): Add option to quit Franz from Taskbar icon

* Add missing withTheme

* Fix package versions

* Update versions

* Add pageview event

* Simplify analytics calls

* Pin gulp-sass-variables to 1.1.1

* Add onFocus event

* Add modal overlay color

* remove legacy theme files

* remove code

* Add dialog to share franz on social media

* Fix service count

* remove ping

* replace ms time strings with ms module

* remove unused packages

* fix value setter

* new payment flow

* fix module reference

* feat(Spell check): Add en-gb spell check languages (#1306)

* move devmode info

* fix(Windows): Fix losing window when "Keep Franz in background" is enabled

* fix(Service): Fix service zoom (cmd/ctrl+ & cmd/ctrl-)

* fixes appveyor build issue

* feat(App): Update electron to 4.0.7

* ignore intellij idea project files

* Automatic i18n update (i18n.meetfranz.com)

* feat(App): Add security checks for external URLs

* setup react-intl translations managing script

* use same zooming logic for all os

* feat(Linux): Add auto updater for Linux AppImage builds

* Add ctrl+ for zoom in on Windows

* move translation scripts into src/i18n folder

* only manage en-US translations

* manage translations before git pushes

* Fix unused i18n strings

* Bump version to 5.0.1-beta.1

* fix(Service) shortcuts for activating prev/next service fixes #1298

* fix(Service): Fix shortcut for (un)muting notifications & audio

* add missing react-intl files

* correctly update services submenu on language change

* fix(Windows): Fix copy & paste in service context menus

Closes #1316

* fix(Linux): Fix minimized window focusing (#1304) (@skoruppa)

* trigger build

* Check if window is minimized before restoring it

* restore() should be executed only when window is minimized

* fix(Notifications): Fix notifications & notification click when icon is blob

* Fix/service webview unmounting (#1328)

* detach service when underlying webview unmounts

* disable no-param-reassign eslint rule

* Add notification debug events

* Update electron to 4.0.8

Update required in order to fix performance degradation due to memory leak issue electron/electron#16772.

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* 5.0.1-beta.1

@adlk adlk referenced this pull request Mar 25, 2019

Merged

Release/5.0.1 #1354

adlk added a commit that referenced this pull request Mar 25, 2019

Release/5.0.1 (#1354)
* Add lerna

* Add theme

* Add forms

* Add misty config to build theme & forms

* reset packages version

* Publish

 - @meetfranz/forms@1.0.0
 - @meetfranz/theme@1.0.0

* Reset package version

* restructure packages

* try ci with lerna

* Fix missing packages in build

* move storybook to root + typescript

TODO: fix modules

* Add lerna instructions

* Merge

* wip

* Make packages work in electron, node and web

* Finalize packages & replace storybook with homegrown `uidev`

* Bring package-lock back in sync

* Publish

 - @meetfranz/forms@1.0.1
 - @meetfranz/theme@1.0.1

* fix webpack issue

* expose legacy styles

* Add toggle element to @meetfranz/forms

* start typings package

* Update package.json

* Add buttons

* Update theme

* add types

* Add mdi icons to buttons

* Publish

 - @meetfranz/forms@1.0.2
 - @meetfranz/theme@1.0.2
 - @meetfranz/typings@0.0.1

* Button, add missing success state

* Update lerna packages

* Try to disable automatic npm ci

* Try to get a working bundle

* Add href and type to button component

* Update packages

* update versions

* cleanup

* Update package versions

[ci skip]

* Update versions

* Add withTheme context to button

* Update & reuse electron-rebuild

* feat(Windows): Add option to quit Franz from Taskbar icon

* Add missing withTheme

* Fix package versions

* Update versions

* Add pageview event

* Simplify analytics calls

* Pin gulp-sass-variables to 1.1.1

* Add onFocus event

* Add modal overlay color

* remove legacy theme files

* remove code

* Add dialog to share franz on social media

* Fix service count

* remove ping

* replace ms time strings with ms module

* remove unused packages

* fix value setter

* new payment flow

* fix module reference

* feat(Spell check): Add en-gb spell check languages (#1306)

* move devmode info

* fix(Windows): Fix losing window when "Keep Franz in background" is enabled

* fix(Service): Fix service zoom (cmd/ctrl+ & cmd/ctrl-)

* fixes appveyor build issue

* feat(App): Update electron to 4.0.7

* ignore intellij idea project files

* Automatic i18n update (i18n.meetfranz.com)

* feat(App): Add security checks for external URLs

* setup react-intl translations managing script

* use same zooming logic for all os

* feat(Linux): Add auto updater for Linux AppImage builds

* Add ctrl+ for zoom in on Windows

* move translation scripts into src/i18n folder

* only manage en-US translations

* manage translations before git pushes

* Fix unused i18n strings

* Bump version to 5.0.1-beta.1

* fix(Service) shortcuts for activating prev/next service fixes #1298

* fix(Service): Fix shortcut for (un)muting notifications & audio

* add missing react-intl files

* correctly update services submenu on language change

* fix(Windows): Fix copy & paste in service context menus

Closes #1316

* fix(Linux): Fix minimized window focusing (#1304) (@skoruppa)

* trigger build

* Check if window is minimized before restoring it

* restore() should be executed only when window is minimized

* fix(Notifications): Fix notifications & notification click when icon is blob

* Fix/service webview unmounting (#1328)

* detach service when underlying webview unmounts

* disable no-param-reassign eslint rule

* Add notification debug events

* Update electron to 4.0.8

Update required in order to fix performance degradation due to memory leak issue electron/electron#16772.

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* 5.0.1-beta.1

* Bump version to 5.0.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.