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

LibGUI+PDFViewer: Move NumericInput into LibGUI

Browse source 
A text box that is restricted to numbers within a range, is generally
useful. Let's make it available for use!
This commit is contained in:
Sam Atkins 2024-01-08 17:29:18 +00:00 • committed by Sam Atkins
parent 4fd5d450be
commit ea31c11aff
7 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Applications/PDFViewer/CMakeLists.txt
View file

@ -4,7 +4,6 @@ serenity_component(
)
set(SOURCES
NumericInput.cpp
OutlineModel.cpp
PDFViewer.cpp
PDFViewerWidget.cpp

89
Userland/Applications/PDFViewer/NumericInput.cpp
View file

@ -1,89 +0,0 @@
/*
* Copyright (c) 2021, Matthew Olsson <mattco@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "NumericInput.h"
#include <ctype.h>
NumericInput::NumericInput()
{
set_text("0"sv);
on_change = [&] {
auto number_opt = text().to_number<int>();
if (number_opt.has_value()) {
set_current_number(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 == '+')))
builder.append(ch);
first = false;
}
auto new_number_opt = builder.to_byte_string().to_number<int>();
if (!new_number_opt.has_value()) {
m_needs_text_reset = true;
return;
} else {
m_needs_text_reset = false;
}
set_text(builder.to_byte_string());
set_current_number(new_number_opt.value(), GUI::AllowCallback::No);
};
on_up_pressed = [&] {
if (m_current_number < m_max_number)
set_current_number(m_current_number + 1);
};
on_down_pressed = [&] {
if (m_current_number > m_min_number)
set_current_number(m_current_number - 1);
};
on_focusout = [&] { on_focus_lost(); };
on_return_pressed = [&] { on_focus_lost(); };
on_escape_pressed = [&] { on_focus_lost(); };
}
void NumericInput::set_min_number(i32 number)
{
m_min_number = number;
if (m_current_number < number)
set_current_number(number);
}
void NumericInput::set_max_number(i32 number)
{
m_max_number = number;
if (m_current_number > number)
set_current_number(number);
}
void NumericInput::on_focus_lost()
{
if (m_needs_text_reset) {
set_text(ByteString::number(m_current_number));
m_needs_text_reset = false;
}
if (on_number_changed)
on_number_changed(m_current_number);
}
void NumericInput::set_current_number(i32 number, GUI::AllowCallback allow_callback)
{
if (number == m_current_number)
return;
m_current_number = clamp(number, m_min_number, m_max_number);
set_text(ByteString::number(m_current_number));
if (on_number_changed && allow_callback == GUI::AllowCallback::Yes)
on_number_changed(m_current_number);
}

31
Userland/Applications/PDFViewer/NumericInput.h
View file

@ -1,31 +0,0 @@
/*
* Copyright (c) 2021, Matthew Olsson <mattco@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/NumericLimits.h>
#include <LibGUI/TextBox.h>
class NumericInput final : public GUI::TextBox {
C_OBJECT(NumericInput)
public:
virtual ~NumericInput() override = default;
Function<void(i32)> on_number_changed;
void set_min_number(i32 number);
void set_max_number(i32 number);
void set_current_number(i32 number, GUI::AllowCallback allow_callback = GUI::AllowCallback::Yes);
private:
NumericInput();
void on_focus_lost();
bool m_needs_text_reset { false };
i32 m_current_number { 0 };
i32 m_min_number { NumericLimits<i32>::min() };
i32 m_max_number { NumericLimits<i32>::max() };
};

2
Userland/Applications/PDFViewer/PDFViewerWidget.cpp
View file

@ -276,7 +276,7 @@ void PDFViewerWidget::initialize_toolbar(GUI::Toolbar& toolbar)
toolbar.add_action(*m_go_to_prev_page_action);
toolbar.add_action(*m_go_to_next_page_action);
m_page_text_box = toolbar.add<NumericInput>();
m_page_text_box = toolbar.add<GUI::NumericInput>();
m_page_text_box->set_enabled(false);
m_page_text_box->set_fixed_width(30);
m_page_text_box->set_min_number(1);

4
Userland/Applications/PDFViewer/PDFViewerWidget.h
View file

@ -6,7 +6,6 @@
#pragma once
#include "NumericInput.h"
#include "PDFViewer.h"
#include "SidebarWidget.h"
#include <AK/NonnullRefPtr.h>
@ -14,6 +13,7 @@
#include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h>
#include <LibGUI/CheckBox.h>
#include <LibGUI/NumericInput.h>
#include <LibGUI/Widget.h>
class PDFViewer;
@ -40,7 +40,7 @@ private:
RefPtr<SidebarWidget> m_sidebar;
NonnullRefPtr<PagedErrorsModel> m_paged_errors_model;
RefPtr<GUI::TreeView> m_errors_tree_view;
RefPtr<NumericInput> m_page_text_box;
RefPtr<GUI::NumericInput> m_page_text_box;
RefPtr<GUI::Label> m_total_page_label;
RefPtr<GUI::Action> m_go_to_prev_page_action;
RefPtr<GUI::Action> m_go_to_next_page_action;