RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

ListBox: Fix item rect inconsistency between paints and clicks.

Browse source
This commit is contained in:
Andreas Kling 2019-01-12 17:29:29 +01:00
parent ecb7e16202
commit c0c1c88f9b
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Widgets/ListBox.cpp
View file

@ -12,9 +12,10 @@ ListBox::~ListBox()
{ {
} }
unsigned ListBox::itemHeight() const Rect ListBox::item_rect(int index) const
{ {
return font().glyphHeight() + 2; int item_height = font().glyphHeight() + 2;
return Rect { 2, 2 + (index * item_height), width() - 4, item_height };
} }
void ListBox::paintEvent(PaintEvent&) void ListBox::paintEvent(PaintEvent&)
@ -28,8 +29,8 @@ void ListBox::paintEvent(PaintEvent&)
if (isFocused()) if (isFocused())
painter.draw_focus_rect(rect()); painter.draw_focus_rect(rect());
for (unsigned i = m_scrollOffset; i < m_items.size(); ++i) { for (int i = m_scrollOffset; i < static_cast<int>(m_items.size()); ++i) {
Rect itemRect(2, 2 + (i * itemHeight()), width() - 4, itemHeight()); auto itemRect = item_rect(i);
Rect textRect(itemRect.x() + 1, itemRect.y() + 1, itemRect.width() - 2, itemRect.height() - 2); Rect textRect(itemRect.x() + 1, itemRect.y() + 1, itemRect.width() - 2, itemRect.height() - 2);
Color itemTextColor = foregroundColor(); Color itemTextColor = foregroundColor();
@ -47,8 +48,8 @@ void ListBox::paintEvent(PaintEvent&)
void ListBox::mouseDownEvent(MouseEvent& event) void ListBox::mouseDownEvent(MouseEvent& event)
{ {
printf("ListBox::mouseDownEvent %d,%d\n", event.x(), event.y()); printf("ListBox::mouseDownEvent %d,%d\n", event.x(), event.y());
for (unsigned i = m_scrollOffset; i < m_items.size(); ++i) { for (int i = m_scrollOffset; i < static_cast<int>(m_items.size()); ++i) {
Rect itemRect(1, 1 + (i * itemHeight()), width() - 2, itemHeight()); auto itemRect = item_rect(i);
if (itemRect.contains(event.position())) { if (itemRect.contains(event.position())) {
m_selectedIndex = i; m_selectedIndex = i;
printf("ListBox: selected item %u (\"%s\")\n", i, m_items[i].characters()); printf("ListBox: selected item %u (\"%s\")\n", i, m_items[i].characters());

4
Widgets/ListBox.h
View file

@ -15,9 +15,9 @@ private:
virtual void mouseDownEvent(MouseEvent&) override; virtual void mouseDownEvent(MouseEvent&) override;
virtual const char* class_name() const override { return "ListBox"; } virtual const char* class_name() const override { return "ListBox"; }
unsigned itemHeight() const; Rect item_rect(int index) const;
unsigned m_scrollOffset { 0 }; int m_scrollOffset { 0 };
int m_selectedIndex { -1 }; int m_selectedIndex { -1 };
Vector<String> m_items; Vector<String> m_items;