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

GScrollBar: Use increment/decrement naming consistently.

Browse source
This commit is contained in:
Andreas Kling 2019-06-07 10:56:30 +02:00
parent 164742f316
commit a2a6bb93bc
2 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

39
LibGUI/GScrollBar.cpp
View file

@ -4,8 +4,6 @@
#include <SharedGraphics/GraphicsBitmap.h> #include <SharedGraphics/GraphicsBitmap.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
//#define GUTTER_DOES_PAGEUP_PAGEDOWN
static const char* s_up_arrow_bitmap_data = { static const char* s_up_arrow_bitmap_data = {
" " " "
" # " " # "
@ -123,12 +121,12 @@ void GScrollBar::set_value(int value)
update(); update();
} }
Rect GScrollBar::up_button_rect() const Rect GScrollBar::decrement_button_rect() const
{ {
return { 0, 0, button_width(), button_height() }; return { 0, 0, button_width(), button_height() };
} }
Rect GScrollBar::down_button_rect() const Rect GScrollBar::increment_button_rect() const
{ {
if (orientation() == Orientation::Vertical) if (orientation() == Orientation::Vertical)
return { 0, height() - button_height(), button_width(), button_height() }; return { 0, height() - button_height(), button_width(), button_height() };
@ -136,7 +134,7 @@ Rect GScrollBar::down_button_rect() const
return { width() - button_width(), 0, button_width(), button_height() }; return { width() - button_width(), 0, button_width(), button_height() };
} }
Rect GScrollBar::upper_gutter_rect() const Rect GScrollBar::decrement_gutter_rect() const
{ {
if (orientation() == Orientation::Vertical) if (orientation() == Orientation::Vertical)
return { 0, button_height(), button_width(), scrubber_rect().top() - button_height() }; return { 0, button_height(), button_width(), scrubber_rect().top() - button_height() };
@ -144,7 +142,7 @@ Rect GScrollBar::upper_gutter_rect() const
return { button_width(), 0, scrubber_rect().x() - button_width(), button_height() }; return { button_width(), 0, scrubber_rect().x() - button_width(), button_height() };
} }
Rect GScrollBar::lower_gutter_rect() const Rect GScrollBar::increment_gutter_rect() const
{ {
auto scrubber_rect = this->scrubber_rect(); auto scrubber_rect = this->scrubber_rect();
if (orientation() == Orientation::Vertical) if (orientation() == Orientation::Vertical)
@ -202,11 +200,11 @@ void GScrollBar::paint_event(GPaintEvent& event)
painter.fill_rect(rect(), Color::from_rgb(0xd6d2ce)); painter.fill_rect(rect(), Color::from_rgb(0xd6d2ce));
StylePainter::paint_button(painter, up_button_rect(), ButtonStyle::Normal, false, m_hovered_component == Component::DecrementButton); StylePainter::paint_button(painter, decrement_button_rect(), ButtonStyle::Normal, false, m_hovered_component == Component::DecrementButton);
painter.draw_bitmap(up_button_rect().location().translated(3, 3), orientation() == Orientation::Vertical ? *s_up_arrow_bitmap : *s_left_arrow_bitmap, has_scrubber() ? Color::Black : Color::MidGray); painter.draw_bitmap(decrement_button_rect().location().translated(3, 3), orientation() == Orientation::Vertical ? *s_up_arrow_bitmap : *s_left_arrow_bitmap, has_scrubber() ? Color::Black : Color::MidGray);
StylePainter::paint_button(painter, down_button_rect(), ButtonStyle::Normal, false, m_hovered_component == Component::IncrementButton); StylePainter::paint_button(painter, increment_button_rect(), ButtonStyle::Normal, false, m_hovered_component == Component::IncrementButton);
painter.draw_bitmap(down_button_rect().location().translated(3, 3), orientation() == Orientation::Vertical ? *s_down_arrow_bitmap : *s_right_arrow_bitmap, has_scrubber() ? Color::Black : Color::MidGray); painter.draw_bitmap(increment_button_rect().location().translated(3, 3), orientation() == Orientation::Vertical ? *s_down_arrow_bitmap : *s_right_arrow_bitmap, has_scrubber() ? Color::Black : Color::MidGray);
if (has_scrubber()) if (has_scrubber())
StylePainter::paint_button(painter, scrubber_rect(), ButtonStyle::Normal, false, m_hovered_component == Component::Scrubber); StylePainter::paint_button(painter, scrubber_rect(), ButtonStyle::Normal, false, m_hovered_component == Component::Scrubber);
@ -228,26 +226,16 @@ void GScrollBar::mousedown_event(GMouseEvent& event)
{ {
if (event.button() != GMouseButton::Left) if (event.button() != GMouseButton::Left)
return; return;
if (up_button_rect().contains(event.position())) { if (decrement_button_rect().contains(event.position())) {
m_automatic_scrolling_direction = AutomaticScrollingDirection::Decrement; m_automatic_scrolling_direction = AutomaticScrollingDirection::Decrement;
set_automatic_scrolling_active(true); set_automatic_scrolling_active(true);
return; return;
} }
if (down_button_rect().contains(event.position())) { if (increment_button_rect().contains(event.position())) {
m_automatic_scrolling_direction = AutomaticScrollingDirection::Increment; m_automatic_scrolling_direction = AutomaticScrollingDirection::Increment;
set_automatic_scrolling_active(true); set_automatic_scrolling_active(true);
return; return;
} }
#ifdef GUTTER_DOES_PAGEUP_PAGEDOWN
if (has_scrubber() && upper_gutter_rect().contains(event.position())) {
set_value(value() - m_big_step);
return;
}
if (has_scrubber() && lower_gutter_rect().contains(event.position())) {
set_value(value() + m_big_step);
return;
}
#endif
if (has_scrubber() && scrubber_rect().contains(event.position())) { if (has_scrubber() && scrubber_rect().contains(event.position())) {
m_scrubbing = true; m_scrubbing = true;
m_scrub_start_value = value(); m_scrub_start_value = value();
@ -255,7 +243,7 @@ void GScrollBar::mousedown_event(GMouseEvent& event)
update(); update();
return; return;
} }
#ifndef GUTTER_DOES_PAGEUP_PAGEDOWN
if (has_scrubber()) { if (has_scrubber()) {
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();
@ -275,7 +263,6 @@ void GScrollBar::mousedown_event(GMouseEvent& event)
m_scrub_start_value = value(); m_scrub_start_value = value();
m_scrub_origin = event.position(); m_scrub_origin = event.position();
} }
#endif
} }
void GScrollBar::mouseup_event(GMouseEvent& event) void GScrollBar::mouseup_event(GMouseEvent& event)
@ -305,9 +292,9 @@ void GScrollBar::mousemove_event(GMouseEvent& event)
auto old_hovered_component = m_hovered_component; auto old_hovered_component = m_hovered_component;
if (scrubber_rect().contains(event.position())) if (scrubber_rect().contains(event.position()))
m_hovered_component = Component::Scrubber; m_hovered_component = Component::Scrubber;
else if (up_button_rect().contains(event.position())) else if (decrement_button_rect().contains(event.position()))
m_hovered_component = Component::DecrementButton; m_hovered_component = Component::DecrementButton;
else if (down_button_rect().contains(event.position())) else if (increment_button_rect().contains(event.position()))
m_hovered_component = Component::IncrementButton; m_hovered_component = Component::IncrementButton;
else if (rect().contains(event.position())) else if (rect().contains(event.position()))
m_hovered_component = Component::Gutter; m_hovered_component = Component::Gutter;

8
LibGUI/GScrollBar.h
View file

@ -49,10 +49,10 @@ private:
int button_size() const { return 16; } int button_size() const { return 16; }
int button_width() const { return orientation() == Orientation::Vertical ? width() : button_size(); } int button_width() const { return orientation() == Orientation::Vertical ? width() : button_size(); }
int button_height() const { return orientation() == Orientation::Horizontal ? height() : button_size(); } int button_height() const { return orientation() == Orientation::Horizontal ? height() : button_size(); }
Rect up_button_rect() const; Rect decrement_button_rect() const;
Rect down_button_rect() const; Rect increment_button_rect() const;
Rect upper_gutter_rect() const; Rect decrement_gutter_rect() const;
Rect lower_gutter_rect() const; Rect increment_gutter_rect() const;
Rect scrubber_rect() const; Rect scrubber_rect() const;
int scrubber_size() const; int scrubber_size() const;
int scrubbable_range_in_pixels() const; int scrubbable_range_in_pixels() const;