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 toolbar text color on macOS when in dark mode #2998

Merged
merged 1 commit into from Apr 16, 2019

Conversation

3 participants
@mko-x
Copy link

commented Apr 13, 2019

Fix toolbar action color macOS

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Description and Context

The text for the action icons in toolbar was not readable in macOS, changed to white text color.

Screenshots

Before

screenshot-before

After

screenshot

Testing strategy

Local Release Build with Tests

Show resolved Hide resolved src/gui/MainWindow.cpp Outdated
Show resolved Hide resolved src/gui/MainWindow.cpp Outdated
Show resolved Hide resolved src/gui/macutils/MacUtils.cpp Outdated

@droidmonkey droidmonkey added this to the v2.4.2 milestone Apr 15, 2019

Fix macOS Toolbar Button color
* Correct color setting only if dark mode is enabled

@droidmonkey droidmonkey changed the base branch from develop to release/2.4.2 Apr 15, 2019

@droidmonkey droidmonkey changed the title Fix toolbar action color macOS Fix toolbar text color on macOS when in dark mode Apr 15, 2019

all changes made

@droidmonkey droidmonkey merged commit 663467e into keepassxreboot:release/2.4.2 Apr 16, 2019

4 checks passed

CodeFactor No issues found.
Details
MacOS (KeepassXC) TeamCity build finished
Details
Ubuntu Linux (KeepassXC) TeamCity build finished
Details
Windows 10 (KeepassXC) TeamCity build finished
Details

@mko-x mko-x deleted the mko-x:fix-toolbar-action-color-osx branch Apr 16, 2019

@phoerious

This comment has been minimized.

Copy link
Member

commented Apr 17, 2019

I'm a bit worried about Qt fixing this issue, but our hack staying in the code forever.

@mko-x

This comment has been minimized.

Copy link
Author

commented Apr 17, 2019

Maybe adding a compiler warning if the QT major version raises is an idea.

droidmonkey added a commit that referenced this pull request May 31, 2019

Release 2.4.2
- Improve resilience against memory attacks - overwrite memory before free [#3020]
- Prevent infinite save loop when location is unavailable [#3026]
- Attempt to fix quitting application when shutdown or logout issued [#3199]
- Support merging database custom data [#3002]
- Fix opening URL's with non-http schemes [#3153]
- Fix data loss due to not reading all database attachments if duplicates exist [#3180]
- Fix entry context menu disabling when using keyboard navigation [#3199]
- Fix behaviors when canceling an entry edit [#3199]
- Fix processing of tray icon click and doubleclick [#3112]
- Update group in preview widget when focused [#3199]
- Prefer DuckDuckGo service over direct icon download (increases resolution) [#2996]
- Remove apply button in application settings [#3019]
- Use winqtdeploy on Windows to correct deployment issues [#3025]
- Don't mark entry edit as modified when attribute selection changes [#3041]
- Use console code page CP_UTF8 on Windows if supported [#3050]
- Snap: Fix locking database with session lock [#3046]
- Snap: Fix theming across Linux distributions [#3057]
- Snap: Use SNAP_USER_COMMON and SNAP_USER_DATA directories [#3131]
- KeeShare: Automatically enable WITH_XC_KEESHARE_SECURE if quazip is found [#3088]
- macOS: Fix toolbar text when in dark mode [#2998]
- macOS: Lock database on switching user [#3097]
- macOS: Fix global Auto-Type when the database is locked [#3138]
- Browser: Close popups when database is locked [#3093]
- Browser: Add tests [#3016]
- Browser: Don't create default group if custom group is enabled [#3127]
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.