Skip to content

chore: simplify icon theme path fallback path - #8718

Merged
nbolton merged 1 commit into
masterfrom
simplifyIconThemeSetting
Jun 26, 2025
Merged

chore: simplify icon theme path fallback path#8718
nbolton merged 1 commit into
masterfrom
simplifyIconThemeSetting

Conversation

@sithlord48

@sithlord48 sithlord48 commented Jun 24, 2025

Copy link
Copy Markdown
Member

Simplify how we resolve the fallback search paths.

  1. We do not need to to search any themes child dirs. StyleUtil::checkSubDir is not needed and has been removed
  2. Set our fallback search to always include the icon theme path :icons/deskflow-light or :/icons/deskflow-dark StyleUtil::SetFallbackThemePath has been removed and just is set in deskflow-gui.cpp
  3. Remove the Theme settings in MainWindow and do it deskflow-gui

@sithlord48
sithlord48 force-pushed the simplifyIconThemeSetting branch 3 times, most recently from 06c4efa to 4c0dfeb Compare June 24, 2025 19:22
@sithlord48
sithlord48 requested a review from nbolton June 25, 2025 11:49
@nbolton

nbolton commented Jun 25, 2025

Copy link
Copy Markdown
Member

On master, some buttons are broken in light mode on GNOME:
image

  • Fingerprint in bottom left and next to 'Configure server'
  • Restart button icon

Looks like not introduced by your PR and it slipped through at some point.

p.s. Damn you for making me use light mode :p (my eyes, my eyes...)

nbolton
nbolton previously approved these changes Jun 25, 2025
@nbolton
nbolton force-pushed the simplifyIconThemeSetting branch from 4c0dfeb to 4ea14c8 Compare June 25, 2025 15:03
@nbolton
nbolton enabled auto-merge (rebase) June 25, 2025 15:03
…re sub dirs but we should only need the theme root

refactor: set the Icon theme in deskflow-gui insetead of MainWindow
@sithlord48

Copy link
Copy Markdown
Member Author

@nbolton updated i think its got confused by both icons being there.

@sithlord48
sithlord48 requested a review from nbolton June 25, 2025 15:41

@nbolton nbolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks the same, but like I said, I think it's a separate issue/PR as the problem exists in master (edit: i.e. this PR doesn't make the problem worse, so it's good to land)

Raised:

image

image

@nbolton
nbolton merged commit cf9e2ec into master Jun 26, 2025
@nbolton
nbolton deleted the simplifyIconThemeSetting branch June 26, 2025 08:50
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.

2 participants