xdgiconloader: Puts the hicolor at the end of the theme hierarchy #126
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
The hicolor theme is the ultimate resort. It should be allowed only at the
end of the fallback hierarchy. We are allowing the hicolor theme to be in
the middle of the theme hierarchy. Schematically:
X -> hicolor -> Y -> Z -> hicolor
If an icon exists in the hicolor and Y theme the hicolor one, is wrongly
used.
This commit does four things:
* Stops adding the hicolor theme to each theme as a fallback.
* Stops adding the hicolor as a parent theme, even if added by the
index.theme Inherits key. The oxygen theme does it.
* Stops return the hicolor theme in the fallbackTheme().
* Adds the hicolor theme to the end of the fallback hierarchy list.
|
Using the Tangerine Icon Theme: With this PR on top of #116: The wrong handling of the hicolor theme prevents the oxygen p.s. Timing info is not accurate. |
|
as far as i can see - it works mostly, only found one regression with quassel:
quasselclient.desktop is |
|
Additional info - this is with the applied PRs 116 and 126 - so i might miss one thing |
|
@agaida Which icon theme are you using ? |
|
faenza-ambiance |
luis-pereira
force-pushed
the
fix-hicolor-position
branch
2 times, most recently
from
29ea369
to
c61fd1a
Compare
|
@agaida Fixed. Pls update. |
Their place is after the hicolor theme. And they should be searched one time only, after the hicolor theme.
luis-pereira
force-pushed
the
fix-hicolor-position
branch
from
c61fd1a
to
44cc641
Compare
|
@luis-pereira works fine, the quassel-icon is back in the systray |
Unthemed icons should be search only one time, after the hicolor theme. We are using QIcon::themeSearchPaths() to provide the list of directories and it doesn't depend on the theme.
|
after #125 is merged this PR should be obsolete? @luis-pereira - am i right? |
|
@agaida Right. Closing it. |
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.
The hicolor theme is the ultimate resort. It should be allowed only at the
end of the fallback hierarchy. We are allowing the hicolor theme to be in
the middle of the theme hierarchy. Schematically:
X -> hicolor -> Y -> Z -> hicolor
If an icon exists in the hicolor and Y theme the hicolor one, is wrongly
used.
This commit does four things:
* Stops adding the hicolor theme to each theme as a fallback.
* Stops adding the hicolor as a parent theme, even if added by the
index.theme Inherits key. The oxygen theme does it.
* Stops return the hicolor theme in the fallbackTheme().
* Adds the hicolor theme to the end of the fallback hierarchy list.