User data with multiple lines of text (new TextEdit widget) (#3130, #3131, #4743, #4968) by dacap · Pull Request #5455 · aseprite/aseprite

dacap · 2025-10-06T14:57:32Z

This PR is a squashed and rebased version of #4968 to continue working in the multiple lines text editor.

aseprite-bot · 2025-10-06T14:57:46Z

Hi there!

One or more of the commit messages in this PR do not match our code submission policy, please check the lint_commits CI job for more details on which commits were flagged and why.
Please do not close this PR and open another, instead modify your commit message(s) with git commit --amend and force push those changes to update this PR.

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-06T15:02:05Z

+    // Check the line width and if we're more than halfway past the line, we can set the caret to
+    // the full line.
+    caret.setPos(
+      (offsetPosition.x > m_lines[caret.line()].width / 2) ? m_lines[caret.line()].glyphCount : 0);


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

(offsetPosition.x > m_lines[caret.line()].width / 2) ? m_lines[caret.line()].glyphCount : 0); ^

aseprite-bot · 2025-10-06T15:02:05Z

+      }
+
+      for (int i = 0; i < run.glyphCount; ++i) {
+        gfx::RectF glyphBounds = run.getGlyphBounds(i).offset(gfx::PointF(0, lineStartY));


warning: variable 'glyphBounds' of type 'gfx::RectF' (aka 'RectT') can be declared 'const' [misc-const-correctness]

Suggested change

gfx::RectF glyphBounds = run.getGlyphBounds(i).offset(gfx::PointF(0, lineStartY));

gfx::RectF const glyphBounds = run.getGlyphBounds(i).offset(gfx::PointF(0, lineStartY));

aseprite-bot · 2025-10-06T15:02:06Z

+  s_timer->start();
+}
+
+void TextEdit::stopTimer()


warning: method 'stopTimer' can be made static [readability-convert-member-functions-to-static]

src/ui/textedit.h:160:

- void stopTimer(); + static void stopTimer();

aseprite-bot · 2025-10-06T15:02:06Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:899: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:906: Frame #1: function 'leftWord' calls function 'left' here:

if (!left()) ^

src/ui/textedit.cpp:882: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-06T15:02:06Z

+  return true;
+}
+
+bool TextEdit::Caret::leftWord()


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

bool TextEdit::Caret::leftWord() ^

aseprite-bot · 2025-10-06T15:02:06Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:932: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:939: Frame #1: function 'rightWord' calls function 'right' here:

if (!right()) ^

src/ui/textedit.cpp:915: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot · 2025-10-06T15:02:06Z

+  return true;
+}
+
+bool TextEdit::Caret::rightWord()


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

bool TextEdit::Caret::rightWord() ^

aseprite-bot · 2025-10-06T15:02:07Z

+  void paste();
+  void selectAll();
+
+  obs::signal<void()> Change;


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

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

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-06T15:45:49Z

+  s_timer->start();
+}
+
+void TextEdit::stopTimer()


warning: method 'stopTimer' can be made static [readability-convert-member-functions-to-static]

src/ui/textedit.h:163:

- void stopTimer(); + static void stopTimer();

aseprite-bot · 2025-10-06T15:45:49Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:918: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:925: Frame #1: function 'leftWord' calls function 'left' here:

if (!left()) ^

src/ui/textedit.cpp:901: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-06T15:45:50Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:951: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:958: Frame #1: function 'rightWord' calls function 'right' here:

if (!right()) ^

src/ui/textedit.cpp:934: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-06T17:47:35Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:914: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:917: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:901: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-06T17:47:36Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:945: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:948: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:932: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-06T18:54:22Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:902: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:905: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:889: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-06T18:54:22Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:933: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:936: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:920: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-06T19:46:12Z

+        requestFocus();
+
+      const auto* mouseMessage = static_cast<MouseMessage*>(msg);
+      Caret caret = caretFromPosition(mouseMessage->position());


warning: variable 'caret' of type 'Caret' can be declared 'const' [misc-const-correctness]

Suggested change

Caret caret = caretFromPosition(mouseMessage->position());

Caret const caret = caretFromPosition(mouseMessage->position());

aseprite-bot · 2025-10-06T19:46:12Z

+  s_timer->start();
+}
+
+void TextEdit::stopTimer()


warning: method 'stopTimer' can be made static [readability-convert-member-functions-to-static]

src/ui/textedit.h:178:

- void stopTimer(); + static void stopTimer();

aseprite-bot · 2025-10-06T19:46:12Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:916: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:919: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:903: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-06T19:46:12Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:947: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:950: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:934: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-06T21:32:15Z

+  s_timer->start();
+}
+
+void TextEdit::stopTimer()


warning: method 'stopTimer' can be made static [readability-convert-member-functions-to-static]

src/ui/textedit.h:179:

- void stopTimer(); + static void stopTimer();

aseprite-bot · 2025-10-06T21:32:16Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:926: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:929: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:913: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-06T21:32:16Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:957: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:960: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:944: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-07T14:29:33Z

 void Entry::setCaretPos(const int pos)
 {
-  gfx::Size caretSize = theme()->getEntryCaretSize(this);
+  gfx::Size caretSize = theme()->getCaretSize(this);


warning: variable 'caretSize' of type 'gfx::Size' (aka 'SizeT') can be declared 'const' [misc-const-correctness]

Suggested change

gfx::Size caretSize = theme()->getCaretSize(this);

gfx::Size const caretSize = theme()->getCaretSize(this);

aseprite-bot · 2025-10-07T14:29:33Z

+
+      // Ensure the caret height corresponds with the tallest glyph
+      m_caretRect.h = std::max(m_caretRect.h, line.height);
+      m_caretRect.y = point.y + line.height / 2 - m_caretRect.h / 2;


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

m_caretRect.y = point.y + line.height / 2 - m_caretRect.h / 2; ^

aseprite-bot · 2025-10-07T14:29:33Z

+
+      // Ensure the caret height corresponds with the tallest glyph
+      m_caretRect.h = std::max(m_caretRect.h, line.height);
+      m_caretRect.y = point.y + line.height / 2 - m_caretRect.h / 2;


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

m_caretRect.y = point.y + line.height / 2 - m_caretRect.h / 2; ^

aseprite-bot · 2025-10-07T14:29:33Z

  virtual void setDecorativeWidgetBounds(Widget* widget);
  virtual int getScrollbarSize() { return kDefaultFontHeight; }
-  virtual gfx::Size getEntryCaretSize(Widget* widget) { return gfx::Size(kDefaultFontHeight, 1); }
+  virtual gfx::Size getCaretSize(Widget* widget) { return gfx::Size(kDefaultFontHeight, 1); }


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

Suggested change

virtual gfx::Size getCaretSize(Widget* widget) { return gfx::Size(kDefaultFontHeight, 1); }

virtual gfx::Size getCaretSize(Widget* /*widget*/) { return gfx::Size(kDefaultFontHeight, 1); }

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-08T13:26:37Z

+
+gfx::Rect TextEdit::caretBounds() const
+{
+  auto& line = m_lines[m_caret.line()];


warning: 'auto &line' can be declared as 'const auto &line' [readability-qualified-auto]

Suggested change

auto& line = m_lines[m_caret.line()];

const auto& line = m_lines[m_caret.line()];

aseprite-bot · 2025-10-08T13:26:37Z

+  }
+
+  rc.h = std::max(rc.h, line.height);
+  rc.y = point.y + line.height / 2 - rc.h / 2;


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

rc.y = point.y + line.height / 2 - rc.h / 2; ^

aseprite-bot · 2025-10-08T13:26:38Z

+  }
+
+  rc.h = std::max(rc.h, line.height);
+  rc.y = point.y + line.height / 2 - rc.h / 2;


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

rc.y = point.y + line.height / 2 - rc.h / 2; ^

aseprite-bot · 2025-10-08T13:26:38Z

+    return;
+
+  gfx::Point scroll = view->viewScroll();
+  gfx::Rect vp = view->viewportBounds();


warning: variable 'vp' of type 'gfx::Rect' (aka 'RectT') can be declared 'const' [misc-const-correctness]

Suggested change

gfx::Rect vp = view->viewportBounds();

gfx::Rect const vp = view->viewportBounds();

aseprite-bot · 2025-10-08T13:26:38Z

+  s_timer->start();
+}
+
+void TextEdit::stopTimer()


warning: method 'stopTimer' can be made static [readability-convert-member-functions-to-static]

src/ui/textedit.h:183:

- void stopTimer(); + static void stopTimer();

aseprite-bot · 2025-10-08T13:26:38Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:942: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:945: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:929: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-08T13:26:38Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:973: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:976: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:960: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-08T19:19:24Z

+
+gfx::Rect TextEdit::caretBounds() const
+{
+  Line& line = m_caret.lineObj();


warning: variable 'line' of type 'Line &' can be declared 'const' [misc-const-correctness]

Suggested change

Line& line = m_caret.lineObj();

Line const& line = m_caret.lineObj();

aseprite-bot · 2025-10-08T19:19:24Z

+
+    // Check the line width and if we're more than halfway past the line, we can set the caret to
+    // the full line.
+    caret.setPos((offsetPosition.x > caret.lineObj().width / 2) ? caret.lineObj().glyphCount : 0);


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

caret.setPos((offsetPosition.x > caret.lineObj().width / 2) ? caret.lineObj().glyphCount : 0); ^

aseprite-bot · 2025-10-08T19:19:24Z

+
+  // Keep the caret in a valid position.
+  if (!m_caret.isValid()) {
+    int line = std::clamp(m_caret.line(), 0, int(m_lines.size()) - 1);


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

Suggested change

int line = std::clamp(m_caret.line(), 0, int(m_lines.size()) - 1);

int const line = std::clamp(m_caret.line(), 0, int(m_lines.size()) - 1);

aseprite-bot · 2025-10-08T19:19:24Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:945: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:948: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:932: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-08T19:19:24Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:976: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:979: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:963: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

…3131, #4743, #4968)

Without this fix, "Run Command" will crash.

…ji present)

This is the same behavior as in ui::Entry widget.

We've moved the InitTheme code from the InitTheme.connect() signal to the onInitTheme() member function.

If we select from the beginning of a line to the previous line the selection painting process was including the first character of the line where we started, but it shouldn't be included (as the cursor started in pos=0).

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-08T21:02:47Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:935: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:938: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:922: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-08T21:02:47Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:966: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:969: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:953: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot · 2025-10-08T21:02:47Z

  }
 }

+Theme::TextColors Theme::getTextColors(Widget* widget)


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

Suggested change

Theme::TextColors Theme::getTextColors(Widget* widget)

Theme::TextColors Theme::getTextColors(Widget* /*widget*/)

This fixes some asserts failing in TextEdit where the caret might be outside the valid range just because we advance the caret one glyph when in reality the inserted unicode string is a hidden char/variant.

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-09T12:37:23Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:937: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:940: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:924: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-09T12:37:23Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:968: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:971: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:955: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

Inserting an emoji with a variation at the end of a line was introduced a lot of issues (saving the Widget text with the variation in another place/line).

dacap · 2025-10-09T15:05:26Z

@ckaiser would you mind to give a test to this? I think all missing parts are implemented and it's working pretty well (even inserting emojis/using IMEs).

The only missing part is for RTL languages, but that is something true for ui::Entry too.

ckaiser · 2025-10-12T22:27:31Z

Something I noticed, testing it on the user data input, fresh config, on macOS Tahoe:

It seems to not be excluded from the keyboard shortcut context, so I can't type capital letters since there's a bunch of Shift+[KEY] shortcuts, or even just the the C key (opens the canvas size selector)

This kinda makes it hard to test anything else since trying to type steals my focus and bounces me all over the place 😵

ckaiser · 2025-10-13T05:52:31Z

Testing now on Windows:

Typing multiple lines and then selecting everything with Shift-A and pressing delete, leaves the caret in the second line, instead of at 0,0 as you'd expect, although I couldn't reproduce this consistently
The horizontal scrollbar isn't showing up when there's only one line (unless I create a new line with enter and then delete it)
Using shortcuts like ctrl-z undoes text but also undoes things on the canvas (same with pressing tab toggling the timeline)

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-14T15:50:14Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:955: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:958: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:942: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-14T15:50:14Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:986: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:989: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:973: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-14T18:07:30Z

+{
+  Line& line = m_caret.lineObj();
+
+  gfx::Point origin = clientChildrenBounds().origin();


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

Suggested change

gfx::Point origin = clientChildrenBounds().origin();

gfx::Point const origin = clientChildrenBounds().origin();

aseprite-bot · 2025-10-14T18:07:31Z

+  m_pos = pos;
+}
+
+bool TextEdit::Caret::left(bool byWord)


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

bool TextEdit::Caret::left(bool byWord) ^

Additional context

src/ui/textedit.cpp:941: example recursive call chain, starting from function 'leftWord'

bool TextEdit::Caret::leftWord() ^

src/ui/textedit.cpp:944: Frame #1: function 'leftWord' calls function 'left' here:

while (left()) { ^

src/ui/textedit.cpp:928: Frame #2: function 'left' calls function 'leftWord' here:

return leftWord(); ^

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

return leftWord(); ^

aseprite-bot · 2025-10-14T18:07:31Z

+  return true;
+}
+
+bool TextEdit::Caret::right(bool byWord)


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

bool TextEdit::Caret::right(bool byWord) ^

Additional context

src/ui/textedit.cpp:972: example recursive call chain, starting from function 'rightWord'

bool TextEdit::Caret::rightWord() ^

src/ui/textedit.cpp:975: Frame #1: function 'rightWord' calls function 'right' here:

while (right()) { ^

src/ui/textedit.cpp:959: Frame #2: function 'right' calls function 'rightWord' here:

return rightWord(); ^

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

return rightWord(); ^

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2025-10-14T21:53:01Z

-              }
-            }
-            break;
+        Cmd cmd = cmdFromKeyMessage(keymsg);


warning: variable 'cmd' of type 'Cmd' can be declared 'const' [misc-const-correctness]

Suggested change

Cmd cmd = cmdFromKeyMessage(keymsg);

Cmd const cmd = cmdFromKeyMessage(keymsg);

aseprite-bot · 2025-10-14T21:53:01Z

+        // combination.
+        else if (keymsg->scancode() >= kKeyFirstModifierScancode) {
+          return true;
        }


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

Suggested change

}

if (keymsg->scancode() >= kKeyFirstModifierScancode) {

return true;

}

aseprite-bot · 2025-10-14T21:53:01Z

+
+class TextCmdProcessor {
+public:
+  enum Cmd {


warning: enum 'Cmd' 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 Cmd { ^

aseprite-bot · 2025-10-14T21:53:01Z

+  // TextCmdProcessor impl
+  bool onHasValidSelection() override { return !m_selection.isEmpty(); }
+  bool onCanModify() override { return true; }
+  void onExecuteCmd(Cmd cmd, base::codepoint_t unicodeChar, bool shiftPressed) override;


warning: function 'ui::TextEdit::onExecuteCmd' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]

void onExecuteCmd(Cmd cmd, base::codepoint_t unicodeChar, bool shiftPressed) override; ^

Additional context

src/ui/textedit.cpp:335: the definition seen here

void TextEdit::onExecuteCmd(const Cmd cmd, ^

src/ui/textedit.h:170: differing parameters are named here: ('shiftPressed'), in definition: ('expandSelection')

void onExecuteCmd(Cmd cmd, base::codepoint_t unicodeChar, bool shiftPressed) override; ^

dacap · 2025-10-14T21:53:04Z

It seems to not be excluded from the keyboard shortcut context, so I can't type capital letters since there's a bunch of Shift+[KEY] shortcuts, or even just the the C key (opens the canvas size selector)

This kinda makes it hard to test anything else since trying to type steals my focus and bounces me all over the place 😵

Nice catch. There is something to avoid this for ui::Entry, just added the missing part for ui::TextEdit: 050126b

Typing multiple lines and then selecting everything with Shift-A and pressing delete, leaves the caret in the second line, instead of at 0,0 as you'd expect, although I couldn't reproduce this consistently

I wasn't able to reproduce it, but probably something to look in a future iteration.

The horizontal scrollbar isn't showing up when there's only one line (unless I create a new line with enter and then delete it)

Fixed 👍 (also fixed the whole scrolling/needed viewport size).

Using shortcuts like ctrl-z undoes text but also undoes things on the canvas (same with pressing tab toggling the timeline)

Known issue. It's a little hard to fix, as the undo is done for the whole sprite, the same happen in the (e.g.) Layer name field (ui::Entry fields). Something to fix in a future in some way 🤔

I'm merging this into beta 🚀

…widgets

dacap self-assigned this Oct 6, 2025

dacap mentioned this pull request Oct 6, 2025

[WIP] TextEdit Widget (implements #3131) #4968

Closed

This was linked to issues Oct 6, 2025

User data with multiple lines #3130

Closed

Textbox UI logic #3131

Closed

aseprite-bot reviewed Oct 6, 2025

View reviewed changes

dacap mentioned this pull request Oct 6, 2025

Fix the position of subruns in TextBlob::visitRuns() generated by SpriteTextBlob::MakeWithShaper() aseprite/laf#160

Merged

dacap force-pushed the multiple-lines-textbox branch from 2c9a299 to 0faf9c0 Compare October 7, 2025 11:46

aseprite-bot reviewed Oct 7, 2025

View reviewed changes

aseprite-bot reviewed Oct 8, 2025

View reviewed changes

ckaiser and others added 14 commits October 8, 2025 17:44

User data with multiple lines of text (new TextEdit widget) (#3130, #…

fb21298

…3131, #4743, #4968)

We cannot bypass onSetText() as ui::Entry requires this

f96e0ef

Without this fix, "Run Command" will crash.

Enter from the numeric keypad can be used for new lines too

5a6baf8

Fix End key to go to EOL and added Ctrl+Home/End to go to BOF/EOF

943b14b

Change size_t to int for position/line numbers

cdbf7ec

Jump between words correctly with Ctrl+Left/Right

c54cb33

Fix caret position when a line has multiple runs (e.g. there's an emo…

2426a1d

…ji present)

Improve caret/char selection with the mouse

38ac7cd

Implement "selection by words" after double-clicking

2beb195

This is the same behavior as in ui::Entry widget.

Invalidate all blobs after changing theme

1fb4be5

We've moved the InitTheme code from the InitTheme.connect() signal to the onInitTheme() member function.

Fix TextEdit::caretFromPosition() when lines have different heights

5c92df0

Fix TextEdit selection bounds for multiple lines

596099d

If we select from the beginning of a line to the previous line the selection painting process was including the first character of the line where we started, but it shouldn't be included (as the cursor started in pos=0).

Use gfx::RectF instead of gfx::Rect for text line bounds

3759319

Match text caret size with Entry widget

63771af

dacap added 6 commits October 8, 2025 17:44

Remove ASSERT() that can fail if we paste a RTL text

d1c8703

Fix caret position to ensure proper caret scrolling/IME position

5d89d84

Minor refactors

c31381e

Using Up/Down key in the first/last line goes to BOL/EOL

23e9e81

Fix crash deleting w/backspace from the last (empty) line

f6fbe6a

Don't depend on hard-coded ui::Style layers for TextEdit colors

66cb997

dacap force-pushed the multiple-lines-textbox branch from 3a0f4ec to 66cb997 Compare October 8, 2025 20:46

aseprite-bot reviewed Oct 8, 2025

View reviewed changes

Avoid advancing the caret when a variant/hidden unicode char is pasted

9991566

This fixes some asserts failing in TextEdit where the caret might be outside the valid range just because we advance the caret one glyph when in reality the inserted unicode string is a hidden char/variant.

aseprite-bot reviewed Oct 9, 2025

View reviewed changes

Fix several problems inserting/handling emojis with variation selector

681ee81

Inserting an emoji with a variation at the end of a line was introduced a lot of issues (saving the Widget text with the variation in another place/line).

dacap assigned ckaiser and unassigned dacap Oct 9, 2025

ckaiser assigned dacap and unassigned ckaiser Oct 12, 2025

dacap added 2 commits October 14, 2025 11:41

Fix blinking cursor

e520fd0

Update scrollable area when we write/delete text in the same line

ad17550

aseprite-bot reviewed Oct 14, 2025

View reviewed changes

dacap added 2 commits October 14, 2025 14:34

Make scrolling & scrollable area more precise

2bb2087

Don't call menu commands with shortcuts that matches the TextEdit ones

050126b

aseprite-bot reviewed Oct 14, 2025

View reviewed changes

New TextCmdProcessor to merge common code between Entry <-> TextEdit …

75ae1aa

…widgets

dacap force-pushed the multiple-lines-textbox branch from 2062d97 to 75ae1aa Compare October 14, 2025 21:56

dacap merged commit 8e7f892 into beta Oct 14, 2025
21 checks passed

dacap deleted the multiple-lines-textbox branch October 14, 2025 22:08

	gfx::RectF glyphBounds = run.getGlyphBounds(i).offset(gfx::PointF(0, lineStartY));
	gfx::RectF const glyphBounds = run.getGlyphBounds(i).offset(gfx::PointF(0, lineStartY));

	Caret caret = caretFromPosition(mouseMessage->position());
	Caret const caret = caretFromPosition(mouseMessage->position());

	gfx::Size caretSize = theme()->getCaretSize(this);
	gfx::Size const caretSize = theme()->getCaretSize(this);

	virtual gfx::Size getCaretSize(Widget* widget) { return gfx::Size(kDefaultFontHeight, 1); }
	virtual gfx::Size getCaretSize(Widget* /widget/) { return gfx::Size(kDefaultFontHeight, 1); }

	auto& line = m_lines[m_caret.line()];
	const auto& line = m_lines[m_caret.line()];

	gfx::Rect vp = view->viewportBounds();
	gfx::Rect const vp = view->viewportBounds();

	Line& line = m_caret.lineObj();
	Line const& line = m_caret.lineObj();

	int line = std::clamp(m_caret.line(), 0, int(m_lines.size()) - 1);
	int const line = std::clamp(m_caret.line(), 0, int(m_lines.size()) - 1);

	Theme::TextColors Theme::getTextColors(Widget* widget)
	Theme::TextColors Theme::getTextColors(Widget* /widget/)

	gfx::Point origin = clientChildrenBounds().origin();
	gfx::Point const origin = clientChildrenBounds().origin();

	Cmd cmd = cmdFromKeyMessage(keymsg);
	Cmd const cmd = cmdFromKeyMessage(keymsg);

Uh oh!

Uh oh!

Conversation

dacap commented Oct 6, 2025

Uh oh!

aseprite-bot commented Oct 6, 2025

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!

Uh oh!

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!

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!

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!

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!

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!

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!