-
Notifications
You must be signed in to change notification settings - Fork 33
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
xdgiconloader: Puts the hicolor at the end of the theme hierarchy #125
Conversation
GTM |
a3bc6fe
to
d6518c0
Compare
@agaida It goes like this: To be able to compare the performance of #116 I "ported" it to master (a simple rebase produces merge conflicts). I already measured the performance. Will post it ASAP. |
@luis-pereira any news? |
@agaida It's ready. |
cool, thanks |
@luis-pereira - would you be so kind and rebase? |
d6518c0
to
f3da6d5
Compare
@agaida Rebased. |
@luis-pereira sometimes i hate git - could you rebase another time? |
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.
@agaida git has no fault. The code changed in a way that can't be automatically rebased. @palinek @tsujan To allow the hicolor theme only at the end of the search hierarchy I move code from |
You're right.... it is used wrongly there. ... and all the copy-paste snippets |
@luis-pereira - i know :P |
Search for unthemed icons only after the themed ones 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. Puts pixmaps at the end of the search hierarchy Their place is after the hicolor theme. And they should be searched one time only, after the hicolor theme. Makes the pixmap fallback available to all operating systems. Remove the followColorScheme stuff from unthemed/pixamp search.
f3da6d5
to
e4ac128
Compare
Looks great, compile, work as expected - GTM |
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.