feat: little refactor of Desktop Inits

Author: Charliechen114514

desktop/ui/CFDesktop.h

@@ -17,7 +17,7 @@
 #include <QWidget>
 namespace cf::desktop {
 class PanelManager;
-class WidgetShellLayer;
+class IShellLayer;
 class CFDesktopEntity;
 
 /**
@@ -77,11 +77,11 @@ class CF_DESKTOP_EXPORT CFDesktop final : public QWidget {
     /* Managed by Resources */
     struct InitResources {
         PanelManager* panel_manager_{nullptr};
-        WidgetShellLayer* shell_layer_{nullptr};
+        IShellLayer* shell_layer_{nullptr};
     };
 
     PanelManager* panel_manager_{nullptr};
-    WidgetShellLayer* shell_layer_{nullptr};
+    IShellLayer* shell_layer_{nullptr};
 
   private:
     CFDesktop(CFDesktopEntity* entity_object); /* pass the entity objects */

desktop/ui/CFDesktopEntity.cpp

@@ -8,11 +8,9 @@
 #include "components/DisplayServerBackendFactory.h"
 #include "components/IDisplayServerBackend.h"
 #include "components/PanelManager.h"
-#include "components/shell_layer_impl/WallpaperShellLayerStrategy.h"
-#include "components/shell_layer_impl/WidgetShellLayer.h"
-#include "components/wallpaper/ImageWallPaperLayer.h"
 #include "platform/DesktopPropertyStrategyFactory.h"
 #include "platform/display_backend_helper.h"
+#include "platform/shell_layer_helper.h"
 #include "qt_format.h"
 #include <memory>
 
@@ -86,23 +84,21 @@ CFDesktopEntity::RunsSetupResult CFDesktopEntity::run_init(RunsSetupMethod m) {
 
     // ── Create PanelManager and ShellLayer ──
     auto* panel_mgr = new PanelManager(desktop_entity_, desktop_entity_);
-    auto* shell = new WidgetShellLayer(desktop_entity_);
+
+    auto shell_api = platform::native_shell_layer();
+    auto* shell = shell_api.shell_creator(desktop_entity_);
+    auto strategy = shell_api.strategy_creator();
+    shell->setStrategy(std::move(strategy));
 
     // Inject into CFDesktop
     CFDesktop::InitResources res;
     res.panel_manager_ = panel_mgr;
     res.shell_layer_ = shell;
     desktop_entity_->register_desktop_resources(res);
 
-    // Set shell strategy with wallpaper support
-    auto wallpaper_layer = std::make_unique<wallpaper::ImageWallPaperLayer>();
-    auto wallpaper_strategy =
-        std::make_unique<WallpaperShellLayerStrategy>(std::move(wallpaper_layer));
-    shell->setStrategy(std::move(wallpaper_strategy));
-
     // Connect PanelManager geometry changes to ShellLayer
-    QObject::connect(panel_mgr, &PanelManager::availableGeometryChanged, shell,
-                     &WidgetShellLayer::onAvailableGeometryChanged);
+    QObject::connect(panel_mgr, &PanelManager::availableGeometryChanged, desktop_entity_,
+                     [shell](const QRect& r) { shell->onAvailableGeometryChanged(r); });
 
     // Show the desktop full-screen
     desktop_entity_->showFullScreen();

desktop/ui/components/IShellLayer.h

@@ -60,6 +60,16 @@ class IShellLayer {
      * Wayland compositor layers commit the surface.
      */
     virtual void requestRepaint() = 0;
+
+    /**
+     * @brief  Handles changes to the available screen geometry.
+     *
+     * Called when the available geometry changes (e.g., after panel layout).
+     * Implementations should update their geometry and notify the active strategy.
+     *
+     * @param[in]  available  The new available geometry rectangle.
+     */
+    virtual void onAvailableGeometryChanged(const QRect& available) = 0;
 };
 
 } // namespace cf::desktop

desktop/ui/components/shell_layer_impl/CMakeLists.txt

@@ -3,6 +3,7 @@ add_library(cfdesktop_shell_layer_impl STATIC
     WidgetShellLayer.cpp
     DefaultShellLayerStrategy.cpp
     WallpaperShellLayerStrategy.cpp
+    ../wallpaper/wallpaper_setup.cpp
 )
 
 target_include_directories(cfdesktop_shell_layer_impl PUBLIC

desktop/ui/components/shell_layer_impl/WidgetShellLayer.h

@@ -84,7 +84,7 @@ class WidgetShellLayer : public QWidget, public IShellLayer {
      *
      * @param[in] rect  The new available geometry rectangle.
      */
-    void onAvailableGeometryChanged(const QRect& rect);
+    void onAvailableGeometryChanged(const QRect& rect) override;
 
   protected:
     /**

desktop/ui/components/wallpaper/wallpaper_setup.cpp

@@ -0,0 +1,19 @@
+#include "wallpaper/wallpaper_setup.h"
+#include "shell_layer_impl/WallpaperShellLayerStrategy.h"
+#include "wallpaper/ImageWallPaperLayer.h"
+
+namespace cf::desktop::wallpaper {
+
+namespace {
+
+std::unique_ptr<WallPaperLayer> make_layer() {
+    return std::make_unique<ImageWallPaperLayer>();
+}
+
+} // namespace
+
+std::unique_ptr<IShellLayerStrategy> create_wallpaper_strategy() {
+    return std::make_unique<WallpaperShellLayerStrategy>(make_layer());
+}
+
+} // namespace cf::desktop::wallpaper

desktop/ui/components/wallpaper/wallpaper_setup.h

@@ -0,0 +1,28 @@
+/**
+ * @file    desktop/ui/components/wallpaper/wallpaper_setup.h
+ * @brief   Factory for creating a wallpaper shell-layer strategy.
+ *
+ * @author  N/A
+ * @date    N/A
+ * @version N/A
+ * @since   N/A
+ * @ingroup none
+ */
+
+#pragma once
+#include <memory>
+
+namespace cf::desktop {
+class IShellLayerStrategy;
+}
+
+namespace cf::desktop::wallpaper {
+
+/**
+ * @brief Create a wallpaper shell layer strategy with the default wallpaper layer.
+ *
+ * @return std::unique_ptr<IShellLayerStrategy>
+ */
+std::unique_ptr<IShellLayerStrategy> create_wallpaper_strategy();
+
+} // namespace cf::desktop::wallpaper

desktop/ui/platform/CMakeLists.txt

@@ -8,13 +8,15 @@ set(PLATFORM_SOURCES
     IDesktopPropertyStrategy.cpp
     IDesktopDisplaySizeStrategy.cpp
     display_backend_helper.cpp
+    shell_layer_helper.cpp
 )
 
 set(PLATFORM_HEADERS
     platform_helper.h
     DesktopPropertyStrategyFactory.h
     IDesktopPropertyStrategy.h
     display_backend_helper.h
+    shell_layer_helper.h
 )
 
 # Add platform-specific subdirectories

desktop/ui/platform/linux_wsl/linux_wsl_platform.cpp

@@ -1,8 +1,12 @@
 #include "linux_wsl_platform.h"
 #include "IDesktopPropertyStrategy.h"
+#include "components/IShellLayerStrategy.h"
+#include "components/shell_layer_impl/WidgetShellLayer.h"
+#include "components/wallpaper/wallpaper_setup.h"
 #include "display_backend_helper.h"
 #include "linux_wsl_factory.h"
 #include "platform_helper.h"
+#include "shell_layer_helper.h"
 #include "wsl_x11_display_server_backend.h"
 
 namespace cf::desktop::platform_strategy {
@@ -31,4 +35,16 @@ DisplayBackendFactoryAPI native_display_impl() {
     return api;
 }
 
+ShellLayerFactoryAPI native_shell_layer_impl() {
+    ShellLayerFactoryAPI api;
+    api.shell_creator = [](QWidget* parent) -> IShellLayer* {
+        return new WidgetShellLayer(parent);
+    };
+    api.shell_releaser = [](IShellLayer* p) { delete p; };
+    api.strategy_creator = []() -> std::unique_ptr<IShellLayerStrategy> {
+        return wallpaper::create_wallpaper_strategy();
+    };
+    return api;
+}
+
 } // namespace cf::desktop::platform

desktop/ui/platform/shell_layer_helper.cpp

@@ -0,0 +1,12 @@
+#include "shell_layer_helper.h"
+
+namespace cf::desktop::platform {
+
+/* Forward declaration -- each platform provides this */
+ShellLayerFactoryAPI native_shell_layer_impl();
+
+ShellLayerFactoryAPI native_shell_layer() noexcept {
+    return native_shell_layer_impl();
+}
+
+} // namespace cf::desktop::platform