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

LibGUI: Make NumericInput work well in GML

Browse source 
- Register the widget
- Register property getters and setters
- Rename getters and setters to match the property names, as required by
  the GML compiler. The names min/max/value are chosen to match SpinBox.
- Prevent a crash when the minimum is less than the maximum (which can
  happen while editing the GML).
This commit is contained in:
Sam Atkins 2024-01-09 16:24:11 +00:00 • committed by Sam Atkins
parent da349607a3
commit 5f0230a57e
3 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Userland/Libraries/LibGUI/NumericInput.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Matthew Olsson <mattco@serenityos.org>
* Copyright (c) 2024, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -7,6 +8,8 @@
#include "NumericInput.h"
#include <ctype.h>
REGISTER_WIDGET(GUI, NumericInput);
namespace GUI {
NumericInput::NumericInput()
@ -16,14 +19,14 @@ NumericInput::NumericInput()
on_change = [&] {
auto number_opt = text().to_number<int>();
if (number_opt.has_value()) {
set_current_number(number_opt.value(), GUI::AllowCallback::No);
set_value(number_opt.value(), GUI::AllowCallback::No);
return;
}
StringBuilder builder;
bool first = true;
for (auto& ch : text()) {
if (isdigit(ch) || (first && ((ch == '-' && m_min_number < 0) || ch == '+')))
if (isdigit(ch) || (first && ((ch == '-' && m_min < 0) || ch == '+')))
builder.append(ch);
first = false;
}
@ -37,57 +40,61 @@ NumericInput::NumericInput()
}
set_text(builder.to_byte_string());
set_current_number(new_number_opt.value(), GUI::AllowCallback::No);
set_value(new_number_opt.value(), GUI::AllowCallback::No);
};
on_up_pressed = [&] {
if (m_current_number < m_max_number)
set_current_number(m_current_number + 1);
if (m_value < m_max)
set_value(m_value + 1);
};
on_down_pressed = [&] {
if (m_current_number > m_min_number)
set_current_number(m_current_number - 1);
if (m_value > m_min)
set_value(m_value - 1);
};
on_focusout = [&] { on_focus_lost(); };
on_return_pressed = [&] { on_focus_lost(); };
on_escape_pressed = [&] { on_focus_lost(); };
REGISTER_INT_PROPERTY("min", min, set_min);
REGISTER_INT_PROPERTY("max", max, set_max);
REGISTER_INT_PROPERTY("value", value, set_value);
}
void NumericInput::set_min_number(i64 number)
void NumericInput::set_min(i64 number)
{
m_min_number = number;
if (m_current_number < number)
set_current_number(number);
m_min = number;
if (m_value < number)
set_value(number);
}
void NumericInput::set_max_number(i64 number)
void NumericInput::set_max(i64 number)
{
m_max_number = number;
if (m_current_number > number)
set_current_number(number);
m_max = number;
if (m_value > number)
set_value(number);
}
void NumericInput::on_focus_lost()
{
if (m_needs_text_reset) {
set_text(ByteString::number(m_current_number));
set_text(ByteString::number(m_value));
m_needs_text_reset = false;
}
if (on_number_changed)
on_number_changed(m_current_number);
on_number_changed(m_value);
}
void NumericInput::set_current_number(i64 number, GUI::AllowCallback allow_callback)
void NumericInput::set_value(i64 number, GUI::AllowCallback allow_callback)
{
if (number == m_current_number)
if (number == m_value)
return;
m_current_number = clamp(number, m_min_number, m_max_number);
set_text(ByteString::number(m_current_number));
m_value = clamp(number, ::min(m_min, m_max), ::max(m_min, m_max));
set_text(ByteString::number(m_value));
if (on_number_changed && allow_callback == GUI::AllowCallback::Yes)
on_number_changed(m_current_number);
on_number_changed(m_value);
}
void NumericInput::mousewheel_event(GUI::MouseEvent& event)
@ -95,7 +102,7 @@ void NumericInput::mousewheel_event(GUI::MouseEvent& event)
auto wheel_delta = event.wheel_delta_y() / abs(event.wheel_delta_y());
if (event.modifiers() == KeyModifier::Mod_Ctrl)
wheel_delta *= 6;
set_current_number(m_current_number - wheel_delta);
set_value(m_value - wheel_delta);
event.accept();
}