RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 05:55:00 +00:00
Code Issues Activity Actions

GTextEditor: Simplify computation of visual selection start/end

Browse source 
Add Line::visual_line_containing(int column) to easily convert a column
number into a visual line index.
This commit is contained in:
Andreas Kling 2019-08-25 14:04:46 +02:00
parent 97a695403b
commit fa20dcafb5
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Libraries/LibGUI/GTextEditor.cpp
View file

@ -362,30 +362,15 @@ void GTextEditor::paint_event(GPaintEvent& event)
int first_visual_line_with_selection = -1;
int last_visual_line_with_selection = -1;
if (physical_line_has_selection) {
if (selection.start().line() < line_index) {
if (selection.start().line() < line_index)
first_visual_line_with_selection = 0;
} else {
int visual_line_index = 0;
line.for_each_visual_line([&](const Rect&, const StringView& view, int start_of_visual_line) {
if (selection.start().column() >= start_of_visual_line && ((selection.start().column() - start_of_visual_line) < view.length()))
return IterationDecision::Break;
++visual_line_index;
return IterationDecision::Continue;
});
first_visual_line_with_selection = visual_line_index;
}
if (selection.end().line() > line_index) {
else
first_visual_line_with_selection = line.visual_line_containing(selection.start().column());
if (selection.end().line() > line_index)
last_visual_line_with_selection = line.m_visual_line_breaks.size();
} else {
int visual_line_index = 0;
line.for_each_visual_line([&](const Rect&, const StringView& view, int start_of_visual_line) {
if (selection.end().column() >= start_of_visual_line && ((selection.end().column() - start_of_visual_line) < view.length()))
return IterationDecision::Break;
++visual_line_index;
return IterationDecision::Continue;
});
last_visual_line_with_selection = visual_line_index;
}
else
last_visual_line_with_selection = line.visual_line_containing(selection.end().column());
}
int selection_start_column_within_line = selection.start().line() == line_index ? selection.start().column() : 0;
@ -1416,3 +1401,15 @@ void GTextEditor::set_line_wrapping_enabled(bool enabled)
recompute_all_visual_lines();
update();
}
int GTextEditor::Line::visual_line_containing(int column) const
{
int visual_line_index = 0;
for_each_visual_line([&](const Rect&, const StringView& view, int start_of_visual_line) {
if (column >= start_of_visual_line && ((column - start_of_visual_line) < view.length()))
return IterationDecision::Break;
++visual_line_index;
return IterationDecision::Continue;
});
return visual_line_index;
}