Fix missing dominant color #2045
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
Some icons are not `Gio.ThemedIcon`, but ` Gio.LoadableIcon`, so we can get their pixel buffer from memory. Updated with `const` and list unpacking as used elsewhere in the file.
If the dominant color is missing (icon cannot be loaded), then a sensible fallback is used so that a running dot is still displayed.
Replaced `lookup_icon` with `choose_icon`, since it keeps looking in the current theme for a themed icon using all of its available names instead of only one. While `Gio.ThemedIcon` offers a `iconTexture.load_icon()`, it only looks for the first name available and fails otherwise. Also, `iconInfo` has been renamed to `iconBuffer` since `Gio.LoadableIcon` returns a stream/buffer (or should outright fail, which I could not observe yet). Could not find an example of app that uses a `Gio.EmblemedIcon` or any other implementation (i.e.: lacking `iconTexture.load`) that would justify another branching.
|
Looks good, thanks a lot! |
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.
This is the same attempt to fix #1493, in which we separate
Gio.ThemedIconfromGio.LoadableIconbut now with theconstkeyword and using list unpacking, as is done in similar pieces around the file.I apologise for closing the previous merge request, GitHub asked to remove my previous commit when I clicked to sync my branch.
I read the documentation on how to cache and async it, but I couldn't make sense of the documentation, sorry.
When
iconTextureis aGio.ThemedIcon, it seems we can use choose_icon or lookup_icon, and the former is better suited as it's able to check for all possible names (which is useful as Papirus theme doesn't use the first name available fordrive-harddisk).There's also a fourth case that I have trouble replicating, in which the icon is an emblem (I don't know the icon type), such as when an external HD is mounted. This doesn't apply to other emblem-like icons, such as mounted network devices and the trash can. This emblem raises aiconTexture.load is not a functionerror.