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

Icon refactoring4 #1339

Merged
merged 3 commits into from
Dec 21, 2023
Merged

Icon refactoring4 #1339

merged 3 commits into from
Dec 21, 2023

Conversation

johanmalm
Copy link
Collaborator

  • Remove builtin bitmap fallbacks for _hover icons
  • For _hover buttons with an xbm/svg/png, just copy the non-hover variant and add an overlay
  • Simplify button_xbm_load() by moving some of the fallback logic to theme.c

Some themes don't have hover variants for button pixmaps.
It looks better visually to use the non-hover variants as fallbacks
rather than the built-in 6x6 pixmaps.
@johanmalm
Copy link
Collaborator Author

Ready for review. I think this should be enough button hacking for 0.7.0

@johanmalm johanmalm mentioned this pull request Dec 18, 2023
8 tasks
src/theme.c Outdated Show resolved Hide resolved
src/theme.c Outdated Show resolved Hide resolved
src/theme.c Outdated Show resolved Hide resolved
src/theme.c Outdated Show resolved Hide resolved
src/theme.c Outdated Show resolved Hide resolved
@johanmalm
Copy link
Collaborator Author

All review comments have been addressed.
Need to do an interactive-rebase before final merge.

@johanmalm
Copy link
Collaborator Author

Couldn't contain myself... have done the fixup onto the middle commit.
Ready to go from my perspective.

src/theme.c Outdated Show resolved Hide resolved
Consolatis and others added 2 commits December 20, 2023 18:32
...by copying the non-hover variant and adding a transparent overlay.

Co-authored-by: @johanmalm
...and simplify button_xbm_load() by splitting it into one function that
loads an xbm file and another that creates an icon from a builtin
bitmap.
@Consolatis Consolatis merged commit b7ee8b1 into labwc:master Dec 21, 2023
5 checks passed
@Consolatis
Copy link
Member

:)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants