From c6af248909ba9ea3fbd9008dcb3e145f813bd891 Mon Sep 17 00:00:00 2001 From: Cubic Love <7754483+cubiclove@users.noreply.github.com> Date: Tue, 11 Apr 2023 18:20:03 +0100 Subject: [PATCH] Demos: Rename GradientScreensaver to Gradient This brings the name in-line with the naming convention used by the other screensavers 'Starfield' and 'Tubes'. --- Base/res/apps/Gradient.af | 5 ++++ Base/res/apps/GradientScreensaver.af | 5 ---- Userland/Demos/CMakeLists.txt | 2 +- Userland/Demos/Gradient/CMakeLists.txt | 11 ++++++++ .../Gradient.cpp} | 26 +++++++++---------- .../Demos/GradientScreensaver/CMakeLists.txt | 11 -------- 6 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 Base/res/apps/Gradient.af delete mode 100644 Base/res/apps/GradientScreensaver.af create mode 100644 Userland/Demos/Gradient/CMakeLists.txt rename Userland/Demos/{GradientScreensaver/GradientScreensaver.cpp => Gradient/Gradient.cpp} (76%) delete mode 100644 Userland/Demos/GradientScreensaver/CMakeLists.txt diff --git a/Base/res/apps/Gradient.af b/Base/res/apps/Gradient.af new file mode 100644 index 0000000000..a4485f8605 --- /dev/null +++ b/Base/res/apps/Gradient.af @@ -0,0 +1,5 @@ +[App] +Name=Gradient +Executable=/bin/Gradient +Category=Demos/Screensaver +ExcludeFromSystemMenu=true diff --git a/Base/res/apps/GradientScreensaver.af b/Base/res/apps/GradientScreensaver.af deleted file mode 100644 index 6677d4900f..0000000000 --- a/Base/res/apps/GradientScreensaver.af +++ /dev/null @@ -1,5 +0,0 @@ -[App] -Name=Gradient Screensaver -Executable=/bin/GradientScreensaver -Category=Demos/Screensaver -ExcludeFromSystemMenu=true diff --git a/Userland/Demos/CMakeLists.txt b/Userland/Demos/CMakeLists.txt index 4e9c4569e7..411133ae04 100644 --- a/Userland/Demos/CMakeLists.txt +++ b/Userland/Demos/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(CatDog) add_subdirectory(Eyes) -add_subdirectory(GradientScreensaver) +add_subdirectory(Gradient) add_subdirectory(LibGfxDemo) add_subdirectory(LibGfxScaleDemo) add_subdirectory(Mandelbrot) diff --git a/Userland/Demos/Gradient/CMakeLists.txt b/Userland/Demos/Gradient/CMakeLists.txt new file mode 100644 index 0000000000..8c02bd89c2 --- /dev/null +++ b/Userland/Demos/Gradient/CMakeLists.txt @@ -0,0 +1,11 @@ +serenity_component( + Gradient + TARGETS Gradient +) + +set(SOURCES + Gradient.cpp +) + +serenity_app(Gradient ICON app-screensaver) +target_link_libraries(Gradient PRIVATE LibDesktop LibGUI LibCore LibGfx LibMain) diff --git a/Userland/Demos/GradientScreensaver/GradientScreensaver.cpp b/Userland/Demos/Gradient/Gradient.cpp similarity index 76% rename from Userland/Demos/GradientScreensaver/GradientScreensaver.cpp rename to Userland/Demos/Gradient/Gradient.cpp index a5259ffd7e..77a1f61950 100644 --- a/Userland/Demos/GradientScreensaver/GradientScreensaver.cpp +++ b/Userland/Demos/Gradient/Gradient.cpp @@ -17,13 +17,13 @@ #include #include -class Screensaver final : public Desktop::Screensaver { - C_OBJECT(Screensaver) +class Gradient final : public Desktop::Screensaver { + C_OBJECT(Gradient) public: - virtual ~Screensaver() override = default; + virtual ~Gradient() override = default; private: - Screensaver(int width = 64, int height = 48, int interval = 10000); + Gradient(int width = 64, int height = 48, int interval = 10000); RefPtr m_bitmap; void draw(); @@ -31,7 +31,7 @@ private: virtual void timer_event(Core::TimerEvent&) override; }; -Screensaver::Screensaver(int width, int height, int interval) +Gradient::Gradient(int width, int height, int interval) { on_screensaver_exit = []() { GUI::Application::the()->quit(); }; m_bitmap = Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { width, height }).release_value_but_fixme_should_propagate_errors(); @@ -41,20 +41,20 @@ Screensaver::Screensaver(int width, int height, int interval) draw(); } -void Screensaver::paint_event(GUI::PaintEvent& event) +void Gradient::paint_event(GUI::PaintEvent& event) { GUI::Painter painter(*this); painter.add_clip_rect(event.rect()); painter.draw_scaled_bitmap(rect(), *m_bitmap, m_bitmap->rect()); } -void Screensaver::timer_event(Core::TimerEvent&) +void Gradient::timer_event(Core::TimerEvent&) { draw(); update(); } -void Screensaver::draw() +void Gradient::draw() { const Color colors[] { Color::Blue, @@ -95,12 +95,12 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil(nullptr, nullptr)); - auto window = TRY(Desktop::Screensaver::create_window("Screensaver"sv, "app-screensaver"sv)); + auto window = TRY(Desktop::Screensaver::create_window("Gradient"sv, "app-screensaver"sv)); - auto screensaver_window = TRY(window->set_main_widget(64, 48, 10000)); - screensaver_window->set_fill_with_background_color(false); - screensaver_window->set_override_cursor(Gfx::StandardCursor::Hidden); - screensaver_window->update(); + auto gradient_widget = TRY(window->set_main_widget(64, 48, 10000)); + gradient_widget->set_fill_with_background_color(false); + gradient_widget->set_override_cursor(Gfx::StandardCursor::Hidden); + gradient_widget->update(); window->show(); window->move_to_front(); diff --git a/Userland/Demos/GradientScreensaver/CMakeLists.txt b/Userland/Demos/GradientScreensaver/CMakeLists.txt deleted file mode 100644 index d46b533947..0000000000 --- a/Userland/Demos/GradientScreensaver/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -serenity_component( - GradientScreensaver - TARGETS GradientScreensaver -) - -set(SOURCES - GradientScreensaver.cpp -) - -serenity_app(GradientScreensaver ICON app-screensaver) -target_link_libraries(GradientScreensaver PRIVATE LibDesktop LibGUI LibCore LibGfx LibMain)