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

LibGUI: Add m_ prefix to gutter_click_state in ScrollBar

Browse source 
Quick fix, this member did not seem to follow the conventions.
This commit is contained in:
MacDue 2022-03-08 21:48:19 +00:00 • committed by Andreas Kling
parent 297e095755
commit 9ab3ab86cb
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibGUI/Scrollbar.cpp
View file

@ -198,24 +198,24 @@ void Scrollbar::paint_event(PaintEvent& event)
hovered_component_for_painting = Component::None; hovered_component_for_painting = Component::None;
painter.fill_rect_with_dither_pattern(rect(), palette().button().lightened(1.3f), palette().button()); painter.fill_rect_with_dither_pattern(rect(), palette().button().lightened(1.3f), palette().button());
if (gutter_click_state != GutterClickState::NotPressed && has_scrubber() && hovered_component_for_painting == Component::Gutter) { if (m_gutter_click_state != GutterClickState::NotPressed && has_scrubber() && hovered_component_for_painting == Component::Gutter) {
VERIFY(!scrubber_rect().is_null()); VERIFY(!scrubber_rect().is_null());
Gfx::IntRect rect_to_fill = rect(); Gfx::IntRect rect_to_fill = rect();
if (orientation() == Orientation::Vertical) { if (orientation() == Orientation::Vertical) {
if (gutter_click_state == GutterClickState::BeforeScrubber) { if (m_gutter_click_state == GutterClickState::BeforeScrubber) {
rect_to_fill.set_top(decrement_button_rect().bottom()); rect_to_fill.set_top(decrement_button_rect().bottom());
rect_to_fill.set_bottom(scrubber_rect().top()); rect_to_fill.set_bottom(scrubber_rect().top());
} else { } else {
VERIFY(gutter_click_state == GutterClickState::AfterScrubber); VERIFY(m_gutter_click_state == GutterClickState::AfterScrubber);
rect_to_fill.set_top(scrubber_rect().bottom()); rect_to_fill.set_top(scrubber_rect().bottom());
rect_to_fill.set_bottom(increment_button_rect().top()); rect_to_fill.set_bottom(increment_button_rect().top());
} }
} else { } else {
if (gutter_click_state == GutterClickState::BeforeScrubber) { if (m_gutter_click_state == GutterClickState::BeforeScrubber) {
rect_to_fill.set_left(decrement_button_rect().right()); rect_to_fill.set_left(decrement_button_rect().right());
rect_to_fill.set_right(scrubber_rect().left()); rect_to_fill.set_right(scrubber_rect().left());
} else { } else {
VERIFY(gutter_click_state == GutterClickState::AfterScrubber); VERIFY(m_gutter_click_state == GutterClickState::AfterScrubber);
rect_to_fill.set_left(scrubber_rect().right()); rect_to_fill.set_left(scrubber_rect().right());
rect_to_fill.set_right(increment_button_rect().left()); rect_to_fill.set_right(increment_button_rect().left());
} }
@ -264,12 +264,12 @@ void Scrollbar::on_automatic_scrolling_timer_fired()
if (m_hovered_component != component_at_position(m_last_mouse_position)) { if (m_hovered_component != component_at_position(m_last_mouse_position)) {
m_hovered_component = component_at_position(m_last_mouse_position); m_hovered_component = component_at_position(m_last_mouse_position);
if (m_hovered_component != Component::Gutter) if (m_hovered_component != Component::Gutter)
gutter_click_state = GutterClickState::NotPressed; m_gutter_click_state = GutterClickState::NotPressed;
update(); update();
} }
return; return;
} }
gutter_click_state = GutterClickState::NotPressed; m_gutter_click_state = GutterClickState::NotPressed;
} }
void Scrollbar::mousedown_event(MouseEvent& event) void Scrollbar::mousedown_event(MouseEvent& event)
@ -340,7 +340,7 @@ void Scrollbar::set_automatic_scrolling_active(bool active, Component pressed_co
m_automatic_scrolling_timer->start(); m_automatic_scrolling_timer->start();
} else { } else {
m_automatic_scrolling_timer->stop(); m_automatic_scrolling_timer->stop();
gutter_click_state = GutterClickState::NotPressed; m_gutter_click_state = GutterClickState::NotPressed;
} }
} }
@ -352,10 +352,10 @@ void Scrollbar::scroll_by_page(const Gfx::IntPoint& click_position)
float page_increment = range_size * rel_scrubber_size; float page_increment = range_size * rel_scrubber_size;
if (click_position.primary_offset_for_orientation(orientation()) < scrubber_rect().primary_offset_for_orientation(orientation())) { if (click_position.primary_offset_for_orientation(orientation()) < scrubber_rect().primary_offset_for_orientation(orientation())) {
gutter_click_state = GutterClickState::BeforeScrubber; m_gutter_click_state = GutterClickState::BeforeScrubber;
decrease_slider_by(page_increment); decrease_slider_by(page_increment);
} else { } else {
gutter_click_state = GutterClickState::AfterScrubber; m_gutter_click_state = GutterClickState::AfterScrubber;
increase_slider_by(page_increment); increase_slider_by(page_increment);
} }
} }

3
Userland/Libraries/LibGUI/Scrollbar.h
View file

@ -57,8 +57,7 @@ private:
NotPressed, NotPressed,
BeforeScrubber, BeforeScrubber,
AfterScrubber, AfterScrubber,
} gutter_click_state } m_gutter_click_state { GutterClickState::NotPressed };
= GutterClickState::NotPressed;
int default_button_size() const { return 16; } int default_button_size() const { return 16; }
int button_size() const { return length(orientation()) <= (default_button_size() * 2) ? length(orientation()) / 2 : default_button_size(); } int button_size() const { return length(orientation()) <= (default_button_size() * 2) ? length(orientation()) / 2 : default_button_size(); }