linuxdeepin · Ivy233 · Aug 31, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,7 @@ endif ()
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Werror>)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -119,5 +120,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/DDEShellConfigVersion.cmake" DESTINAT
 
 # add clang-format target for all our real source files
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
-kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
-kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+if(KDE_CLANG_FORMAT_EXECUTABLE)
+    kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+    kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+endif()
diff --git a/applets/dde-apps/amappitemmodel.cpp b/applets/dde-apps/amappitemmodel.cpp
@@ -15,8 +15,8 @@ namespace apps
 {
 AMAppItemModel::AMAppItemModel(QObject *parent)
     : AppItemModel(parent)
-    , m_manager(new ObjectManager("org.desktopspec.ApplicationManager1", "/org/desktopspec/ApplicationManager1", QDBusConnection::sessionBus(), this))
     , m_ready(false)
+    , m_manager(new ObjectManager("org.desktopspec.ApplicationManager1", "/org/desktopspec/ApplicationManager1", QDBusConnection::sessionBus(), this))
 {
     qRegisterMetaType<ObjectInterfaceMap>();
     qDBusRegisterMetaType<ObjectInterfaceMap>();

diff --git a/panels/dock/AppletDockItem.qml b/panels/dock/AppletDockItem.qml
@@ -9,7 +9,7 @@ AppletItem {
     id: appletDockItem
 
     property int dockOrder: 0
-    property bool shouldVisible: Applet.visible && Applet.supported
+    property bool shouldVisible: !!Applet.visible && !!Applet.supported
     property bool useColumnLayout: Panel.position % 2
     implicitWidth: useColumnLayout ? Panel.rootObject.dockSize : Panel.rootObject.dockItemMaxSize * 0.8
     implicitHeight: useColumnLayout ? Panel.rootObject.dockItemMaxSize * 0.8 : Panel.rootObject.dockSize

diff --git a/panels/dock/ShellSurfaceItemProxy.qml b/panels/dock/ShellSurfaceItemProxy.qml
@@ -111,6 +111,7 @@ Item {
     }
     Component.onCompleted: function () {
         impl.surfaceDestroyed.connect(root.surfaceDestroyed)
+        updateCursorShapeConnection()
     }
 
     Connections {
@@ -125,17 +126,31 @@ Item {
                 })
             })
         }
+    }
 
-        function onCursorShapeRequested(cursorShape)
-        {
-            console.log("onCursorShapeRequested:", cursorShape)
-            // Qt::CursorShape range is 0-21, plus 24 (BitmapCursor) and 25 (CustomCursor).
-            // We set a default if the value is out of logical bounds.
-            if (cursorShape < 0 || cursorShape > 25) {
-                root.cursorShape = Qt.ArrowCursor
-            } else {
-                root.cursorShape = cursorShape
-            }
+    property var cursorShapeConnection: null
+
+    onShellSurfaceChanged: updateCursorShapeConnection()
+
+    function updateCursorShapeConnection() {
+        if (cursorShapeConnection) {
+            cursorShapeConnection.disconnect()
+            cursorShapeConnection = null
+        }
+        // cursorShapeRequested only exists on PluginPopup, not on PluginSurface,
+        // so connect dynamically to avoid a QML warning for surfaces lacking it.
+        if (shellSurface && shellSurface.cursorShapeRequested) {
+            cursorShapeConnection = shellSurface.cursorShapeRequested.connect(onCursorShapeRequested)
+        }
+    }
+
+    function onCursorShapeRequested(cursorShape) {
+        // Qt::CursorShape range is 0-21, plus 24 (BitmapCursor) and 25 (CustomCursor).
+        // We set a default if the value is out of logical bounds.
+        if (cursorShape < 0 || cursorShape > 25) {
+            root.cursorShape = Qt.ArrowCursor
+        } else {
+            root.cursorShape = cursorShape
         }
     }
 }
diff --git a/panels/dock/dockhelper.cpp b/panels/dock/dockhelper.cpp
@@ -198,7 +198,7 @@ void DockHelper::updateAllDockWakeArea()
 
 void DockHelper::checkNeedHideOrNot()
 {
-    bool needHide;
+    bool needHide = false;
     switch (parent()->hideMode()) {
     case KeepShowing: {
         // KeepShow. current activeWindow is fullscreend.
@@ -238,7 +238,7 @@ void DockHelper::checkNeedHideOrNot()
 
 void DockHelper::checkNeedShowOrNot()
 {
-    bool needShow;
+    bool needShow = false;
     switch (parent()->hideMode()) {
     case KeepShowing: {
         // KeepShow. currentWindow is not fullscreened.

diff --git a/panels/dock/taskmanager/dockgroupmodel.cpp b/panels/dock/taskmanager/dockgroupmodel.cpp
@@ -42,7 +42,6 @@ DockGroupModel::DockGroupModel(QAbstractItemModel *sourceModel, int role, QObjec
             int parentRow = parent.row();
             if (m_currentActiveWindow.contains(parentRow)) {
                 int currentActive = m_currentActiveWindow.value(parentRow);
-                int windowCount = RoleGroupModel::rowCount(parent);
 
                 // Check if the current active window was removed
                 if (currentActive >= first && currentActive <= last) {

diff --git a/panels/dock/taskmanager/package/AppItem.qml b/panels/dock/taskmanager/package/AppItem.qml
@@ -30,7 +30,10 @@ Item {
     signal dropFilesOnItem(itemId: string, files: list<string>)
     signal dragFinished()
 
-    Drag.active: mouseArea.drag.active
+    // Binding Drag.active to mouseArea.drag.active would make Drag.active read
+    // back the very property it drives (see visible/fixPosition below),
+    // causing a QML binding loop. Set it imperatively from the MouseArea instead.
+    Drag.active: false
     Drag.source: root
     Drag.hotSpot.x: icon.width / 2
     Drag.hotSpot.y: icon.height / 2
@@ -494,6 +497,7 @@ Item {
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         drag.target: root
         drag.onActiveChanged: {
+            root.Drag.active = drag.active
             if (!drag.active) {
                 Panel.contextDragging = false
                 root.dragFinished()

diff --git a/panels/dock/taskmanager/package/TaskManager.qml b/panels/dock/taskmanager/package/TaskManager.qml
@@ -40,16 +40,24 @@ ContainmentItem {
     readonly property real startPadding: Math.max(0, appTitleSpacing - (Panel.rootObject.dockItemMaxSize * (multitaskViewIconRatio - iconWidthToMaxSizeRatio) / 2))
 
     implicitWidth: {
-        let extra = useColumnLayout ? 0 : startPadding
+        // In column layout the width is fixed to the dock size, so do not
+        // depend on appContainer.implicitWidth (the delegates read this
+        // implicitWidth back, which would cause a binding loop).
+        if (useColumnLayout)
+            return Panel.rootObject.dockSize
+        let extra = startPadding
         let w = appContainer.implicitWidth + extra
-        let maxW = Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, w) : Math.min(remainingSpacesForTaskManager, w)
-        return useColumnLayout ? Panel.rootObject.dockSize : maxW
+        return Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, w) : Math.min(remainingSpacesForTaskManager, w)
     }
     implicitHeight: {
-        let extra = useColumnLayout ? startPadding : 0
+        // In row layout the height is fixed to the dock size, so do not
+        // depend on appContainer.implicitHeight (the delegates read this
+        // implicitHeight back, which would cause a binding loop).
+        if (!useColumnLayout)
+            return Panel.rootObject.dockSize
+        let extra = startPadding
         let h = appContainer.implicitHeight + extra
-        let maxH = Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, h) : Math.min(remainingSpacesForTaskManager, h)
-        return useColumnLayout ? maxH : Panel.rootObject.dockSize
+        return Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, h) : Math.min(remainingSpacesForTaskManager, h)
     }
     // Helper function to find the current index of an app by its appId in the visualModel
     function findAppIndex(appId) {
@@ -140,7 +148,10 @@ ContainmentItem {
                     return windows.length > 0 && launcherDndDropArea.launcherDndWinId !== windows[0]
                 }
 
-                ListView.onAdd: NumberAnimation {
+                ListView.onAdd: addAnimation.restart()
+
+                NumberAnimation {
+                    id: addAnimation
                     target: delegateRoot
                     properties: "scale,opacity"
                     from: 0

diff --git a/panels/dock/tray/trayitempositionmanager.cpp b/panels/dock/tray/trayitempositionmanager.cpp
@@ -139,8 +139,15 @@ TrayItemPositionManager::TrayItemPositionManager(QObject *parent)
 
     connect(this, &TrayItemPositionManager::visualItemCountChanged,
             this, &TrayItemPositionManager::updateVisualSize);
+    // Use QueuedConnection for dockHeightChanged to break a synchronous
+    // signal/slot cascade that causes "Binding loop for dockItemMaxSize".
+    // When dockSize changes (e.g. during drag), dockHeightChanged fires
+    // synchronously, calling updateVisualSize -> visualSizeChanged, which
+    // marks dockItemMaxSize dirty (it transitively reads visualSize via
+    // dockRawCenterSpace -> dockRightPart -> tray). Queuing the slot lets
+    // the current binding evaluation finish before visualSize updates.
     connect(this, &TrayItemPositionManager::dockHeightChanged,
-            this, &TrayItemPositionManager::updateVisualSize);
+            this, &TrayItemPositionManager::updateVisualSize, Qt::QueuedConnection);
     connect(this, &TrayItemPositionManager::orientationChanged,
             this, &TrayItemPositionManager::updateVisualSize);
     connect(this, &TrayItemPositionManager::visualItemSizeChanged,

diff --git a/panels/dock/tray/trayitempositionmanager.h b/panels/dock/tray/trayitempositionmanager.h
@@ -15,7 +15,7 @@ struct DropIndex {
     Q_PROPERTY(int index MEMBER index)
     Q_PROPERTY(bool isOnItem MEMBER isOnItem)
     Q_PROPERTY(bool isBefore MEMBER isBefore)
-    QML_ELEMENT
+    QML_NAMED_ELEMENT(dropIndex)
 public:
     int index;
     bool isOnItem = true;

diff --git a/panels/dock/waylanddockhelper.cpp b/panels/dock/waylanddockhelper.cpp
@@ -73,7 +73,7 @@ void WaylandDockHelper::updateOverlapCheckerPos()
     if (!waylandScreen)
         return;
 
-    uint32_t anchor;
+    uint32_t anchor = 0;
     switch (m_panel->position()) {
     case Top:
         anchor = QtWayland::treeland_window_overlap_checker::anchor_top;

diff --git a/panels/notification/center/OverlapNotify.qml b/panels/notification/center/OverlapNotify.qml
@@ -143,7 +143,7 @@ NotifyItem {
 
             OverlapIndicator {
                 id: indicator
-                enableAnimation: root.ListView.view.panelShown
+                enableAnimation: (root.ListView.view && root.ListView.view.panelShown) ?? false
                 clipItems: true
                 anchors {
                     bottom: parent.bottom

diff --git a/tests/panels/notification/server/CMakeLists.txt b/tests/panels/notification/server/CMakeLists.txt
@@ -33,6 +33,8 @@ add_executable(notifyserverapplet_tests
     notifyserverapplet_test.cpp
 )
 
+set_property(TARGET notifyserverapplet_tests APPEND PROPERTY AUTOMOC_MACRO_NAMES "D_APPLET_CLASS")
+
 target_compile_options(notifyserverapplet_tests PRIVATE
     -fvisibility=hidden
     -fvisibility-inlines-hidden
@@ -64,4 +66,4 @@ add_test(
     COMMAND ${CMAKE_COMMAND} -E env
         LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/frame:${CMAKE_BINARY_DIR}/panels/notification
         $<TARGET_FILE:notifyserverapplet_tests>
-)
+)
diff --git a/tests/panels/notification/server/notifyserverapplet_test.cpp b/tests/panels/notification/server/notifyserverapplet_test.cpp
@@ -80,7 +80,7 @@ TEST_F(NotifyServerAppletTest, DestructorMemoryLeakTest) {
     auto *testApplet = new NotifyServerApplet();
 
     // Initialize the applet (creates m_manager, m_worker, and DbusAdaptors)
-    bool initResult = testApplet->init();
+    testApplet->init();
 
     // Even if init fails (e.g., D-Bus not available), we should clean up properly
     // Record the state before deletion