New text tool #4383

dacap · 2024-03-25T15:00:53Z

A work-in-progress to convert the "insert text" command into an interactive "text tool."

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-03-25T15:06:22Z

src/app/commands/cmd_paste_text.cpp

  }

-  std::string faceValue() const {
-    return m_face;
+  FontInfo fontInfo() const {


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

Suggested change

FontInfo fontInfo() const {

static FontInfo fontInfo() {

This looks like a bug in clang-tidy.

src/app/font_info.cpp

src/app/font_info_tests.cpp

src/app/ui/font_entry.cpp

aseprite-bot · 2024-03-25T15:06:23Z

src/app/ui/font_entry.cpp

+    case kFocusEnterMessage:
+      if (!m_popup) {
+        try {
+          FontInfo info = static_cast<FontEntry*>(parent())->info();


warning: variable 'info' of type 'FontInfo' can be declared 'const' [misc-const-correctness]

Suggested change

FontInfo info = static_cast<FontEntry*>(parent())->info();

FontInfo const info = static_cast<FontEntry*>(parent())->info();

aseprite-bot · 2024-03-25T15:06:25Z

src/app/util/render_text.cpp

+      font->setSize(fontInfo.size());
+  }
+  else {
+    const int size = (fontInfo.useDefaultSize() ? 18: fontInfo.size());


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

const int size = (fontInfo.useDefaultSize() ? 18: fontInfo.size()); ^

aseprite-bot · 2024-03-25T15:06:25Z

src/app/util/render_text.cpp

+  if (bounds.w < 1) bounds.w = 1;
+  if (bounds.h < 1) bounds.h = 1;
+
+  image.reset(doc::Image::create(doc::IMAGE_RGB, bounds.w, bounds.h));


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

image.reset(doc::Image::create(doc::IMAGE_RGB, bounds.w, bounds.h)); ^

aseprite-bot · 2024-03-25T15:06:25Z

src/app/util/render_text.cpp

+  if (bounds.w < 1) bounds.w = 1;
+  if (bounds.h < 1) bounds.h = 1;
+
+  image.reset(doc::Image::create(doc::IMAGE_RGB, bounds.w, bounds.h));


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

image.reset(doc::Image::create(doc::IMAGE_RGB, bounds.w, bounds.h)); ^

src/ui/manager.cpp

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-04-16T14:09:05Z

src/app/util/render_text.cpp

+
+      for (int i=0; i<info.glyphCount; ++i) {
+        auto rc = info.getGlyphBounds(i);
+        m_bounds |= gfx::Rect(rc.x, 0, rc.w, height);


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

m_bounds |= gfx::Rect(rc.x, 0, rc.w, height); ^

aseprite-bot · 2024-04-16T14:09:05Z

src/app/util/render_text.cpp

+
+      for (int i=0; i<info.glyphCount; ++i) {
+        auto rc = info.getGlyphBounds(i);
+        m_bounds |= gfx::Rect(rc.x, 0, rc.w, height);


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

m_bounds |= gfx::Rect(rc.x, 0, rc.w, height); ^

aseprite-bot · 2024-04-16T14:09:05Z

src/app/util/render_text.cpp

+
+      for (int i=0; i<info.glyphCount; ++i) {
+        auto rc = info.getGlyphBounds(i);
+        m_bounds |= gfx::Rect(rc.x, 0, rc.w, height);


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

m_bounds |= gfx::Rect(rc.x, 0, rc.w, height); ^

This new font selector list installed fonts with its proper name. It needs some extra work yet to select font set styles (regular, bold, italic, etc.)

If we clicked bold/italic, and then choose another font family, we were using the cached typeface inside the FontInfo instead of an update typeface with the selected styles applied (bold/italic). Now we don't cache the typeface inside FontInfo to avoid this.

…t run This fixes the required output image size to render text in different languages when the text does't support the full range of the specified chars/code points.

This is the first (not yet production-ready) version of the interactive Text tool. The text input is done with a transparent ui::Entry, and on each text modification an ExtraCel is rendered with this same ui::Entry's TextBlob to be displated in the canvas with the active zoom level. The ui::Entry is being painted along the text in the canvas (just for testing), but this is something to be fixed. Probably it will not be the case in the future and a fully customized rendering (onPaint()) process will be required.

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-06-12T01:45:12Z

src/app/font_info.cpp

+// static
+FontInfo FontInfo::getFromPreferences()
+{
+  Preferences& pref = Preferences::instance();


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

Suggested change

Preferences& pref = Preferences::instance();

Preferences const& pref = Preferences::instance();

aseprite-bot · 2024-06-12T01:45:12Z

src/app/font_info.cpp

+
+void FontInfo::updatePreferences()
+{
+  Preferences& pref = Preferences::instance();


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

Suggested change

Preferences& pref = Preferences::instance();

Preferences const& pref = Preferences::instance();

aseprite-bot · 2024-06-12T01:45:12Z

src/app/ui/context_bar.cpp

+public:
+  FontSelector(ContextBar* contextBar) {
+    // Load the font from the preferences
+    Preferences& pref = Preferences::instance();


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

Suggested change

Preferences& pref = Preferences::instance();

s const

aseprite-bot · 2024-06-12T01:45:12Z

src/app/ui/context_bar.cpp

+  }
+
+  ~FontSelector() {
+    Preferences& pref = Preferences::instance();


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

Suggested change

Preferences& pref = Preferences::instance();

{ const

aseprite-bot · 2024-06-12T01:45:12Z

src/app/ui/context_bar.cpp

@@ -2200,6 +2220,11 @@
    (tool->getInk(0)->isSlice() ||
     tool->getInk(1)->isSlice());

+  // True if the current tool is text tool.
+  const bool isText = tool &&


warning: implicit conversion 'tools::Tool *' -> bool [readability-implicit-bool-conversion]

Suggested change

const bool isText = tool &&

.( != nullptr)

aseprite-bot · 2024-06-12T01:45:14Z

src/app/ui/editor/writing_text_state.cpp

+
+void WritingTextState::onEnterState(Editor* editor)
+{
+  StateWithWheelBehavior::onEnterState(editor);


warning: qualified name 'StateWithWheelBehavior::onEnterState' refers to a member overridden in subclass; did you mean 'app::StandbyState'? [bugprone-parent-virtual-call]

Suggested change

StateWithWheelBehavior::onEnterState(editor);

app::StandbyState::onEnterState(editor);

aseprite-bot · 2024-06-12T01:45:14Z

src/app/ui/editor/writing_text_state.cpp

+  else {
+    editor->releaseMouse();
+    return KeepState;
+  }


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

Suggested change

else {

editor->releaseMouse();

return KeepState;

}

editor->releaseMouse();

return KeepState;

aseprite-bot · 2024-06-12T01:45:14Z

src/app/ui/editor/writing_text_state.cpp

+
+void WritingTextState::onFontChange()
+{
+  FontInfo fontInfo = App::instance()->contextBar()->fontInfo();


warning: variable 'fontInfo' of type 'FontInfo' can be declared 'const' [misc-const-correctness]

Suggested change

FontInfo fontInfo = App::instance()->contextBar()->fontInfo();

FontInfo const fontInfo = App::instance()->contextBar()->fontInfo();

aseprite-bot · 2024-06-12T01:45:14Z

src/app/util/render_text.cpp

+  const FontInfo& fontInfo,
+  const std::string& text)
+{
+  text::FontRef font = get_font_from_info(fontInfo);


warning: variable 'font' of type 'text::FontRef' (aka 'Ref') can be declared 'const' [misc-const-correctness]

Suggested change

text::FontRef font = get_font_from_info(fontInfo);

text::FontRef const font = get_font_from_info(fontInfo);

aseprite-bot · 2024-06-12T01:45:14Z

src/app/util/render_text.cpp

+  const std::string& text,
+  gfx::Color color)
+{
+  text::FontRef font = get_font_from_info(fontInfo);


warning: variable 'font' of type 'text::FontRef' (aka 'Ref') can be declared 'const' [misc-const-correctness]

Suggested change

text::FontRef font = get_font_from_info(fontInfo);

text::FontRef const font = get_font_from_info(fontInfo);

This was linked to issues Mar 25, 2024

Textbox tool #28

Open

New font selector #4363

Open

aseprite-bot reviewed Mar 25, 2024

View reviewed changes

dacap force-pushed the new-text-tool branch from 14ceef2 to 047bebe Compare March 25, 2024 15:24

dacap self-assigned this Mar 25, 2024

dacap force-pushed the new-text-tool branch from 1668294 to 7c7a04e Compare April 9, 2024 20:10

aseprite-bot reviewed Apr 16, 2024

View reviewed changes

dacap force-pushed the new-text-tool branch from 33728fc to f27bace Compare April 16, 2024 14:34

dacap force-pushed the new-text-tool branch from 9a3f911 to c54e512 Compare April 23, 2024 18:43

dacap force-pushed the new-text-tool branch 2 times, most recently from 757f937 to 3456fc2 Compare May 7, 2024 23:20

dacap added 8 commits June 11, 2024 21:52

New ui::FocusMessage with oldFocus/newFocus fields

46ae29b

New font selector (fix aseprite#4363)

e739428

This new font selector list installed fonts with its proper name. It needs some extra work yet to select font set styles (regular, bold, italic, etc.)

Use the most regular/normal typeface style for preview purposes

f73e176

Add Bold/Italic buttons to select a font

3b0e5e9

Fix required bounds for text using shaped text w/the font of each tex…

e67f1e0

…t run This fixes the required output image size to render text in different languages when the text does't support the full range of the specified chars/code points.

Fix FontInfo tests

867f313

dacap force-pushed the new-text-tool branch from 3456fc2 to 60d9a95 Compare June 12, 2024 01:37

aseprite-bot reviewed Jun 12, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New text tool #4383

New text tool #4383

dacap commented Mar 25, 2024

aseprite-bot left a comment

aseprite-bot Mar 25, 2024

dacap Mar 25, 2024

aseprite-bot Mar 25, 2024

aseprite-bot Mar 25, 2024

aseprite-bot Mar 25, 2024

aseprite-bot Mar 25, 2024

aseprite-bot left a comment

aseprite-bot Apr 16, 2024

aseprite-bot Apr 16, 2024

aseprite-bot Apr 16, 2024

aseprite-bot left a comment

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

aseprite-bot Jun 12, 2024

	FontInfo info = static_cast<FontEntry*>(parent())->info();
	FontInfo const info = static_cast<FontEntry*>(parent())->info();

	Preferences& pref = Preferences::instance();
	Preferences const& pref = Preferences::instance();

	StateWithWheelBehavior::onEnterState(editor);
	app::StandbyState::onEnterState(editor);

	FontInfo fontInfo = App::instance()->contextBar()->fontInfo();
	FontInfo const fontInfo = App::instance()->contextBar()->fontInfo();

	text::FontRef font = get_font_from_info(fontInfo);
	text::FontRef const font = get_font_from_info(fontInfo);

New text tool #4383

Are you sure you want to change the base?

New text tool #4383

Conversation

dacap commented Mar 25, 2024

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment