LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-21 10:19:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

MouseSettings: Migrate to using SettingsWindow :^)

Browse Source
This commit is contained in:
Sam Atkins 2021-11-20 15:09:28 +00:00 committed by Linus Groh
parent fca7924437
commit f20b0403bc
Notes: sideshowbarker 2024-07-18 00:58:24 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/f20b0403bc7
Pull-request: https://github.com/SerenityOS/serenity/pull/10979
Reviewed-by: https://github.com/linusg ✅
8 changed files with 21 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Userland/Applications/MouseSettings/CMakeLists.txt
View File

@ -10,7 +10,6 @@ compile_gml(Theme.gml ThemeWidgetGML.h theme_widget_gml)
set(SOURCES
main.cpp
DoubleClickArrowWidget.cpp
MouseSettingsWindow.cpp
MouseWidget.cpp
MouseWidget.h
MouseWidgetGML.h

68
Userland/Applications/MouseSettings/MouseSettingsWindow.cpp
View File

@ -1,68 +0,0 @@
/*
* Copyright (c) 2020, Idan Horowitz <idan.horowitz@serenityos.org>
* Copyright (c) 2021, the SerenityOS developers.
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "MouseSettingsWindow.h"
#include "MouseWidget.h"
#include "ThemeWidget.h"
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/Widget.h>
MouseSettingsWindow::MouseSettingsWindow()
{
auto& main_widget = set_main_widget<GUI::Widget>();
main_widget.set_fill_with_background_color(true);
main_widget.set_layout<GUI::VerticalBoxLayout>();
main_widget.layout()->set_margins(4);
main_widget.layout()->set_spacing(6);
auto& tab_widget = main_widget.add<GUI::TabWidget>();
auto& mouse_widget = tab_widget.add_tab<MouseWidget>("Mouse");
auto& theme_widget = tab_widget.add_tab<ThemeWidget>("Cursor Theme");
auto& button_container = main_widget.add<GUI::Widget>();
button_container.set_shrink_to_fit(true);
button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container.layout()->set_spacing(6);
m_reset_button = button_container.add<GUI::Button>("Defaults");
m_reset_button->on_click = [&](auto) {
mouse_widget.reset_default_values();
theme_widget.reset_default_values();
};
button_container.layout()->add_spacer();
m_ok_button = button_container.add<GUI::Button>("OK");
m_ok_button->set_fixed_width(75);
m_ok_button->on_click = [&](auto) {
mouse_widget.update_window_server();
theme_widget.update_window_server();
GUI::Application::the()->quit();
};
m_cancel_button = button_container.add<GUI::Button>("Cancel");
m_cancel_button->set_fixed_width(75);
m_cancel_button->on_click = [&](auto) {
GUI::Application::the()->quit();
};
m_apply_button = button_container.add<GUI::Button>("Apply");
m_apply_button->set_fixed_width(75);
m_apply_button->on_click = [&](auto) {
mouse_widget.update_window_server();
theme_widget.update_window_server();
};
}
MouseSettingsWindow::~MouseSettingsWindow()
{
}

25
Userland/Applications/MouseSettings/MouseSettingsWindow.h
View File

@ -1,25 +0,0 @@
/*
* Copyright (c) 2020, Idan Horowitz <idan.horowitz@serenityos.org>
* Copyright (c) 2021, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibGUI/Button.h>
#include <LibGUI/Window.h>
class MouseSettingsWindow final : public GUI::Window {
C_OBJECT(MouseSettingsWindow)
public:
virtual ~MouseSettingsWindow() override;
private:
MouseSettingsWindow();
RefPtr<GUI::Button> m_ok_button;
RefPtr<GUI::Button> m_cancel_button;
RefPtr<GUI::Button> m_apply_button;
RefPtr<GUI::Button> m_reset_button;
};

3
Userland/Applications/MouseSettings/MouseWidget.cpp
View File

@ -57,7 +57,7 @@ MouseWidget::MouseWidget()
switch_buttons_image_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/graphics/switch-mouse-buttons.png").release_value_but_fixme_should_propagate_errors());
}
void MouseWidget::update_window_server()
void MouseWidget::apply_settings()
{
float const factor = m_speed_slider->value() / speed_slider_scale;
GUI::WindowServerConnection::the().async_set_mouse_acceleration(factor);
@ -72,7 +72,6 @@ void MouseWidget::reset_default_values()
m_scroll_length_spinbox->set_value(default_scroll_length);
m_double_click_speed_slider->set_value(double_click_speed_default);
m_switch_buttons_checkbox->set_checked(false);
update_window_server();
}
MouseWidget::~MouseWidget()

10
Userland/Applications/MouseSettings/MouseWidget.h
View File

@ -6,18 +6,18 @@
#pragma once
#include "DoubleClickArrowWidget.h"
#include <LibGUI/CheckBox.h>
#include <LibGUI/SettingsWindow.h>
#include <LibGUI/Window.h>
#include "DoubleClickArrowWidget.h"
class MouseWidget final : public GUI::Widget {
class MouseWidget final : public GUI::SettingsWindow::Tab {
C_OBJECT(MouseWidget)
public:
virtual ~MouseWidget() override;
void update_window_server();
void reset_default_values();
virtual void apply_settings() override;
virtual void reset_default_values() override;
private:
MouseWidget();

4
Userland/Applications/MouseSettings/ThemeWidget.cpp
View File

@ -6,6 +6,7 @@
#include "ThemeWidget.h"
#include <AK/LexicalPath.h>
#include <Applications/MouseSettings/ThemeWidgetGML.h>
#include <LibCore/DirIterator.h>
#include <LibGUI/Button.h>
@ -127,7 +128,7 @@ ThemeWidget::ThemeWidget()
m_theme_name_box->set_text(m_theme_name);
}
void ThemeWidget::update_window_server()
void ThemeWidget::apply_settings()
{
GUI::WindowServerConnection::the().async_apply_cursor_theme(m_theme_name_box->text());
}
@ -135,7 +136,6 @@ void ThemeWidget::update_window_server()
void ThemeWidget::reset_default_values()
{
m_theme_name_box->set_text("Default");
update_window_server();
}
ThemeWidget::~ThemeWidget()

15
Userland/Applications/MouseSettings/ThemeWidget.h
View File

@ -6,13 +6,10 @@
#pragma once
#include <LibGUI/Model.h>
#include <LibGUI/Window.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibGfx/CursorParams.h>
#include "DoubleClickArrowWidget.h"
#include "LibGUI/FilePicker.h"
#include <LibGUI/Model.h>
#include <LibGUI/SettingsWindow.h>
#include <LibGfx/CursorParams.h>
class MouseCursorModel final : public GUI::Model {
public:
@ -65,13 +62,13 @@ private:
Vector<String> m_themes;
};
class ThemeWidget final : public GUI::Widget {
class ThemeWidget final : public GUI::SettingsWindow::Tab {
C_OBJECT(ThemeWidget)
public:
virtual ~ThemeWidget() override;
void update_window_server();
void reset_default_values();
virtual void apply_settings() override;
virtual void reset_default_values() override;
private:
ThemeWidget();

13
Userland/Applications/MouseSettings/main.cpp
View File

@ -2,14 +2,17 @@
* Copyright (c) 2020, Idan Horowitz <idan.horowitz@serenityos.org>
* Copyright (c) 2021, the SerenityOS developers.
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "MouseSettingsWindow.h"
#include "MouseWidget.h"
#include "ThemeWidget.h"
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
#include <LibGUI/Icon.h>
#include <LibGUI/SettingsWindow.h>
#include <unistd.h>
int main(int argc, char** argv)
@ -28,11 +31,9 @@ int main(int argc, char** argv)
auto app_icon = GUI::Icon::default_icon("app-mouse");
auto window = MouseSettingsWindow::construct();
window->set_title("Mouse Settings");
window->resize(400, 480);
window->set_resizable(false);
window->set_minimizable(false);
auto window = GUI::SettingsWindow::construct("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes);
window->add_tab<MouseWidget>("Mouse");
window->add_tab<ThemeWidget>("Cursor Theme");
window->set_icon(app_icon.bitmap_for_size(16));
window->show();