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

GTextEditor: Fix computing content x/rect values with line wrapping

Browse source 
This makes the cursor actually get painted on the right visual line
when in line-wrapping mode.
This commit is contained in:
Andreas Kling 2019-08-25 09:06:54 +02:00
parent 2e31b6627e
commit 7b5bcec562
1 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Libraries/LibGUI/GTextEditor.cpp
View file

@ -708,10 +708,20 @@ void GTextEditor::insert_at_cursor(char ch)
int GTextEditor::content_x_for_position(const GTextPosition& position) const int GTextEditor::content_x_for_position(const GTextPosition& position) const
{ {
auto& line = m_lines[position.line()]; auto& line = m_lines[position.line()];
int x_offset = -1;
switch (m_text_alignment) { switch (m_text_alignment) {
case TextAlignment::CenterLeft: case TextAlignment::CenterLeft:
return m_horizontal_content_padding + position.column() * glyph_width(); line.for_each_visual_line([&](const Rect&, const StringView& view, int start_of_visual_line) {
if (position.column() >= start_of_visual_line && ((position.column() - start_of_visual_line) < view.length())) {
x_offset = (position.column() - start_of_visual_line) * glyph_width();
return IterationDecision::Break;
}
return IterationDecision::Continue;
});
return m_horizontal_content_padding + x_offset;
case TextAlignment::CenterRight: case TextAlignment::CenterRight:
// FIXME
ASSERT(!is_line_wrapping_enabled());
return content_width() - m_horizontal_content_padding - (line.length() * glyph_width()) + (position.column() * glyph_width()); return content_width() - m_horizontal_content_padding - (line.length() * glyph_width()) + (position.column() * glyph_width());
default: default:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -732,7 +742,24 @@ Rect GTextEditor::content_rect_for_position(const GTextPosition& position) const
rect.center_vertically_within({ {}, frame_inner_rect().size() }); rect.center_vertically_within({ {}, frame_inner_rect().size() });
return rect; return rect;
} }
return { x, position.line() * line_height(), 1, line_height() };
auto& line = m_lines[position.line()];
Rect rect;
line.for_each_visual_line([&](const Rect& visual_line_rect, const StringView& view, int start_of_visual_line) {
if (position.column() >= start_of_visual_line && ((position.column() - start_of_visual_line) < view.length())) {
// NOTE: We have to subtract the horizontal padding here since it's part of the visual line rect
// *and* included in what we get from content_x_for_position().
rect = {
visual_line_rect.x() + x - (m_horizontal_content_padding),
visual_line_rect.y(),
1,
line_height()
};
return IterationDecision::Break;
}
return IterationDecision::Continue;
});
return rect;
} }
Rect GTextEditor::cursor_content_rect() const Rect GTextEditor::cursor_content_rect() const