Splash screen improvements

misc/dconfig/CMakeLists.txt

@@ -1,5 +1,6 @@
 install(FILES
     "org.deepin.dde.treeland.json"
+    "org.deepin.dde.treeland.app.json"
     "org.deepin.dde.treeland.user.json"
     "org.deepin.dde.treeland.output.json"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/dsg/configs/org.deepin.dde.treeland"

misc/dconfig/org.deepin.dde.treeland.app.json

@@ -0,0 +1,72 @@
+{
+    "magic": "dsg.config.meta",
+    "version": "1.0",
+    "contents": {
+        "enablePrelaunchSplash": {
+            "value": true,
+            "serial": 0,
+            "flags": ["global"],
+            "name": "Enable Prelaunch Splash",
+            "name[zh_CN]": "启用预启动闪屏",
+            "description": "Whether to show prelaunch splash for this app",
+            "description[zh_CN]": "是否为此应用显示预启动闪屏",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "lastWindowWidth": {
+            "value": 800,
+            "serial": 0,
+            "flags": ["global"],
+            "name": "Last Window Width",
+            "name[zh_CN]": "上次关闭时的窗口宽度",
+            "description": "Window width saved when the window was last closed",
+            "description[zh_CN]": "记录窗口上次关闭时的宽度",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "lastWindowHeight": {
+            "value": 600,
+            "serial": 0,
+            "flags": ["global"],
+            "name": "Last Window Height",
+            "name[zh_CN]": "上次关闭时的窗口高度",
+            "description": "Window height saved when the window was last closed",
+            "description[zh_CN]": "记录窗口上次关闭时的高度",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "splashThemeType": {
+            "value": 0,
+            "serial": 0,
+            "flags": ["global"],
+            "name": "Splash Theme Type",
+            "name[zh_CN]": "闪屏主题类型",
+            "description": "Splash theme preference: 0 follow system, 1 light, 2 dark",
+            "description[zh_CN]": "闪屏主题偏好：0 跟随系统，1 亮色，2 暗色",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "splashDarkPalette": {
+            "value": "#181818",
+            "serial": 0,
+            "flags": ["global"],
+            "name": "Splash Dark Palette",
+            "name[zh_CN]": "闪屏暗色配色",
+            "description": "Background color used when splash theme is dark",
+            "description[zh_CN]": "闪屏使用暗色主题时的背景色",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "splashLightPalette": {
+            "value": "#FFFFFF",
+            "serial": 0,
+            "flags": ["global"],
+            "name": "Splash Light Palette",
+            "name[zh_CN]": "闪屏亮色配色",
+            "description": "Background color used when splash theme is light",
+            "description[zh_CN]": "闪屏使用亮色主题时的背景色",
+            "permissions": "readwrite",
+            "visibility": "public"
+        }
+    }
+}

misc/dconfig/org.deepin.dde.treeland.user.json

@@ -234,13 +234,13 @@
             "visibility": "public"
         },
         "windowThemeType": {
-            "value": 0,
+            "value": 1,
             "serial": 0,
             "flags": ["global"],
             "name": "Global Window Theme Type",
             "name[zh_CN]": "全局窗口主题类型",
-            "description": "Set all window theme type",
-            "description[zh_CN]": "设置所有窗口的主题类型",
+            "description": "System theme type: 1 light, 2 dark",
+            "description[zh_CN]": "系统主题类型：1 亮色，2 暗色",
             "permissions": "readwrite",
             "visibility": "public"
         },

src/CMakeLists.txt

@@ -86,6 +86,13 @@ dtk_add_config_to_cpp(
     CLASS_NAME "OutputConfig"
 )
 
+dtk_add_config_to_cpp(
+    APP_CONFIG
+    "${PROJECT_SOURCE_DIR}/misc/dconfig/org.deepin.dde.treeland.app.json"
+    OUTPUT_FILE_NAME "appconfig.hpp"
+    CLASS_NAME "AppConfig"
+)
+
 qt_add_library(libtreeland SHARED)
 
 set_target_properties(libtreeland PROPERTIES
@@ -104,6 +111,7 @@ qt_add_qml_module(libtreeland
         ${TREELAND_CONFIG}
         ${TREELAND_USER_CONFIG}
         ${OUTPUT_CONFIG}
+        ${APP_CONFIG}
         common/treelandlogging.cpp
         common/treelandlogging.h
         core/layersurfacecontainer.cpp
@@ -120,7 +128,8 @@ qt_add_qml_module(libtreeland
         core/treeland.h
         core/windowpicker.cpp
         core/windowpicker.h
-        core/windowsizestore.h
+        core/windowconfigstore.cpp
+        core/windowconfigstore.h
         effects/tquickradiuseffect.cpp
         effects/tquickradiuseffect.h
         effects/tquickradiuseffect_p.h

src/core/qml/PrelaunchSplash.qml

@@ -11,6 +11,7 @@ Item {
 
     required property real initialRadius
     property var iconBuffer
+    required property color backgroundColor
     property bool destroyAfterFade: false
     signal destroyRequested
 
@@ -19,7 +20,7 @@ Item {
 
     Rectangle {
         id: background
-        color: "#ffffff" // TODO(rewine): Use theme color if available
+        color: splash.backgroundColor
         anchors.fill: parent
         radius: initialRadius
 

src/core/qmlengine.cpp

@@ -1,17 +1,17 @@
-// Copyright (C) 2024 UnionTech Software Technology Co., Ltd.
+// Copyright (C) 2024-2026 UnionTech Software Technology Co., Ltd.
 // SPDX-License-Identifier: Apache-2.0 OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qmlengine.h"
 
+#include "common/treelandlogging.h"
 #include "core/rootsurfacecontainer.h"
 #include "modules/capture/capture.h"
 #include "output/output.h"
 #include "surface/surfacewrapper.h"
 #include "workspace/workspace.h"
-#include "common/treelandlogging.h"
 
 #include <woutput.h>
 #include <woutputitem.h>
 
 #include <QQuickItem>
 
@@ -194,7 +194,8 @@
     return createComponent(dockPreviewComponent, parent);
 }
 
-QQuickItem *QmlEngine::createLockScreen([[maybe_unused]] Output *output, [[maybe_unused]] QQuickItem *parent)
+QQuickItem *QmlEngine::createLockScreen([[maybe_unused]] Output *output,
+                                        [[maybe_unused]] QQuickItem *parent)
 {
 #ifndef DISABLE_DDM
     return createComponent(lockScreenComponent,
@@ -256,10 +257,16 @@
     return createComponent(fpsDisplayComponent, parent);
 }
 
-QQuickItem *QmlEngine::createPrelaunchSplash(QQuickItem *parent, qreal initialRadius, QW_NAMESPACE::qw_buffer *iconBuffer)
+QQuickItem *QmlEngine::createPrelaunchSplash(QQuickItem *parent,
+                                             qreal initialRadius,
+                                             QW_NAMESPACE::qw_buffer *iconBuffer,
+                                             const QColor &backgroundColor)
 {
-    return createComponent(prelaunchSplashComponent, parent, {
-         { "initialRadius", QVariant::fromValue(initialRadius) },
-         { "iconBuffer", QVariant::fromValue(iconBuffer) },
-    });
+    return createComponent(prelaunchSplashComponent,
+                           parent,
+                           {
+                               { "initialRadius", QVariant::fromValue(initialRadius) },
+                               { "iconBuffer", QVariant::fromValue(iconBuffer) },
+                               { "backgroundColor", QVariant::fromValue(backgroundColor) },
+                           });
 }

src/core/qmlengine.h

@@ -1,11 +1,13 @@
-// Copyright (C) 2024 UnionTech Software Technology Co., Ltd.
+// Copyright (C) 2024-2026 UnionTech Software Technology Co., Ltd.
 // SPDX-License-Identifier: Apache-2.0 OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #pragma once
 
 #include <wglobal.h>
+
 #include <qwglobal.h>
 
+#include <QColor>
 #include <QQmlApplicationEngine>
 #include <QQmlComponent>
 
@@ -67,11 +69,13 @@
     QQuickItem *createShowDesktopAnimation(SurfaceWrapper *surface, QQuickItem *parent, bool show);
     QQuickItem *createCaptureSelector(QQuickItem *parent, CaptureManagerV1 *captureManager);
     QQuickItem *createWindowPicker(QQuickItem *parent);
-    QQuickItem *createLockScreenFallback(QQuickItem *parent, const QVariantMap &properties = QVariantMap());
+    QQuickItem *createLockScreenFallback(QQuickItem *parent,
+                                         const QVariantMap &properties = QVariantMap());
     QQuickItem *createFpsDisplay(QQuickItem *parent);
     QQuickItem *createPrelaunchSplash(QQuickItem *parent,
                                       qreal initialRadius,
-                                      QW_NAMESPACE::qw_buffer *iconBuffer = nullptr);
+                                      QW_NAMESPACE::qw_buffer *iconBuffer,
+                                      const QColor &backgroundColor);
 
     QQmlComponent *surfaceContentComponent()
     {