Repository navigation
darkroom: don't restore focus onto a collapsed module - #22695
Merged
Merged
Conversation
masterpiga
added
bugfix
Member
Or in |
masterpiga
force-pushed
the
focus-border
branch
from
October 19, 2026 10:57
b3ac891 to
7623114
Compare
masterpiga
changed the title
Collaborator
Author
|
Thanks, PTAL.
Updated PR description accordingly. |
Collapsing a module drops its focus, but enter() restored the last active module's focus regardless of its expanded state. Leaving the darkroom with that module collapsed and coming back gave a focused, collapsed module. enter() now focuses it only if it was left expanded, as the image change path already does. Note that a module can still be focused and expanded in at least three ways (maybe more): - Ctrl+click on the on/off button of a collapsed module - The module's "focus" shortcut calls `_request_module_focus_callback`, which focuses without expanding - Widgets in the QAP So, "collapsed and focused" is a state that can happen in the darkroom. Therefore, this change also includes a CSS fix to ensure that collapsed and focused modules get their highlighted border, if the "focused module border" option is set. themes: show the focused border also if a module is not expanded
masterpiga
force-pushed
the
focus-border
branch
from
October 19, 2026 11:00
7623114 to
71911ca
Compare
This file contains hidden or 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
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.
Summary
A follow up to #22675.
Collapsing a module drops its focus, but enter() restored the last active module's focus regardless of its expanded state. Leaving the darkroom with that module collapsed and coming back gave a focused, collapsed module.
enter()now focuses it only if it was left expanded, as the image change path already does.Note that a module can still be focused and expanded in at least three ways (maybe more):
_request_module_focus_callback, which focuses without expandingSo, "collapsed and focused" is a state that can happen in the darkroom.
Therefore, this change also includes a CSS fix to ensure that collapsed and focused modules get their highlighted border, if the "focused module border" option is set:
Checklist
git rebase --exec 'cmake --build buildmaster to check this.src/tests/integration/where the pixelpipe is touched, ordarktable-clias a headless smoke test._(), new preferences are registered indata/darktableconfig.xml.in.RELEASE_NOTES.mdentry was added (only needed if fixing an issue in a release). Do not reference GitHub issues.AI assistance
Co-authored with Claude.