Add layouts + dockable UI by dacap · Pull Request #3485 · aseprite/aseprite

dacap · 2022-08-23T17:49:28Z

This is a work-in-progress. We want to add multiple ways to customize the layout/workspace #518

aseprite-bot

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 79. Check the log or trigger a new build to see more.

aseprite-bot · 2024-03-06T12:54:36Z

+{
+}
+
+bool ToggleWorkspaceLayoutCommand::onChecked(Context* ctx)


warning: parameter 'ctx' is unused [misc-unused-parameters]

Suggested change

bool ToggleWorkspaceLayoutCommand::onChecked(Context* ctx)

bool ToggleWorkspaceLayoutCommand::onChecked(Context* /*ctx*/)

aseprite-bot · 2024-03-06T12:54:37Z

+    ->isSelectorVisible();
+}
+
+void ToggleWorkspaceLayoutCommand::onExecute(Context* ctx)


warning: parameter 'ctx' is unused [misc-unused-parameters]

Suggested change

void ToggleWorkspaceLayoutCommand::onExecute(Context* ctx)

void ToggleWorkspaceLayoutCommand::onExecute(Context* /*ctx*/)

aseprite-bot · 2024-03-06T12:54:37Z


-  int selITem = m_box->position()->selectedItem();
-  switch (selITem) {
+  int selItem = option;


warning: variable 'selItem' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int selItem = option;

int const selItem = option;

aseprite-bot · 2024-03-06T12:54:37Z

+
+  InitTheme.connect(
+    [this]{
+      if (auto p = parent())


warning: 'auto p' can be declared as 'auto *p' [readability-qualified-auto]

Suggested change

if (auto p = parent())

if (auto *p = parent())

aseprite-bot · 2024-03-06T12:54:37Z

+  initTheme();
+}
+
+void Dock::resetDocks()


warning: function 'resetDocks' is within a recursive call chain [misc-no-recursion]

void Dock::resetDocks() ^

Additional context

src/app/ui/dock.cpp:108: example recursive call chain, starting from function 'resetDocks'

void Dock::resetDocks() ^

src/app/ui/dock.cpp:115: Frame #1: function 'resetDocks' calls function 'resetDocks' here:

subdock->resetDocks(); ^

src/app/ui/dock.cpp:115: ... which was the starting point of the recursive call chain; there may be other cycles

subdock->resetDocks(); ^

aseprite-bot · 2024-03-06T12:54:38Z

+  int i = side_index(side);
+  // Only EXPANSIVE sides can be user-defined (has a splitter so the
+  // user can expand or shrink it)
+  if (m_aligns[i] & EXPANSIVE)


warning: implicit conversion 'unsigned int' -> bool [readability-implicit-bool-conversion]

Suggested change

if (m_aligns[i] & EXPANSIVE)

if ((m_aligns[i] & EXPANSIVE) != 0u)

aseprite-bot · 2024-03-06T12:54:38Z

+  else
+    return gfx::Size();


warning: do not use 'else' after 'return' [readability-else-after-return]

Suggested change

else

return gfx::Size();

return gfx::Size();

aseprite-bot · 2024-03-06T12:54:39Z

+
+Dock* Dock::subdock(int side)
+{
+  int i = side_index(side);


warning: variable 'i' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int i = side_index(side);

int const i = side_index(side);

aseprite-bot · 2024-03-06T12:54:39Z

+Dock* Dock::subdock(int side)
+{
+  int i = side_index(side);
+  if (auto subdock = dynamic_cast<Dock*>(m_sides[i]))


warning: 'auto subdock' can be declared as 'auto *subdock' [readability-qualified-auto]

Suggested change

if (auto subdock = dynamic_cast<Dock*>(m_sides[i]))

if (auto *subdock = dynamic_cast<Dock*>(m_sides[i]))

aseprite-bot · 2024-03-06T12:54:39Z

+  if (auto subdock = dynamic_cast<Dock*>(m_sides[i]))
+    return subdock;
+
+  auto oldWidget = m_sides[i];


warning: 'auto oldWidget' can be declared as 'auto *oldWidget' [readability-qualified-auto]

Suggested change

auto oldWidget = m_sides[i];

auto *oldWidget = m_sides[i];

aseprite-bot

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 54. Check the log or trigger a new build to see more.

aseprite-bot · 2024-04-09T20:11:23Z

+    return subdock;
+
+  auto oldWidget = m_sides[i];
+  auto newSubdock = new Dock;


warning: 'auto newSubdock' can be declared as 'auto *newSubdock' [readability-qualified-auto]

Suggested change

auto newSubdock = new Dock;

auto *newSubdock = new Dock;

aseprite-bot · 2024-04-09T20:11:24Z

+  forEachSide(bounds,
+              [bounds](ui::Widget* widget,
+                       const gfx::Rect& widgetBounds,
+                       const gfx::Rect& separator,


warning: parameter 'separator' is unused [misc-unused-parameters]

Suggested change

const gfx::Rect& separator,

const gfx::Rect& /*separator*/,

aseprite-bot · 2024-04-09T20:11:24Z

+              [bounds](ui::Widget* widget,
+                       const gfx::Rect& widgetBounds,
+                       const gfx::Rect& separator,
+                       const int index) {


warning: parameter 'index' is unused [misc-unused-parameters]

Suggested change

const int index) {

const int /*index*/) {

aseprite-bot · 2024-04-09T20:11:24Z

+      m_capturedSide = -1;
+      forEachSide(childrenBounds(),
+                  [this, pos](ui::Widget* widget,
+                              const gfx::Rect& widgetBounds,


warning: parameter 'widgetBounds' is unused [misc-unused-parameters]

Suggested change

const gfx::Rect& widgetBounds,

const gfx::Rect& /*widgetBounds*/,

aseprite-bot · 2024-04-09T20:11:24Z

+      const gfx::Point pos = static_cast<MouseMessage*>(msg)->position();
+      ui::CursorType cursor = ui::kArrowCursor;
+      forEachSide(childrenBounds(),
+                  [pos, &cursor](ui::Widget* widget,


warning: parameter 'widget' is unused [misc-unused-parameters]

Suggested change

[pos, &cursor](ui::Widget* widget,

[pos, &cursor](ui::Widget* /*widget*/,

aseprite-bot · 2024-04-09T20:11:25Z

+      (m_aligns[i] & EXPANSIVE ? childSpacing(): 0);
+
+    const gfx::Size sz =
+      (m_aligns[i] & EXPANSIVE ? m_sizes[i]: widget->sizeHint());


warning: implicit conversion 'unsigned int' -> bool [readability-implicit-bool-conversion]

Suggested change

(m_aligns[i] & EXPANSIVE ? m_sizes[i]: widget->sizeHint());

((m_aligns[i] & EXPANSIVE) != 0u ? m_sizes[i]: widget->sizeHint());

aseprite-bot · 2024-04-09T20:11:25Z

+  int whichSideChildIsDocked(const ui::Widget* widget) const;
+  gfx::Size getUserDefinedSizeAtSide(int side) const;
+
+  obs::signal<void()> Resize;


warning: member variable 'Resize' has public visibility [misc-non-private-member-variables-in-classes]

obs::signal<void()> Resize; ^

aseprite-bot · 2024-04-09T20:11:25Z

+  gfx::Size getUserDefinedSizeAtSide(int side) const;
+
+  obs::signal<void()> Resize;
+  obs::signal<void()> UserResizedDock;


warning: member variable 'UserResizedDock' has public visibility [misc-non-private-member-variables-in-classes]

obs::signal<void()> UserResizedDock; ^

aseprite-bot · 2024-04-09T20:11:25Z

+  void onUserResizedDock();
+
+private:
+  void setSide(const int i, ui::Widget* newWidget);


warning: parameter 'i' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

void setSide(const int i, ui::Widget* newWidget);

void setSide(int i, ui::Widget* newWidget);

aseprite-bot · 2024-04-09T20:11:25Z

+
+private:
+  void setSide(const int i, ui::Widget* newWidget);
+  int calcAlign(const int i);


warning: parameter 'i' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]

Suggested change

int calcAlign(const int i);

int calcAlign(int i);

aseprite-bot

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 26. Check the log or trigger a new build to see more.

aseprite-bot · 2024-04-23T19:16:40Z

+                                      const int index)> f);
+
+  bool hasVisibleSide(const int i) const {
+    return (m_sides[i] && m_sides[i]->isVisible());


warning: implicit conversion 'value_type' (aka 'ui::Widget *') -> bool [readability-implicit-bool-conversion]

Suggested change

return (m_sides[i] && m_sides[i]->isVisible());

return ((m_sides[i] != nullptr) && m_sides[i]->isVisible());

aseprite-bot · 2024-04-23T19:16:40Z

+  }
+}
+
+static void load_dock_layout(const XMLElement* elem, Dock* dock)


warning: function 'load_dock_layout' is within a recursive call chain [misc-no-recursion]

static void load_dock_layout(const XMLElement* elem, Dock* dock) ^

Additional context

src/app/ui/layout.cpp:71: example recursive call chain, starting from function 'load_dock_layout'

static void load_dock_layout(const XMLElement* elem, Dock* dock) ^

src/app/ui/layout.cpp:111: Frame #1: function 'load_dock_layout' calls function 'load_dock_layout' here:

load_dock_layout(childElem, subdock); ^

src/app/ui/layout.cpp:111: ... which was the starting point of the recursive call chain; there may be other cycles

load_dock_layout(childElem, subdock); ^

aseprite-bot · 2024-04-23T19:16:40Z

+  Dock* subdock = nullptr;
+
+  int side = ui::CENTER;
+  if (auto sideStr = elem->Attribute("side")) {


warning: 'auto sideStr' can be declared as 'const auto *sideStr' [readability-qualified-auto]

Suggested change

if (auto sideStr = elem->Attribute("side")) {

if (const auto *sideStr = elem->Attribute("side")) {

aseprite-bot · 2024-04-23T19:16:40Z

+  else if (elemName == "dock") { subdock = dock->subdock(side); }
+
+  if (subdock) {
+    auto childElem = elem->FirstChildElement();


warning: 'auto childElem' can be declared as 'const auto *childElem' [readability-qualified-auto]

Suggested change

auto childElem = elem->FirstChildElement();

const auto *childElem = elem->FirstChildElement();

aseprite-bot · 2024-04-23T19:16:40Z

+LayoutPtr Layout::MakeFromXmlElement(const XMLElement* layoutElem)
+{
+  auto layout = std::make_shared<Layout>();
+  if (auto name = layoutElem->Attribute("name")) {


warning: 'auto name' can be declared as 'const auto *name' [readability-qualified-auto]

Suggested change

if (auto name = layoutElem->Attribute("name")) {

if (const auto *name = layoutElem->Attribute("name")) {

aseprite-bot · 2024-04-23T19:16:42Z

+  m_customizableDockPlaceholder = std::make_unique<Widget>();
+  m_customizableDockPlaceholder->addChild(m_customizableDock);
+  m_customizableDockPlaceholder->InitTheme.connect([this]{
+    auto theme = static_cast<skin::SkinTheme*>(this->theme());


warning: 'auto theme' can be declared as 'auto *theme' [readability-qualified-auto]

Suggested change

auto theme = static_cast<skin::SkinTheme*>(this->theme());

auto *theme = static_cast<skin::SkinTheme*>(this->theme());

aseprite-bot · 2024-04-23T19:16:42Z

-        align = HORIZONTAL;
-        invertWidgets = true;
+        side = ui::LEFT;
+        w = (workspaceBounds.w * (1.0-timelineSplitterPos)) / guiscale();


warning: narrowing conversion from 'double' to 'int' [bugprone-narrowing-conversions]

w = (workspaceBounds.w * (1.0-timelineSplitterPos)) / guiscale(); ^

aseprite-bot · 2024-04-23T19:16:42Z

      case gen::TimelinePosition::RIGHT:
-        align = HORIZONTAL;
+        side = ui::RIGHT;
+        w = (workspaceBounds.w * (1.0-timelineSplitterPos)) / guiscale();


warning: narrowing conversion from 'double' to 'int' [bugprone-narrowing-conversions]

w = (workspaceBounds.w * (1.0-timelineSplitterPos)) / guiscale(); ^

aseprite-bot · 2024-04-23T19:16:42Z

        break;
      case gen::TimelinePosition::BOTTOM:
+        side = ui::BOTTOM;
+        h = (workspaceBounds.h * (1.0-timelineSplitterPos)) / guiscale();


warning: narrowing conversion from 'double' to 'int' [bugprone-narrowing-conversions]

h = (workspaceBounds.h * (1.0-timelineSplitterPos)) / guiscale(); ^

aseprite-bot · 2024-04-23T19:16:42Z

  Rect rc = getToolGroupBounds(group_index);
-  int w = 0;
-
+  int w = borderWidth;


warning: variable 'w' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int w = borderWidth;

int const w = borderWidth;

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-08-12T20:31:05Z

-  Point arrow = (tool ? getToolPositionInGroup(group_index, tool): Point(0, 0));
-  if (tool && m_popupWindow && m_popupWindow->isVisible())
-    toolrc.x += arrow.x - m_popupWindow->bounds().w;
+  Point arrow = (tool ? getToolPositionInGroup(tool): Point(0, 0));


warning: variable 'arrow' of type 'Point' (aka 'PointT') can be declared 'const' [misc-const-correctness]

Suggested change

Point arrow = (tool ? getToolPositionInGroup(tool): Point(0, 0));

Point const arrow = (tool ? getToolPositionInGroup(tool): Point(0, 0));

aseprite-bot

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 83. Check the log or trigger a new build to see more.

aseprite-bot · 2024-12-17T14:21:07Z

+{
+}
+
+bool ToggleWorkspaceLayoutCommand::onChecked(Context* ctx)


warning: parameter 'ctx' is unused [misc-unused-parameters]

Suggested change

bool ToggleWorkspaceLayoutCommand::onChecked(Context* ctx)

bool ToggleWorkspaceLayoutCommand::onChecked(Context* /*ctx*/)

aseprite-bot · 2024-12-17T14:21:07Z

+  return App::instance()->mainWindow()->layoutSelector()->isSelectorVisible();
+}
+
+void ToggleWorkspaceLayoutCommand::onExecute(Context* ctx)


warning: parameter 'ctx' is unused [misc-unused-parameters]

Suggested change

void ToggleWorkspaceLayoutCommand::onExecute(Context* ctx)

void ToggleWorkspaceLayoutCommand::onExecute(Context* /*ctx*/)

aseprite-bot · 2024-12-17T14:21:08Z


-  int selITem = m_box->position()->selectedItem();
-  switch (selITem) {
+  int selItem = option;


warning: variable 'selItem' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int selItem = option;

int const selItem = option;

aseprite-bot · 2024-12-17T14:21:08Z

-  int selITem = m_box->position()->selectedItem();
-  switch (selITem) {
+  int selItem = option;
+  switch (selItem) {


warning: switching on non-enum value without default case may not cover all cases [bugprone-switch-missing-default-case]

switch (selItem) { ^

aseprite-bot · 2024-12-17T14:21:09Z

+
+namespace {
+
+enum { kTopIndex, kBottomIndex, kLeftIndex, kRightIndex, kCenterIndex };


warning: enum '(unnamed enum at /github/workspace/src/app/ui/dock.cpp:31:1)' uses a larger base type ('unsigned int', size: 4 bytes) than necessary for its value set, consider using 'std::uint8_t' (1 byte) as the base type to reduce its size [performance-enum-size]

enum { kTopIndex, kBottomIndex, kLeftIndex, kRightIndex, kCenterIndex }; ^

aseprite-bot · 2024-12-17T14:21:10Z

+  }
+}
+
+void Dock::undock(Widget* widget)


warning: function 'undock' is within a recursive call chain [misc-no-recursion]

void Dock::undock(Widget* widget) ^

Additional context

src/app/ui/dock.cpp:183: example recursive call chain, starting from function 'undock'

void Dock::undock(Widget* widget) ^

src/app/ui/dock.cpp:200: Frame #1: function 'undock' calls function 'undock' here:

undock(parentDock); ^

src/app/ui/dock.cpp:200: ... which was the starting point of the recursive call chain; there may be other cycles

undock(parentDock); ^

aseprite-bot · 2024-12-17T14:21:10Z

+  if (!parent)
+    return; // Already undocked
+
+  if (auto parentDock = dynamic_cast<Dock*>(parent)) {


warning: 'auto parentDock' can be declared as 'auto *parentDock' [readability-qualified-auto]

Suggested change

if (auto parentDock = dynamic_cast<Dock*>(parent)) {

if (auto *parentDock = dynamic_cast<Dock*>(parent)) {

aseprite-bot · 2024-12-17T14:21:11Z

+      undock(parentDock);
+    }
+  }
+  else if (auto parentTabs = dynamic_cast<DockTabs*>(parent)) {


warning: 'auto parentTabs' can be declared as 'auto *parentTabs' [readability-qualified-auto]

Suggested change

else if (auto parentTabs = dynamic_cast<DockTabs*>(parent)) {

else if (auto *parentTabs = dynamic_cast<DockTabs*>(parent)) {

aseprite-bot · 2024-12-17T14:21:11Z

+
+gfx::Size Dock::getUserDefinedSizeAtSide(int side) const
+{
+  int i = side_index(side);


warning: variable 'i' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int i = side_index(side);

int const i = side_index(side);

aseprite-bot · 2024-12-17T14:21:11Z

+  int i = side_index(side);
+  // Only EXPANSIVE sides can be user-defined (has a splitter so the
+  // user can expand or shrink it)
+  if (m_aligns[i] & EXPANSIVE)


warning: implicit conversion 'unsigned int' -> 'bool' [readability-implicit-bool-conversion]

Suggested change

if (m_aligns[i] & EXPANSIVE)

if ((m_aligns[i] & EXPANSIVE) != 0u)

aseprite-bot

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 77. Check the log or trigger a new build to see more.

aseprite-bot · 2025-02-08T15:53:14Z

+  initTheme();
+}
+
+void Dock::setCustomizing(bool enable, bool doLayout)


warning: function 'setCustomizing' is within a recursive call chain [misc-no-recursion]

void Dock::setCustomizing(bool enable, bool doLayout) ^

Additional context

src/app/ui/dock.cpp:101: example recursive call chain, starting from function 'setCustomizing'

void Dock::setCustomizing(bool enable, bool doLayout) ^

src/app/ui/dock.cpp:110: Frame #1: function 'setCustomizing' calls function 'setCustomizing' here:

subdock->setCustomizing(enable, false); ^

src/app/ui/dock.cpp:110: ... which was the starting point of the recursive call chain; there may be other cycles

subdock->setCustomizing(enable, false); ^

aseprite-bot · 2025-02-08T15:53:14Z

+  m_customizing = enable;
+
+  for (int i = 0; i < kSides; ++i) {
+    auto child = m_sides[i];


warning: 'auto child' can be declared as 'auto *child' [readability-qualified-auto]

Suggested change

auto child = m_sides[i];

auto *child = m_sides[i];

aseprite-bot · 2025-02-08T15:53:15Z

+    auto child = m_sides[i];
+    if (!child)
+      continue;
+    else if (auto subdock = dynamic_cast<Dock*>(child))


warning: 'auto subdock' can be declared as 'auto *subdock' [readability-qualified-auto]

else if (auto subdock = dynamic_cast<Dock*>(child)) ^

this fix will not be applied because it overlaps with another fix

aseprite-bot · 2025-02-08T15:53:15Z

+    if (!child)
+      continue;
+    else if (auto subdock = dynamic_cast<Dock*>(child))
+      subdock->setCustomizing(enable, false);


warning: do not use 'else' after 'continue' [readability-else-after-return]

Suggested change

subdock->setCustomizing(enable, false);

if (auto subdock = dynamic_cast<Dock*>(child))

subdock->setCustomizing(enable, false);

aseprite-bot · 2025-02-08T15:53:15Z

+    layout();
+}
+
+void Dock::resetDocks()


warning: function 'resetDocks' is within a recursive call chain [misc-no-recursion]

void Dock::resetDocks() ^

Additional context

src/app/ui/dock.cpp:117: example recursive call chain, starting from function 'resetDocks'

void Dock::resetDocks() ^

src/app/ui/dock.cpp:124: Frame #1: function 'resetDocks' calls function 'resetDocks' here:

subdock->resetDocks(); ^

src/app/ui/dock.cpp:124: ... which was the starting point of the recursive call chain; there may be other cycles

subdock->resetDocks(); ^

aseprite-bot · 2025-02-08T15:53:16Z

+                  auto rc = widgetBounds;
+                  auto th = textHeight();
+                  if (isCustomizing()) {
+                    auto theme = SkinTheme::get(this);


warning: 'auto theme' can be declared as 'auto *theme' [readability-qualified-auto]

Suggested change

auto theme = SkinTheme::get(this);

auto *theme = SkinTheme::get(this);

aseprite-bot · 2025-02-08T15:53:16Z

+                    auto theme = SkinTheme::get(this);
+                    auto color = theme->colors.workspaceText();
+                    int handleSide = 0;
+                    if (auto dockable = dynamic_cast<Dockable*>(widget))


warning: 'auto dockable' can be declared as 'auto *dockable' [readability-qualified-auto]

Suggested change

if (auto dockable = dynamic_cast<Dockable*>(widget))

if (auto *dockable = dynamic_cast<Dockable*>(widget))

aseprite-bot · 2025-02-08T15:53:17Z

+                    int handleSide = 0;
+                    if (auto dockable = dynamic_cast<Dockable*>(widget))
+                      handleSide = dockable->dockHandleSide();
+                    switch (handleSide) {


warning: switching on non-enum value without default case may not cover all cases [bugprone-switch-missing-default-case]

switch (handleSide) { ^

aseprite-bot · 2025-02-08T15:53:17Z

+          const gfx::Point pos = static_cast<MouseMessage*>(msg)->position();
+          gfx::Size& sz = m_sizes[m_hit.sideIndex];
+
+          switch (m_hit.sideIndex) {


warning: switching on non-enum value without default case may not cover all cases [bugprone-switch-missing-default-case]

switch (m_hit.sideIndex) { ^

aseprite-bot · 2025-02-08T15:53:17Z

+        m_hit = calcHit(pos);
+
+      if (m_hit.sideIndex >= 0) {
+        switch (m_hit.sideIndex) {


warning: switching on non-enum value without default case may not cover all cases [bugprone-switch-missing-default-case]

switch (m_hit.sideIndex) { ^

dacap · 2025-05-08T02:43:51Z

The initial iteration of this feature is quite ready to be tested. Still some minor things to be fixed (and a lot of room of improvement to dock widgets in other parts, and sub-divide widgets like the ColorBar), but it's a good start for a first iteration.

ckaiser

Gave it a test and found an issue, when modifying the default theme, closing the app and re-opening it again, the modifications aren't applied, only when I open the dropdown and re-select "Default*" do my layout changes show up. The rest is looking good!

Had some minor string stuff in the comments and usability thoughts:

New icon looks good! I'm wondering if it should have some kind of toggle state beyond just the dropdown appearing?

Another thing that I was thinking about was if it'd be wise to automatically hide the dropdown & docking handles, because I can definitely see a user clicking on it and then just leaving it on for the rest of the session. It's not a big deal since it doesn't persist, but yeah maybe opening/closing a file, losing focus or switching tabs could hide it?

ckaiser · 2025-05-08T08:03:54Z

+modified = {} (Modified)
+deleting_layout = Deleting Layout
+deleting_layout_confirmation = Are you sure you want to delete the layout '{}'?
+restoring_layout = "Restoring Layout"


Suggested change

restoring_layout = "Restoring Layout"

restoring_layout = Restoring Layout

ckaiser · 2025-05-08T08:04:11Z

+deleting_layout = Deleting Layout
+deleting_layout_confirmation = Are you sure you want to delete the layout '{}'?
+restoring_layout = "Restoring Layout"
+restoring_layout_confirmation = Are you sure you want to restore the {} layout?"


Suggested change

restoring_layout_confirmation = Are you sure you want to restore the {} layout?"

restoring_layout_confirmation = Are you sure you want to restore the '{}' layout?

ckaiser · 2025-05-08T08:06:20Z

+  <vbox>
+    <grid columns="2">
+      <label text="@.base" />
+      <combobox id="base" expansive="true">


I feel like this dialogue should probably have some kind of explainer/help text either in a tooltip or in a help button or something, just to make sure the concept of a "base" layout is understood since it's a pretty programmer-y thing.

I'm not sure if the "base" field is even necessary. From the user point of view, creating a new layout will be based on the "actual look" of the UI (the actual layout). Not sure what effect has the "base" layout to the new user layout. Could we just remove this field?

Yeah now that I think about it, it's a relic from when you had to make a new layout to modify the default ones - better off without it, simpler.

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

This improves the look of the flag as another icon above the tabs bottom and at the right of the layout selector icon.

* Better support to load legacy timeline information: we have to estimate workspace bounds) * Auto-save layouts after resizing a splitter/dock * Fix resetting expansive widgets inside docks after switching tabs * Load mirrored layout correctly if it was the last selected layout

With this patch we've also simplified some hacks handling the populateComboBox() call, deferring the deletion of widgets/items when we are inside an event generated by those items.

From aseprite#3485 (review)

Without this, the combobox is still visible and clicking the button again will crash the program.

We're going to keep this section for a couple of versions as old users get used to the new Workspace Layout customization. The "Position" section will contain the layout icon so we can switch the Workspace Layout combobox from there too,

dacap · 2025-08-04T22:43:47Z

I've just updated beta branch and rebased dock to continue working on this.

dacap mentioned this pull request Aug 23, 2022

Add layouts + dockable UI #3474

Closed

dacap linked an issue Aug 23, 2022 that may be closed by this pull request

Make all elements on screen dockable/movable/resizable #518

Closed

5 tasks

dacap changed the title ~~Dock~~ Add layouts + dockable UI Aug 23, 2022

dacap self-assigned this Sep 19, 2022

dacap force-pushed the dock branch from 1d7db60 to d0a7a00 Compare November 9, 2022 12:36

dacap mentioned this pull request May 8, 2023

Detachable and movable UI objects, please? #3845

Closed

dacap force-pushed the dock branch from d0a7a00 to abdae1b Compare September 20, 2023 16:01

dacap force-pushed the dock branch 2 times, most recently from 0b3acea to b595aae Compare January 11, 2024 19:59

dacap force-pushed the dock branch from b595aae to 10eee9a Compare March 6, 2024 12:49

aseprite-bot reviewed Mar 6, 2024

View reviewed changes

dacap force-pushed the dock branch from 10eee9a to fc64813 Compare April 9, 2024 20:05

aseprite-bot reviewed Apr 9, 2024

View reviewed changes

dacap force-pushed the dock branch from fc64813 to 2cf0396 Compare April 23, 2024 19:07

aseprite-bot reviewed Apr 23, 2024

View reviewed changes

dacap force-pushed the dock branch from 2cf0396 to a2136c5 Compare August 12, 2024 20:25

aseprite-bot reviewed Aug 12, 2024

View reviewed changes

dacap force-pushed the dock branch from a2136c5 to f5b8c34 Compare August 13, 2024 17:16

dacap force-pushed the dock branch from f5b8c34 to 1f340d2 Compare December 17, 2024 14:14

aseprite-bot reviewed Dec 17, 2024

View reviewed changes

dacap mentioned this pull request Dec 19, 2024

question: customizable layout #4891

Closed

dacap force-pushed the dock branch from 1f340d2 to f3b7836 Compare February 8, 2025 15:48

aseprite-bot reviewed Feb 8, 2025

View reviewed changes

dacap mentioned this pull request Apr 22, 2025

Duplicate Timeline Position Option in Preferences #1485

Open

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

dacap force-pushed the dock branch 2 times, most recently from 55590bd to ec60773 Compare May 7, 2025 20:04

dacap marked this pull request as ready for review May 8, 2025 02:38

ckaiser reviewed May 8, 2025

View reviewed changes

dacap and others added 20 commits August 4, 2025 19:41

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

eecc141

Update saving/loading dock layouts w/tinyxml2 library

37d2be7

Fix bug where the ToolBar popup wasn't being opened

c8e9b33

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

f556052

Remove unused member variable from ui::Dock

7eb2df6

Improve layout selector widget location when menu bar is visible/hidden

e0226d9

[theme] New layout selector icon + bg color fixes

d6c5ac6

Change notification flag location inside the layout selector widget

b08662e

This improves the look of the flag as another icon above the tabs bottom and at the right of the layout selector icon.

Minor changes (format, remove unused/unnecessary vars/keywords)

778e62a

Move LayoutSelector::setActiveLayoutId() impl to .cpp file

86c7fae

Fix switch/break style

aa66d26

Fix crashes resetting the default layout + remove some hacks

c8ae101

With this patch we've also simplified some hacks handling the populateComboBox() call, deferring the deletion of widgets/items when we are inside an event generated by those items.

Fix some strings

34aae80

From aseprite#3485 (review)

Fix loading modified default layouts at the very beginning

2404660

Remove base field from "New Layout" dialog

a1fb751

Close layout combobox after clicking the reset/delete layout button

60112cd

Without this, the combobox is still visible and clicking the button again will crash the program.

dacap force-pushed the dock branch from 3347395 to 5e12a5d Compare August 4, 2025 22:42

dacap added this to Aseprite v1.3 Aug 4, 2025

dacap moved this to Todo in Aseprite v1.3 Aug 4, 2025

dacap merged commit 7434db6 into aseprite:beta Aug 5, 2025
12 checks passed

github-project-automation Bot moved this from Todo to Done in Aseprite v1.3 Aug 5, 2025

github-project-automation Bot moved this to Done in Improve UI for Stylus/Tablets Aug 5, 2025

dacap deleted the dock branch August 5, 2025 19:31

dacap self-assigned this Aug 6, 2025

CrashTestJava mentioned this pull request Oct 2, 2025

Document dockable/movable/resizeable screen elements when 1.3.16 releases aseprite/docs#56

Closed

	bool ToggleWorkspaceLayoutCommand::onChecked(Context* ctx)
	bool ToggleWorkspaceLayoutCommand::onChecked(Context* /ctx/)

	void ToggleWorkspaceLayoutCommand::onExecute(Context* ctx)
	void ToggleWorkspaceLayoutCommand::onExecute(Context* /ctx/)

	if (m_aligns[i] & EXPANSIVE)
	if ((m_aligns[i] & EXPANSIVE) != 0u)

	if (auto subdock = dynamic_cast<Dock*>(m_sides[i]))
	if (auto subdock = dynamic_cast<Dock>(m_sides[i]))

	const gfx::Rect& widgetBounds,
	const gfx::Rect& /widgetBounds/,

	[pos, &cursor](ui::Widget* widget,
	[pos, &cursor](ui::Widget* /widget/,

	(m_aligns[i] & EXPANSIVE ? m_sizes[i]: widget->sizeHint());
	((m_aligns[i] & EXPANSIVE) != 0u ? m_sizes[i]: widget->sizeHint());

	void setSide(const int i, ui::Widget* newWidget);
	void setSide(int i, ui::Widget* newWidget);

	return (m_sides[i] && m_sides[i]->isVisible());
	return ((m_sides[i] != nullptr) && m_sides[i]->isVisible());

	if (auto sideStr = elem->Attribute("side")) {
	if (const auto *sideStr = elem->Attribute("side")) {

	auto childElem = elem->FirstChildElement();
	const auto *childElem = elem->FirstChildElement();

	if (auto name = layoutElem->Attribute("name")) {
	if (const auto *name = layoutElem->Attribute("name")) {

	auto theme = static_cast<skin::SkinTheme*>(this->theme());
	auto theme = static_cast<skin::SkinTheme>(this->theme());

	Point arrow = (tool ? getToolPositionInGroup(tool): Point(0, 0));
	Point const arrow = (tool ? getToolPositionInGroup(tool): Point(0, 0));


		namespace {

		enum { kTopIndex, kBottomIndex, kLeftIndex, kRightIndex, kCenterIndex };

	if (auto parentDock = dynamic_cast<Dock*>(parent)) {
	if (auto parentDock = dynamic_cast<Dock>(parent)) {

	else if (auto parentTabs = dynamic_cast<DockTabs*>(parent)) {
	else if (auto parentTabs = dynamic_cast<DockTabs>(parent)) {

	subdock->setCustomizing(enable, false);
	if (auto subdock = dynamic_cast<Dock*>(child))
	subdock->setCustomizing(enable, false);

	auto theme = SkinTheme::get(this);
	auto *theme = SkinTheme::get(this);

	if (auto dockable = dynamic_cast<Dockable*>(widget))
	if (auto dockable = dynamic_cast<Dockable>(widget))

Uh oh!

Uh oh!

Conversation

dacap commented Aug 23, 2022

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aseprite-bot left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aseprite-bot left a comment

	restoring_layout = "Restoring Layout"
	restoring_layout = Restoring Layout

	restoring_layout_confirmation = Are you sure you want to restore the {} layout?"
	restoring_layout_confirmation = Are you sure you want to restore the '{}' layout?