RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 19:38:12 +00:00
Code Issues Activity Actions

GSlider: Make the knob width proportional to the range, if in that mode (#288)

Browse source 
Regardless of mode, made the knob container clickable so the knob position
can be moved without dragging the knob itself.

Added a 3rd GSlider to the WidgetGallery showing the proportional mode in
action.
This commit is contained in:
Lawrence Manning 2019-07-11 15:31:43 +01:00 • committed by Andreas Kling
parent eb64a4ca60
commit 01998a10e3
3 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Libraries/LibGUI/GSlider.cpp Normal file → Executable file
View file

@ -56,15 +56,28 @@ void GSlider::paint_event(GPaintEvent& event)
Rect GSlider::knob_rect() const
{
auto inner_rect = this->inner_rect();
float range_size = m_max - m_min;
float adjusted_value = m_value - m_min;
float relative_value = adjusted_value / range_size;
Rect rect {
inner_rect.x() + (int)(relative_value * inner_rect.width()) - knob_width() / 2,
0,
knob_width(),
knob_height()
};
Rect rect;
rect.set_y(0);
rect.set_height(knob_height());
if (knob_size_mode() == KnobSizeMode::Fixed) {
if (m_max - m_min)
{
float scale = (float)inner_rect.width() / (float)(m_max - m_min);
rect.set_x(inner_rect.x() + ((int)(m_value * scale)) - (knob_fixed_width() / 2));
}
else
rect.set_x(0);
rect.set_width(knob_fixed_width());
}
else {
float scale = (float)inner_rect.width() / (float)(m_max - m_min + 1);
rect.set_x(inner_rect.x() + ((int)(m_value * scale)));
if (m_max - m_min)
rect.set_width(::max((int)(scale), knob_fixed_width()));
else
rect.set_width(inner_rect.width());
}
rect.center_vertically_within(inner_rect);
return rect;
}
@ -80,6 +93,12 @@ void GSlider::mousedown_event(GMouseEvent& event)
m_drag_origin_value = m_value;
return;
}
else {
if (event.position().x() > knob_rect().right())
set_value(m_value + 1);
else if (event.position().x() < knob_rect().left())
set_value(m_value - 1);
}
}
return GWidget::mousedown_event(event);
}