RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:08:10 +00:00
Code Issues Activity Actions

LibGUI: Add TextEditor::set_icon()

Browse source 
You can now set a 16x16 icon on a single-line TextEditor. If present,
the icon will be painted to the left of the text content.
This commit is contained in:
Andreas Kling 2020-06-29 20:34:42 +02:00
parent 7533fd8b02
commit f50bc0f314
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Libraries/LibGUI/TextEditor.cpp
View file

@ -141,6 +141,9 @@ TextPosition TextEditor::text_position_at(const Gfx::IntPoint& a_position) const
position.move_by(-(m_horizontal_content_padding + ruler_width()), 0); position.move_by(-(m_horizontal_content_padding + ruler_width()), 0);
position.move_by(-frame_thickness(), -frame_thickness()); position.move_by(-frame_thickness(), -frame_thickness());
if (is_single_line() && icon())
position.move_by(-(icon_size() + icon_padding()), 0);
size_t line_index = 0; size_t line_index = 0;
if (is_line_wrapping_enabled()) { if (is_line_wrapping_enabled()) {
@ -515,6 +518,11 @@ void TextEditor::paint_event(PaintEvent& event)
}); });
} }
if (!is_multi_line() && m_icon) {
Gfx::IntRect icon_rect { icon_padding(), 1, icon_size(), icon_size() };
painter.draw_scaled_bitmap(icon_rect, *m_icon, m_icon->rect());
}
if (is_focused() && m_cursor_state) if (is_focused() && m_cursor_state)
painter.fill_rect(cursor_content_rect(), palette().text_cursor()); painter.fill_rect(cursor_content_rect(), palette().text_cursor());
} }
@ -963,7 +971,7 @@ int TextEditor::content_x_for_position(const TextPosition& position) const
} }
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
return m_horizontal_content_padding + x_offset; return m_horizontal_content_padding + ((is_single_line() && icon()) ? (icon_size() + icon_padding()) : 0) + x_offset;
case Gfx::TextAlignment::CenterRight: case Gfx::TextAlignment::CenterRight:
// FIXME // FIXME
ASSERT(!is_line_wrapping_enabled()); ASSERT(!is_line_wrapping_enabled());
@ -1481,8 +1489,11 @@ void TextEditor::for_each_visual_line(size_t line_index, Callback callback) cons
}; };
if (is_right_text_alignment(text_alignment())) if (is_right_text_alignment(text_alignment()))
visual_line_rect.set_right_without_resize(editor_visible_text_rect.right()); visual_line_rect.set_right_without_resize(editor_visible_text_rect.right());
if (!is_multi_line()) if (is_single_line()) {
visual_line_rect.center_vertically_within(editor_visible_text_rect); visual_line_rect.center_vertically_within(editor_visible_text_rect);
if (m_icon)
visual_line_rect.move_by(icon_size() + icon_padding(), 0);
}
if (callback(visual_line_rect, visual_line_view, start_of_line) == IterationDecision::Break) if (callback(visual_line_rect, visual_line_view, start_of_line) == IterationDecision::Break)
break; break;
start_of_line = visual_line_break; start_of_line = visual_line_break;
@ -1620,4 +1631,12 @@ int TextEditor::fixed_glyph_width() const
return font().glyph_width(' '); return font().glyph_width(' ');
} }
void TextEditor::set_icon(const Gfx::Bitmap* icon)
{
if (m_icon == icon)
return;
m_icon = icon;
update();
}
} }

8
Libraries/LibGUI/TextEditor.h
View file

@ -74,6 +74,9 @@ public:
bool is_ruler_visible() const { return m_ruler_visible; } bool is_ruler_visible() const { return m_ruler_visible; }
void set_ruler_visible(bool b) { m_ruler_visible = b; } void set_ruler_visible(bool b) { m_ruler_visible = b; }
void set_icon(const Gfx::Bitmap*);
const Gfx::Bitmap* icon() const { return m_icon; }
Function<void()> on_cursor_change; Function<void()> on_cursor_change;
Function<void()> on_selection_change; Function<void()> on_selection_change;
@ -177,6 +180,9 @@ private:
void defer_reflow(); void defer_reflow();
void undefer_reflow(); void undefer_reflow();
int icon_size() const { return 16; }
int icon_padding() const { return 2; }
class ReflowDeferrer { class ReflowDeferrer {
public: public:
ReflowDeferrer(TextEditor& editor) ReflowDeferrer(TextEditor& editor)
@ -279,6 +285,8 @@ private:
RefPtr<Core::Timer> m_automatic_selection_scroll_timer; RefPtr<Core::Timer> m_automatic_selection_scroll_timer;
Gfx::IntPoint m_last_mousemove_position; Gfx::IntPoint m_last_mousemove_position;
RefPtr<Gfx::Bitmap> m_icon;
}; };
} }