fix(dock): align aibar in fashion mode

Author: shule1987

panels/dock/package/DockPartAppletModel.qml

@@ -47,21 +47,56 @@ D.SortFilterModel {
         property var appletItem: model.data
         property var attachedAppletItem: null
         readonly property string pluginId: appletItem && appletItem.applet ? appletItem.applet.pluginId : ""
+        readonly property bool isAiBarApplet: pluginId === "org.deepin.ds.dock.aibar"
+        readonly property bool horizontalAiBarApplet: isAiBarApplet
+            && Panel.viewMode === Dock.FashionMode
+            && !(Panel.rootObject && Panel.rootObject.useColumnLayout)
+        readonly property int hoverInset: 4
         readonly property bool useUnifiedDockHoverBackground: [
             "org.deepin.ds.dock.launcherapplet",
             "org.deepin.ds.dock.aibar",
             "org.deepin.ds.dock.searchitem",
             "org.deepin.ds.dock.multitaskview"
         ].indexOf(pluginId) >= 0
-        readonly property int unifiedHoverBackgroundSize: Math.round((Panel.rootObject ? Panel.rootObject.dockItemMaxSize * 9 / 14 : 0) + 8)
-        implicitWidth: appletItem ? appletItem.implicitWidth : 0
+        readonly property real aiBarIconSize: appletItem && appletItem.iconWidth !== undefined ? appletItem.iconWidth : 0
+        readonly property real hoverTargetWidth: isAiBarApplet && aiBarIconSize > 0
+            ? aiBarIconSize
+            : (Panel.rootObject ? Panel.rootObject.dockItemMaxSize * 9 / 14 : 0)
+        readonly property real hoverTargetHeight: hoverTargetWidth
+        readonly property real unifiedHoverBackgroundWidth: Math.round(hoverTargetWidth + hoverInset * 2)
+        readonly property real unifiedHoverBackgroundHeight: Math.round(hoverTargetHeight + hoverInset * 2)
+        readonly property real aiBarEdgeMargin: Panel.rootObject
+            ? Math.max(0, (Panel.rootObject.dockSize - hoverTargetHeight) / 2)
+            : 0
+        readonly property real aiBarTrailingInset: Panel.rootObject ? Panel.rootObject.fashionVerticalPadding + 1 : 0
+        readonly property real aiBarContentWidth: appletItem ? appletItem.implicitWidth : 0
+        readonly property real aiBarLayoutWidth: horizontalAiBarApplet
+            ? Math.max(aiBarContentWidth, hoverTargetWidth + aiBarEdgeMargin * 2 - aiBarTrailingInset)
+            : aiBarContentWidth
+        readonly property int aiBarHorizontalOffset: horizontalAiBarApplet
+            ? Math.round(aiBarEdgeMargin)
+            : 0
+        readonly property real aiBarRightPadding: horizontalAiBarApplet
+            ? Math.max(0, aiBarLayoutWidth - aiBarContentWidth)
+            : 0
+        implicitWidth: appletItem ? aiBarLayoutWidth : 0
         implicitHeight: appletItem ? appletItem.implicitHeight : 0
+        rightPadding: aiBarRightPadding
+
+        transform: Translate {
+            x: delegateRoot.aiBarHorizontalOffset
+        }
 
         contentItem: appletItem
         background: AppletItemBackground {
-            anchors.centerIn: parent
-            width: delegateRoot.unifiedHoverBackgroundSize
-            height: delegateRoot.unifiedHoverBackgroundSize
+            x: Math.round(!delegateRoot.isAiBarApplet || (Panel.rootObject && Panel.rootObject.useColumnLayout)
+                          ? (delegateRoot.width - width) / 2
+                          : delegateRoot.hoverInset * -1)
+            y: Math.round(!delegateRoot.isAiBarApplet || !(Panel.rootObject && Panel.rootObject.useColumnLayout)
+                          ? (delegateRoot.height - height) / 2
+                          : delegateRoot.hoverInset * -1)
+            width: delegateRoot.unifiedHoverBackgroundWidth
+            height: delegateRoot.unifiedHoverBackgroundHeight
             radius: height / 5
             enabled: false
             visible: delegateRoot.useUnifiedDockHoverBackground

panels/dock/package/main.qml

@@ -31,7 +31,7 @@ Window {
     readonly property bool adaptiveFashionUsesDirectWindowGeometry: adaptiveFashionMode && Qt.platform.pluginName === "xcb"
     readonly property bool useWindowMarginBasedHideAnimation: adaptiveFashionMode
     readonly property bool useTransformBasedHideAnimation: Qt.platform.pluginName === "xcb" && !useWindowMarginBasedHideAnimation
-    readonly property var promotedCenterPluginIds: ["org.deepin.ds.dock.aibar", "org.deepin.ds.dock.searchitem"]
+    readonly property var promotedCenterPluginIds: ["org.deepin.ds.dock.searchitem"]
     readonly property int fashionDockSpacing: Math.round(dockItemIconSize * 0.75)
     readonly property real fashionPartSpacing: adaptiveFashionMode
         ? dock.roundToPhysicalPixel(fashionDockSpacing)
@@ -401,8 +401,6 @@ Window {
         switch (pluginId) {
         case "org.deepin.ds.dock.launcherapplet":
             return 1200
-        case "org.deepin.ds.dock.aibar":
-            return 1300
         case "org.deepin.ds.dock.searchitem":
             return 1400
         default: {