sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#374
linuxdeepin · Aug 13, 2024 · b2280f6 · b2280f6
1 parent c2d07b2
commit b2280f6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/qt6/src/qml/DialogTitleBar.qml b/qt6/src/qml/DialogTitleBar.qml
@@ -2,13 +2,13 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-import QtQuick 2.11
-import QtQuick.Window 2.11
-import QtQuick.Layouts 1.11
+import QtQuick
+import QtQuick.Window
+import QtQuick.Layouts
 import org.deepin.dtk 1.0 as D
 import org.deepin.dtk.style 1.0 as DS
 
-Control {
+Item {
     id: control
     z: D.DTK.TopOrder
     width: Window.window.width
@@ -39,15 +39,17 @@ Control {
         }
     }
 
-    background: D.InWindowBlur {
+    D.InWindowBlur {
         id: background
         visible: false
+        anchors.fill: parent
     }
 
-    contentItem: ColumnLayout {
+    ColumnLayout {
         id: content
         spacing: 0
 
+        anchors.fill: parent
         Rectangle {
             id: separatorTop
             Layout.preferredWidth: parent.width
@@ -63,15 +65,18 @@ Control {
             Layout.preferredWidth: parent.width
             Layout.leftMargin: DS.Style.titleBar.leftMargin
 
-            D.DciIcon {
-                id: iconLabel
-                visible: name !== ""
-                mode: control.D.ColorSelector.controlState
-                theme: control.D.ColorSelector.controlTheme
-                palette: D.DTK.makeIconPalette(control.palette)
-                sourceSize {
-                    width: DS.Style.dialogWindow.iconSize
-                    height: DS.Style.dialogWindow.iconSize
+            Control {
+                id: iconControl
+                contentItem: D.DciIcon {
+                    id: iconLabel
+                    visible: name !== ""
+                    mode: iconControl.D.ColorSelector.controlState
+                    theme: iconControl.D.ColorSelector.controlTheme
+                    palette: D.DTK.makeIconPalette(iconControl.palette)
+                    sourceSize {
+                        width: DS.Style.dialogWindow.iconSize
+                        height: DS.Style.dialogWindow.iconSize
+                    }
                 }
             }
 

diff --git a/qt6/src/qml/DialogWindow.qml b/qt6/src/qml/DialogWindow.qml
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-import QtQuick 2.11
-import QtQuick.Layouts 1.11
-import QtQuick.Window 2.11
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
 import org.deepin.dtk 1.0 as D
 import org.deepin.dtk.style 1.0 as DS
 
@@ -31,10 +31,11 @@ Window {
     default property alias content: contentLoader.children
     property alias palette : content.palette
 
-    Control {
+    Item {
         id: content
         palette: control.active ? D.DTK.palette : D.DTK.inactivePalette
-        contentItem: ColumnLayout {
+        implicitHeight: childrenRect.height
+        ColumnLayout {
             id: layout
             spacing: 0