mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-21 03:55:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibGUI: Make GTextEditor::Span have a range instead of two positions

Browse source 
A GTextRange is really just two GTextPositions (start and end) anyway.
This way we can say nice things like "if (range.contains(position))"
This commit is contained in:
Andreas Kling 2019-10-26 15:32:12 +02:00
parent 4fa8acf6ea
commit bc2026d26d
Notes: sideshowbarker 2024-07-19 11:32:10 +09:00
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DevTools/HackStudio/main.cpp
View file

@ -256,8 +256,8 @@ static void rehighlight()
dbg() << token.to_string() << " @ " << token.m_start.line << ":" << token.m_start.column << " - " << token.m_end.line << ":" << token.m_end.column;
#endif
GTextEditor::Span span;
span.start = { token.m_start.line, token.m_start.column };
span.end = { token.m_end.line, token.m_end.column };
span.range.set_start({ token.m_start.line, token.m_start.column });
span.range.set_end({ token.m_end.line, token.m_end.column });
auto style = style_for_token_type(token.m_type);
span.color = style.color;
span.font = style.font;

5
Libraries/LibGUI/GTextEditor.cpp
View file

@ -373,11 +373,10 @@ void GTextEditor::paint_event(GPaintEvent& event)
for (int i = 0; i < visual_line_text.length(); ++i) {
const Font* font = &this->font();
Color color;
int physical_line = line_index;
int physical_column = start_of_visual_line + i;
GTextPosition physical_position(line_index, start_of_visual_line + i);
// FIXME: This is *horribly* inefficient.
for (auto& span : m_spans) {
if (!span.contains(GTextPosition(physical_line, physical_column)))
if (!span.range.contains(physical_position))
continue;
color = span.color;
if (span.font)

21
Libraries/LibGUI/GTextEditor.h
View file

@ -78,6 +78,15 @@ public:
return m_start == other.m_start && m_end == other.m_end;
}
bool contains(const GTextPosition& position) const
{
if (!(position.line() > m_start.line() || (position.line() == m_start.line() && position.column() >= m_start.column())))
return false;
if (!(position.line() < m_end.line() || (position.line() == m_end.line() && position.column() <= m_end.column())))
return false;
return true;
}
private:
GTextPosition normalized_start() const { return m_start < m_end ? m_start : m_end; }
GTextPosition normalized_end() const { return m_start < m_end ? m_end : m_start; }
@ -168,17 +177,7 @@ public:
void set_cursor(const GTextPosition&);
struct Span {
bool contains(const GTextPosition& position) const
{
if (!(position.line() > start.line() || (position.line() == start.line() && position.column() >= start.column())))
return false;
if (!(position.line() < end.line() || (position.line() == end.line() && position.column() <= end.column())))
return false;
return true;
}
GTextPosition start;
GTextPosition end;
GTextRange range;
Color color;
const Font* font { nullptr };
};