Fix dark tray icon option making all icons dark #1680
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TheZ3ro
approved these changes
Mar 8, 2018
phoerious
approved these changes
Mar 8, 2018
|
Thanks. Please rebase to release/2.3.2. |
Introduces a separate path for tray icons which are neither locked nor unlocked. Closes keepassxreboot#1556.
|
Thanks for the contribution 🎉 |
droidmonkey
added a commit
that referenced
this pull request
May 8, 2018
- Enable high entropy ASLR on Windows [#1747] - Enhance favicon fetching [#1786] - Fix crash on Windows due to autotype [#1691] - Fix dark tray icon changing all icons [#1680] - Fix --pw-stdin not using getPassword function [#1686] - Fix placeholders being resolved in notes [#1907] - Enable auto-type start delay to be configurable [#1908] - Browser: Fix native messaging reply size [#1719] - Browser: Increase maximum buffer size [#1720] - Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906] - SSH Agent: Parse aes-256-cbc/ctr keys [#1682] - SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Introduces a separate path for tray icons which are neither locked nor unlocked and uses that when setting the tray icon while always using the default icon as an application icon.
Motivation and context
Closes #1556.
How has this been tested?
Built on Linux, ran tests. Checked title bar, about menu, application switcher and tray icon with option turned on and off in KDE. Not sure if all platforms support differing application and tray icons, but I think this should work on the most popular ones.
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]