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

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
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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 };
};