Dockable UI by ckaiser · Pull Request #2 · dacap/aseprite

ckaiser · 2025-01-31T20:38:13Z

Here we are! First draft of the finished Dock & Dockable UI

Some things to finish:

Take care of all the TODOs.
Do more thorough testing with importing older configurations.
Improve the logic of how Dockables know where they're docked (aka make the logic).
More documentation/comments.
Art/theming/icon pass.
Testing with popular user themes.

Bonus things:

Tried to auto-hide the m_actionButton in the LayoutSelector::LayoutItem and then only show it when hovering over the item, but I could NOT get it to work reliably.
Adding the functionality to get widgets to draw themselves onto a surface that we can then draw elsewhere could be useful for one of the TODOs and also maybe other things in future.

dacap · 2025-02-08T16:07:38Z

@ckaiser I've just rebased my dock branch and cherry-picked the extra commit from dock-handles (should be equivalent to what you used as base in 466a6aa). You can try rebasing your patch to the new dock head and target this PR to the dock branch, in this way I can make comments to your patch only.

dacap · 2025-02-08T16:12:07Z

There are several direct TRACE() calls which would be better to remove them from the patch, or make a conditional TRACE (e.g. like in other files MENU_TRACE, CMD_TRACE, etc.)

ckaiser · 2025-02-08T19:45:07Z

Rebased and removed some of the superfluous TRACE(), only one that might be relevant is when the layout fails to load which I changed to warning log.

dacap

So far so good, I'm making a first set of review comments so you can make some changes, but I'll require more time (or probably merge it after these fixes and continue from there).

…te#518) Some missing features so far: 1) Restore old layout configuration (color bar split pos, timeline pos, etc.) and migrate to new Dock layout 2) Load/saving Dock layout 3) Create & customize current layoout (drag-and-drop widgets, etc.)

Temporary/created subdocks must be deleted automatically, and children that are not part of the window hierarchy must be deleted explicitly now (using some std::unique_ptrs).

Changes: * Now we use the "user data" icon as the button to expand the layouts combobox * Added a tooltip to this icon * Added buttons to configure the Timeline position in the same combobox * Fixed some bugs in Dock using space for hidden widgets

This happens only in memory at the moment (layouts are not saved in disk yet), and the customization is quite simple (only size of splitters, timeline position). But in the future we should be able to dock elements in any place.

And now we store the TiXmlElement for each Layout, instead of converting from/to text back and forth.

This patch includes: * The layout is updated immediately when docks are resized (before this the layout was like a snapshot of the configuration when the layout was created or overwritten with the "New Layout" option) * Saving the active layout used in preferences.general.workspace_layout so we can restore it after restarting Aseprite * Change "UI Layout" to "Workspace Layout" * Some strings moved to en.ini file for i18n * Fixed a crash on MainWindow::onActiveViewChange() when the application was being closed

This was a new issue with combination of 9b90159, probably we should close the popup when the window is resized (instead of onSizeHint()).

@dacap

@dacap's notes: A description of the included changes: * Improve UX auto-saving layouts when docks are modified, and new 'X' icon to delete layouts (or reset the 'Default' layout). * Remove old timeline position controls (Left/Right/Bottom buttons) from the Timeline configuration and from the layout selector * Add support to drag and drop docks to other sides with real-time feedback using a semi-transparent UILayer * Add a context menu w/right-click to dock the widget at the supported sides without drag-and-drop Some review comments in #2

dacap · 2025-04-26T00:38:05Z

Merged squashed in c6ae828 with some notes about the changes in the commit description.

@dacap

@dacap's notes: A description of the included changes: * Improve UX auto-saving layouts when docks are modified, and new 'X' icon to delete layouts (or reset the 'Default' layout). * Remove old timeline position controls (Left/Right/Bottom buttons) from the Timeline configuration and from the layout selector * Add support to drag and drop docks to other sides with real-time feedback using a semi-transparent UILayer * Add a context menu w/right-click to dock the widget at the supported sides without drag-and-drop Some review comments in #2

@dacap

@dacap's notes: A description of the included changes: * Improve UX auto-saving layouts when docks are modified, and new 'X' icon to delete layouts (or reset the 'Default' layout). * Remove old timeline position controls (Left/Right/Bottom buttons) from the Timeline configuration and from the layout selector * Add support to drag and drop docks to other sides with real-time feedback using a semi-transparent UILayer * Add a context menu w/right-click to dock the widget at the supported sides without drag-and-drop Some review comments in #2

@dacap

@dacap's notes: A description of the included changes: * Improve UX auto-saving layouts when docks are modified, and new 'X' icon to delete layouts (or reset the 'Default' layout). * Remove old timeline position controls (Left/Right/Bottom buttons) from the Timeline configuration and from the layout selector * Add support to drag and drop docks to other sides with real-time feedback using a semi-transparent UILayer * Add a context menu w/right-click to dock the widget at the supported sides without drag-and-drop Some review comments in #2

@dacap

@dacap's notes: A description of the included changes: * Improve UX auto-saving layouts when docks are modified, and new 'X' icon to delete layouts (or reset the 'Default' layout). * Remove old timeline position controls (Left/Right/Bottom buttons) from the Timeline configuration and from the layout selector * Add support to drag and drop docks to other sides with real-time feedback using a semi-transparent UILayer * Add a context menu w/right-click to dock the widget at the supported sides without drag-and-drop Some review comments in #2

dacap self-assigned this Feb 7, 2025

dacap assigned ckaiser and unassigned dacap Feb 8, 2025

ckaiser force-pushed the dock-and-roll branch from 23a7e5e to 276ae2c Compare February 8, 2025 19:43

ckaiser changed the base branch from beta to dock February 8, 2025 19:43

ckaiser removed their assignment Feb 8, 2025

dacap self-assigned this Feb 18, 2025

dacap requested changes Feb 19, 2025

View reviewed changes

dacap reviewed Feb 19, 2025

View reviewed changes

Comment thread src/app/ui/dock.cpp Outdated

dacap assigned ckaiser and unassigned dacap Feb 19, 2025

ckaiser removed their assignment Feb 28, 2025

ckaiser requested a review from dacap February 28, 2025 11:47

dacap and others added 14 commits March 31, 2025 12:18

Fix memory leaks in MainWindow

73082f9

Temporary/created subdocks must be deleted automatically, and children that are not part of the window hierarchy must be deleted explicitly now (using some std::unique_ptrs).

Use std::unique_ptr in ToolBar members

5998f89

Fix std::clamp() max bound in TipWindow::pointAt()

cf48671

Fix popups & tooltips direction when ToolBar is docked at the left side

dcc7a4e

Save/restore timeline splitter position correctly

b89ce93

Save/restore color bar splitter position correctly

00e518a

Improve the layout selector UI

d4d8f06

Changes: * Now we use the "user data" icon as the button to expand the layouts combobox * Added a tooltip to this icon * Added buttons to configure the Timeline position in the same combobox * Fixed some bugs in Dock using space for hidden widgets

Show the timeline when we set its position from the LayoutSelector

3687e26

Set the initial timeline position in the LayoutSelector correctly

ff8d4b1

Add option to save/restore user-defined layouts on memory

67ca379

This happens only in memory at the moment (layouts are not saved in disk yet), and the customization is quite simple (only size of splitters, timeline position). But in the future we should be able to dock elements in any place.

Save/Load user defined layouts in new user.aseprite-layouts file

838715f

And now we store the TiXmlElement for each Layout, instead of converting from/to text back and forth.

Include StatusBar in the set of customizable widgets in the layout

6d779f5

Add possibility to overwrite existent layouts

0276062

dacap and others added 8 commits March 31, 2025 12:18

Add View > Workspace Layout option to switch the layout w/keys

2519b41

Improve borders of context & color bars for both sides (left/right)

eb1fe96

Update saving/loading dock layouts w/tinyxml2 library

24b96c3

Fix bug where the ToolBar popup wasn't being opened

dc4050e

This was a new issue with combination of 9b90159, probably we should close the popup when the window is resized (instead of onSizeHint()).

Show handles in dockable areas to drag-and-drop them

408cc0c

Polished & finalized implementation

19a963d

Codestyle, timeline top support & mark current side in docking menu.

8e557bf

ckaiser force-pushed the dock-and-roll branch from fe97001 to 8e557bf Compare March 31, 2025 15:23

dacap force-pushed the dock branch from f3b7836 to 4159ecd Compare April 24, 2025 00:17

dacap closed this Apr 26, 2025

ckaiser deleted the dock-and-roll branch September 10, 2025 05:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dockable UI#2

Dockable UI#2
ckaiser wants to merge 22 commits into
dacap:dockfrom
ckaiser:dock-and-roll

ckaiser commented Jan 31, 2025

Uh oh!

dacap commented Feb 8, 2025

Uh oh!

dacap commented Feb 8, 2025

Uh oh!

ckaiser commented Feb 8, 2025

Uh oh!

dacap left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dacap commented Apr 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

ckaiser commented Jan 31, 2025

Uh oh!

dacap commented Feb 8, 2025

Uh oh!

dacap commented Feb 8, 2025

Uh oh!

ckaiser commented Feb 8, 2025

Uh oh!

dacap left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dacap commented Apr 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants