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

GScrollBar: Make the scrubber size proportional to the scrollable range.

Browse source
This commit is contained in:
Andreas Kling 2019-03-29 02:51:19 +01:00
parent a5135dbf01
commit c77d369b75
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
LibGUI/GScrollBar.cpp
View file

@ -151,9 +151,9 @@ Rect GScrollBar::lower_gutter_rect() const
int GScrollBar::scrubbable_range_in_pixels() const int GScrollBar::scrubbable_range_in_pixels() const
{ {
if (orientation() == Orientation::Vertical) if (orientation() == Orientation::Vertical)
return height() - button_size() * 3; return height() - button_size() * 2 - scrubber_size();
else else
return width() - button_size() * 3; return width() - button_size() * 2 - scrubber_size();
} }
bool GScrollBar::has_scrubber() const bool GScrollBar::has_scrubber() const
@ -161,6 +161,13 @@ bool GScrollBar::has_scrubber() const
return m_max != m_min; return m_max != m_min;
} }
int GScrollBar::scrubber_size() const
{
int pixel_range = (orientation() == Orientation::Vertical ? height() : width()) - button_size() * 2;
int value_range = m_max - m_min;
return ::max(pixel_range - value_range, button_size());
}
Rect GScrollBar::scrubber_rect() const Rect GScrollBar::scrubber_rect() const
{ {
if (!has_scrubber()) if (!has_scrubber())
@ -169,7 +176,7 @@ Rect GScrollBar::scrubber_rect() const
if (m_value == m_min) if (m_value == m_min)
x_or_y = button_size(); x_or_y = button_size();
else if (m_value == m_max) else if (m_value == m_max)
x_or_y = ((orientation() == Orientation::Vertical ? height() : width()) - (button_size() * 2)) + 1; x_or_y = ((orientation() == Orientation::Vertical ? height() : width()) - button_size() - scrubber_size()) + 1;
else { else {
float range_size = m_max - m_min; float range_size = m_max - m_min;
float available = scrubbable_range_in_pixels(); float available = scrubbable_range_in_pixels();
@ -178,9 +185,9 @@ Rect GScrollBar::scrubber_rect() const
} }
if (orientation() == Orientation::Vertical) if (orientation() == Orientation::Vertical)
return { 0, (int)x_or_y, button_size(), button_size() }; return { 0, (int)x_or_y, button_size(), scrubber_size() };
else else
return { (int)x_or_y, 0, button_size(), button_size() }; return { (int)x_or_y, 0, scrubber_size(), button_size() };
} }
void GScrollBar::paint_event(GPaintEvent& event) void GScrollBar::paint_event(GPaintEvent& event)

1
LibGUI/GScrollBar.h
View file

@ -38,6 +38,7 @@ private:
Rect upper_gutter_rect() const; Rect upper_gutter_rect() const;
Rect lower_gutter_rect() const; Rect lower_gutter_rect() const;
Rect scrubber_rect() const; Rect scrubber_rect() const;
int scrubber_size() const;
int scrubbable_range_in_pixels() const; int scrubbable_range_in_pixels() const;
int m_min { 0 }; int m_min { 0 };