diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2023-01-11 20:00:46 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2023-01-12 11:25:51 +0100 |
commit | e181b1cb820a69d92b77f74aeaee62961107f8a2 (patch) | |
tree | a7c874c2201f3dfb442a4f71ab26bf96ca933b48 /Userland/Demos | |
parent | 6edc0cf5ab2fce211318b5d4f83e319897b621e5 (diff) | |
download | serenity-e181b1cb820a69d92b77f74aeaee62961107f8a2.zip |
Userland: Use Core::Timer::create_foo() factory functions where possible
Diffstat (limited to 'Userland/Demos')
-rw-r--r-- | Userland/Demos/CatDog/main.cpp | 7 | ||||
-rw-r--r-- | Userland/Demos/WidgetGallery/DemoWizardDialog.cpp | 28 |
2 files changed, 17 insertions, 18 deletions
diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp index b57dcbd5a6..6075cac907 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -66,17 +66,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) (void)TRY(advice_widget->try_set_layout<GUI::VerticalBoxLayout>()); advice_widget->layout()->set_spacing(0); - auto advice_timer = TRY(Core::Timer::try_create()); - advice_timer->set_interval(15'000); - advice_timer->set_single_shot(true); - advice_timer->on_timeout = [&] { + auto advice_timer = TRY(Core::Timer::create_single_shot(15'000, [&] { window->move_to_front(); advice_window->move_to_front(); catdog_widget->set_roaming(false); advice_window->move_to(window->x() - advice_window->width() / 2, window->y() - advice_window->height()); advice_window->show(); advice_window->set_always_on_top(); - }; + })); advice_timer->start(); advice_widget->on_dismiss = [&] { diff --git a/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp b/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp index a9156e8dbe..0cff4d365e 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp +++ b/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp @@ -41,26 +41,28 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window) .release_value_but_fixme_should_propagate_errors(); m_page_2->body_widget().load_from_gml(demo_wizard_page_2_gml).release_value_but_fixme_should_propagate_errors(); m_page_2_progressbar = m_page_2->body_widget().find_descendant_of_type_named<GUI::Progressbar>("page_2_progressbar"); - m_page_2_timer = Core::Timer::try_create(this).release_value_but_fixme_should_propagate_errors(); + m_page_2_timer = Core::Timer::create_repeating( + 100, [&]() { + if (m_page_2_progress_value < 100) + m_page_2_progress_value++; + m_page_2_progressbar->set_value(m_page_2_progress_value); + + // Go to final page on progress completion + if (m_page_2_progress_value == 100) { + m_page_2_progress_value = 0; + replace_page(*m_back_page); + } + }, + this) + .release_value_but_fixme_should_propagate_errors(); m_page_2->on_page_enter = [&]() { m_page_2_progress_value = 0; - m_page_2_timer->restart(100); + m_page_2_timer->restart(); }; m_page_2->on_page_leave = [&]() { m_page_2_progress_value = 0; m_page_2_timer->stop(); }; - m_page_2_timer->on_timeout = [&]() { - if (m_page_2_progress_value < 100) - m_page_2_progress_value++; - m_page_2_progressbar->set_value(m_page_2_progress_value); - - // Go to final page on progress completion - if (m_page_2_progress_value == 100) { - m_page_2_progress_value = 0; - replace_page(*m_back_page); - } - }; // Don't set a on_next_page handler for page 2 as we automatically navigate to the final page on progress completion // Create the back cover |