mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 13:57:35 +00:00
LibGUI: Combine wrapping/non-wrapping TextEditor code paths
The `is_wrapping_enabled()` paths function just fine when wrapping is disabled. We already calculate `m_line_visual_data`. The only reason to use a special path is for speed, since you can skip some steps if you know each line is only 1 line high visually. However, with code-folding being added, we can't make assumptions about line height because a line could be hidden and have an effective height of 0px. So `text_position_at_content_position()` always needs to loop through the lines to see what our position is, and that function always needs to be called to calculate the real position.
This commit is contained in:
parent
7aef096f85
commit
69333e5dbd
2 changed files with 16 additions and 57 deletions
|
@ -149,18 +149,14 @@ TextPosition TextEditor::text_position_at_content_position(Gfx::IntPoint content
|
|||
size_t line_index = 0;
|
||||
|
||||
if (position.y() >= 0) {
|
||||
if (is_wrapping_enabled()) {
|
||||
for (size_t i = 0; i < line_count(); ++i) {
|
||||
auto& rect = m_line_visual_data[i].visual_rect;
|
||||
if (position.y() >= rect.top() && position.y() <= rect.bottom()) {
|
||||
line_index = i;
|
||||
break;
|
||||
}
|
||||
if (position.y() > rect.bottom())
|
||||
line_index = line_count() - 1;
|
||||
for (size_t i = 0; i < line_count(); ++i) {
|
||||
auto& rect = m_line_visual_data[i].visual_rect;
|
||||
if (position.y() >= rect.top() && position.y() <= rect.bottom()) {
|
||||
line_index = i;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
line_index = (size_t)(position.y() / line_height());
|
||||
if (position.y() > rect.bottom())
|
||||
line_index = line_count() - 1;
|
||||
}
|
||||
line_index = max((size_t)0, min(line_index, line_count() - 1));
|
||||
}
|
||||
|
@ -1357,14 +1353,7 @@ Gfx::IntRect TextEditor::line_content_rect(size_t line_index) const
|
|||
line_rect.center_vertically_within({ {}, frame_inner_rect().size() });
|
||||
return line_rect;
|
||||
}
|
||||
if (is_wrapping_enabled())
|
||||
return m_line_visual_data[line_index].visual_rect;
|
||||
return {
|
||||
content_x_for_position({ line_index, 0 }),
|
||||
(int)line_index * line_height(),
|
||||
text_width_for_font(line.view(), font()),
|
||||
line_height()
|
||||
};
|
||||
return m_line_visual_data[line_index].visual_rect;
|
||||
}
|
||||
|
||||
void TextEditor::set_cursor_and_focus_line(size_t line, size_t column)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue