system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-23 02:55:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

LibGUI: Make sliders start a drag when jumping to the cursor

Browse source 
This allows users to seek to any position in VideoPlayer, then continue
adjusting the playback timestamp while holding left mouse.
This commit is contained in:
Zaggy1024 2023-02-05 18:35:22 -06:00 committed by Sam Atkins
parent 944191560a
commit fa98c43c0d
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Userland/Libraries/LibGUI/Slider.cpp
View file

@ -76,16 +76,17 @@ Gfx::IntRect Slider::knob_rect() const
return rect;
}
void Slider::start_drag(Gfx::IntPoint start_position)
{
VERIFY(!m_dragging);
m_dragging = true;
m_drag_origin = start_position;
m_drag_origin_value = value();
}
void Slider::mousedown_event(MouseEvent& event)
{
if (event.button() == MouseButton::Primary) {
if (knob_rect().contains(event.position())) {
m_dragging = true;
m_drag_origin = event.position();
m_drag_origin_value = value();
return;
}
auto const mouse_offset = event.position().primary_offset_for_orientation(orientation());
if (jump_to_cursor()) {
@ -98,14 +99,21 @@ void Slider::mousedown_event(MouseEvent& event)
int new_value = static_cast<int>(min() + ((max() - min()) * normalized_mouse_offset));
set_value(new_value);
} else {
auto knob_first_edge = knob_rect().first_edge_for_orientation(orientation());
auto knob_last_edge = knob_rect().last_edge_for_orientation(orientation());
if (mouse_offset > knob_last_edge)
increase_slider_by_page_steps(1);
else if (mouse_offset < knob_first_edge)
decrease_slider_by_page_steps(1);
start_drag(event.position());
return;
}
if (knob_rect().contains(event.position())) {
start_drag(event.position());
return;
}
auto knob_first_edge = knob_rect().first_edge_for_orientation(orientation());
auto knob_last_edge = knob_rect().last_edge_for_orientation(orientation());
if (mouse_offset > knob_last_edge)
increase_slider_by_page_steps(1);
else if (mouse_offset < knob_first_edge)
decrease_slider_by_page_steps(1);
}
return Widget::mousedown_event(event);
}
@ -124,10 +132,17 @@ void Slider::mousemove_event(MouseEvent& event)
return Widget::mousemove_event(event);
}
void Slider::end_drag()
{
if (m_dragging) {
m_dragging = false;
}
}
void Slider::mouseup_event(MouseEvent& event)
{
if (event.button() == MouseButton::Primary) {
m_dragging = false;
end_drag();
return;
}

2
Userland/Libraries/LibGUI/Slider.h
View file

@ -44,8 +44,10 @@ protected:
explicit Slider(Orientation = Orientation::Vertical);
virtual void paint_event(PaintEvent&) override;
void start_drag(Gfx::IntPoint);
virtual void mousedown_event(MouseEvent&) override;
virtual void mousemove_event(MouseEvent&) override;
void end_drag();
virtual void mouseup_event(MouseEvent&) override;
virtual void mousewheel_event(MouseEvent&) override;
virtual void leave_event(Core::Event&) override;