RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 15:15:07 +00:00
Code Issues Activity Actions

LibGUI: Use clamp() is various places

Browse source
This commit is contained in:
Andreas Kling 2020-01-20 13:16:58 +01:00
parent b52d0afecf
commit b25210ee1b
4 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibGUI/GProgressBar.cpp
View file

@ -53,10 +53,7 @@ void GProgressBar::set_range(int min, int max)
ASSERT(min < max); ASSERT(min < max);
m_min = min; m_min = min;
m_max = max; m_max = max;
if (m_value > m_max) m_value = clamp(m_value, m_min, m_max);
m_value = m_max;
if (m_value < m_min)
m_value = m_min;
} }
void GProgressBar::paint_event(GPaintEvent& event) void GProgressBar::paint_event(GPaintEvent& event)

10
Libraries/LibGUI/GScrollBar.cpp
View file

@ -129,10 +129,7 @@ void GScrollBar::set_range(int min, int max)
m_max = max; m_max = max;
int old_value = m_value; int old_value = m_value;
if (m_value < m_min) m_value = clamp(m_value, m_min, m_max);
m_value = m_min;
if (m_value > m_max)
m_value = m_max;
if (on_change && m_value != old_value) if (on_change && m_value != old_value)
on_change(m_value); on_change(m_value);
@ -141,10 +138,7 @@ void GScrollBar::set_range(int min, int max)
void GScrollBar::set_value(int value) void GScrollBar::set_value(int value)
{ {
if (value < m_min) value = clamp(value, m_min, m_max);
value = m_min;
if (value > m_max)
value = m_max;
if (value == m_value) if (value == m_value)
return; return;
m_value = value; m_value = value;

11
Libraries/LibGUI/GSlider.cpp
View file

@ -50,20 +50,13 @@ void GSlider::set_range(int min, int max)
return; return;
m_min = min; m_min = min;
m_max = max; m_max = max;
m_value = clamp(m_value, m_min, m_max);
if (m_value > max)
m_value = max;
if (m_value < min)
m_value = min;
update(); update();
} }
void GSlider::set_value(int value) void GSlider::set_value(int value)
{ {
if (value > m_max) value = clamp(value, m_min, m_max);
value = m_max;
if (value < m_min)
value = m_min;
if (m_value == value) if (m_value == value)
return; return;
m_value = value; m_value = value;

10
Libraries/LibGUI/GSpinBox.cpp
View file

@ -59,10 +59,7 @@ GSpinBox::~GSpinBox()
void GSpinBox::set_value(int value) void GSpinBox::set_value(int value)
{ {
if (value < m_min) value = clamp(value, m_min, m_max);
value = m_min;
if (value > m_max)
value = m_max;
if (m_value == value) if (m_value == value)
return; return;
m_value = value; m_value = value;
@ -82,10 +79,7 @@ void GSpinBox::set_range(int min, int max)
m_max = max; m_max = max;
int old_value = m_value; int old_value = m_value;
if (m_value < m_min) m_value = clamp(m_value, m_min, m_max);
m_value = m_min;
if (m_value > m_max)
m_value = m_max;
if (on_change && m_value != old_value) if (on_change && m_value != old_value)
on_change(m_value); on_change(m_value);