sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#256
linuxdeepin · Dec 19, 2023 · f2736dc · f2736dc
1 parent a8fda73
commit f2736dc
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,7 @@ set(MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/m
 set(QML_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/qml" CACHE STRING "Qml plugin install directory")
 
 set(USE_QQuickStylePluginPrivate OFF)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR}QuickControls2)
 if(EnableQt5)
 if(TARGET Qt::QuickControls2 AND TARGET Qt::QuickControls2Private)

diff --git a/cmake/DtkBuildConfig.cmake b/cmake/DtkBuildConfig.cmake
@@ -88,6 +88,7 @@ function(dtk_extend_target TARGET)
     set(args_option)
     set(args_single
         EnableCov
+        SkipRPATH
     )
     cmake_parse_arguments(PARSE_ARGV 1 arg "${args_option}" "${args_single}" "${args_multi}")
 
@@ -99,4 +100,9 @@ function(dtk_extend_target TARGET)
         endif()
         target_link_libraries(${TARGET} PRIVATE gcov)
     endif()
+
+    # skip RUNPATH avoid to `Insecure RUNPATH`
+    if (arg_SkipRPATH)
+        set_target_properties(${TARGET} PROPERTIES SKIP_BUILD_RPATH ${arg_SkipRPATH})
+    endif()
 endfunction()
diff --git a/docs/DevSpecification.zh_CN.md b/docs/DevSpecification.zh_CN.md
@@ -983,7 +983,7 @@ Settings.SettingsDialog {
                 key: "key"  // Option中的键可以直接绑定到config中同名的属性值
                 name: "ComboBox"
                 Settings.ComboBox {  // Settings封装的基础控件类型
-                    model: ["first", "sceond", "three"]
+                    model: ["first", "second", "three"]
                 }
             }
             Settings.SettingsOption {
@@ -1028,7 +1028,7 @@ Settings.SettingsDialog {
                         key: "key"  // Option中的键可以直接绑定到config中同名的属性值
                         name: "ComboBox"
                         Settings.ComboBox {  // Settings封装的基础控件类型
-                          model: ["first", "sceond", "three"]
+                          model: ["first", "second", "three"]
                         }
                     }
                 },

diff --git a/docs/qml/noqml/dquicksettingcontainer.zh_CN.dox b/docs/qml/noqml/dquicksettingcontainer.zh_CN.dox
@@ -175,7 +175,7 @@
             key: "key2"
             name: "ComboBox"
             ComboBox {
-                model: ["first", "sceond", "third"]
+                model: ["first", "second", "third"]
             }
         }
     }
@@ -447,7 +447,7 @@
         key: "key2"
         name: "ComboBox"
         Settings.ComboBox {
-            model: ["first", "sceond", "third"]
+            model: ["first", "second", "third"]
         }
     }
 ```

diff --git a/docs/qml/settings/SettingDialog.zh_CN.dox b/docs/qml/settings/SettingDialog.zh_CN.dox
@@ -66,7 +66,7 @@
                         Settings.SettingOption {
                             key: "setting1"  // 对应 Config 中的属性名
                             Settings.ComboBox {  // Settings封装的基础控件类型
-                                model: ["first", "sceond", "three"]
+                                model: ["first", "second", "three"]
                             }
                         }
                     }
@@ -121,7 +121,7 @@
                         Settings.SettingOption {
                             key: "setting1"  // 对应 Config 中的属性名
                             Settings.ComboBox {  // Settings封装的基础控件类型
-                                model: ["first", "sceond", "three"]
+                                model: ["first", "second", "three"]
                             }
                         }
                     }

diff --git a/examples/exhibition/CMakeLists.txt b/examples/exhibition/CMakeLists.txt
@@ -31,11 +31,5 @@ set(EXAMPLE_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
 if (EnableQt6)
     set(EXAMPLE_INSTALL_DIR "${LIB_INSTALL_DIR}/dtk${PROJECT_VERSION_MAJOR}/DDeclarative")
 endif()
-configure_package_config_file(
-    "${CMAKE_CURRENT_LIST_DIR}/dtk-exhibition.desktop.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_VERSION_MAJOR}-exhibition.desktop"
-    INSTALL_DESTINATION "${EXAMPLE_INSTALL_DIR}"
-)
 
 install(TARGETS ${BIN_NAME} DESTINATION ${EXAMPLE_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_VERSION_MAJOR}-exhibition.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
diff --git a/examples/exhibition/dtk-exhibition.desktop.in b/examples/exhibition/dtk-exhibition.desktop.in
diff --git a/examples/qml-inspect/Example_settingsdialog.qml b/examples/qml-inspect/Example_settingsdialog.qml
@@ -80,7 +80,7 @@ Rectangle {
                             key: "key2"
                             name: "ComboBox"
                             Settings.ComboBox {
-                                model: ["first", "sceond", "three"]
+                                model: ["first", "second", "three"]
                             }
                         }
                         Settings.SettingsOption {
@@ -146,7 +146,7 @@ Rectangle {
                             key: "option1"
                             name: "option1"
                             ComboBox {
-                                model: ["first", "sceond", "three"]
+                                model: ["first", "second", "three"]
                             }
                         }
                     }

diff --git a/misc/DtkDeclarativeConfig.cmake.in b/misc/DtkDeclarativeConfig.cmake.in
@@ -8,6 +8,7 @@ find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS
     REQUIRED
 )
 include(${CMAKE_CURRENT_LIST_DIR}/Dtk@[email protected])
+include(${CMAKE_CURRENT_LIST_DIR}/Dtk@[email protected])
 set(DTK_QML_APP_PLUGIN_PATH @DTK_QML_APP_PLUGIN_PATH@)
 get_target_property(DtkDeclarative_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Declarative INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(DtkDeclarative_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Declarative INTERFACE_LINK_DIRECTORIES)

diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
@@ -20,7 +20,9 @@ qt_add_qml_module(${LIB_NAME}
 )
 
 dtk_extend_target(${LIB_NAME} EnableCov ${ENABLE_COV})
-dtk_extend_target(${PLUGIN_NAME} EnableCov ${ENABLE_COV})
+dtk_extend_target(${PLUGIN_NAME} EnableCov ${ENABLE_COV}
+    SkipRPATH ON
+)
 
 qt_add_translations(${LIB_NAME}
     TS_FILES ${TS_FILES}

diff --git a/qt6/src/qml/CheckDelegate.qml b/qt6/src/qml/CheckDelegate.qml
@@ -10,9 +10,7 @@ import org.deepin.dtk.style 1.0 as DS
 
 T.CheckDelegate {
     id: control
-    property Component content: Label {
-        text: control.text
-    }
+    property Component content
     property D.Palette backgroundColor: DS.Style.itemDelegate.checkBackgroundColor
 
     implicitWidth: DS.Style.control.implicitWidth(control)
@@ -41,15 +39,20 @@ T.CheckDelegate {
     }
 
     contentItem: RowLayout {
-        spacing: control.spacing
-        D.DciIcon {
-            palette: D.DTK.makeIconPalette(control.palette)
-            mode: control.D.ColorSelector.controlState
-            theme: control.D.ColorSelector.controlTheme
-            name: control.icon.name
-            sourceSize: Qt.size(control.icon.width, control.icon.height)
+        D.IconLabel {
+            spacing: control.spacing
+            mirrored: control.mirrored
+            display: control.display
+            alignment: control.display === D.IconLabel.IconOnly || control.display === D.IconLabel.TextUnderIcon
+                       ? Qt.AlignCenter : Qt.AlignLeft | Qt.AlignVCenter
+            text: control.text
+            font: control.font
+            color: control.palette.windowText
+            icon: D.DTK.makeIcon(control.icon, control.D.DciIcon)
+            Layout.fillWidth: !control.content
         }
         Loader {
+            active: control.content
             sourceComponent: control.content
             Layout.fillWidth: true
         }

diff --git a/qt6/src/qml/settings/CMakeLists.txt b/qt6/src/qml/settings/CMakeLists.txt
@@ -22,7 +22,9 @@ qt_add_qml_module(dtkdeclarativesettingsplugin
         "${PLUGIN_OUTPUT_DIR}/${URI_PATH}/settings"
 )
 
-dtk_extend_target(dtkdeclarativesettingsplugin EnableCov ${ENABLE_COV})
+dtk_extend_target(dtkdeclarativesettingsplugin EnableCov ${ENABLE_COV}
+    SkipRPATH ON
+)
 
 target_link_libraries(dtkdeclarativesettingsplugin
 PRIVATE

diff --git a/src/private/dquickdciiconimage.cpp b/src/private/dquickdciiconimage.cpp
@@ -28,8 +28,7 @@ void DQuickDciIconImageItemPrivate::maybeUpdateUrl()
 {
     Q_Q(DQuickIconImage);
     if (parentPriv->name.isEmpty()) {
-        q->setSource(QUrl());
-        return;
+        return DQuickIconImagePrivate::maybeUpdateUrl();
     }
 
     QUrl url;

diff --git a/src/private/dquickiconimage.cpp b/src/private/dquickiconimage.cpp
@@ -15,6 +15,12 @@ DQUICK_BEGIN_NAMESPACE
 
 bool DQuickIconImagePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps)) {
+        devicePixelRatio = 1.0;
+        return true;
+    }
+#endif
     devicePixelRatio = targetDevicePixelRatio > 1.0 ? targetDevicePixelRatio : calculateDevicePixelRatio();
     return true;
 }

diff --git a/src/private/dquickimageprovider.cpp b/src/private/dquickimageprovider.cpp
@@ -239,9 +239,13 @@ QImage DQuickDciIconProvider::requestImage(const QString &id, QSize *size, const
     // the boundingSize should typically divide by devicePixelRatio,
     // see Qt::AA_UseHighDpiPixmaps.
     int boundingSize = qMax(requestedSize.width(), requestedSize.height());
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (qApp->testAttribute(Qt::AA_UseHighDpiPixmaps)) {
         boundingSize = qRound(boundingSize / devicePixelRatio);
     }
+#else
+    boundingSize = qRound(boundingSize / devicePixelRatio);
+#endif
 
     const auto currentTheme = toDciTheme(theme);
     auto currentMode = mode;

diff --git a/src/qml/CheckDelegate.qml b/src/qml/CheckDelegate.qml
@@ -10,9 +10,7 @@ import org.deepin.dtk.style 1.0 as DS
 
 T.CheckDelegate {
     id: control
-    property Component content: Label {
-        text: control.text
-    }
+    property Component content
     property D.Palette backgroundColor: DS.Style.itemDelegate.checkBackgroundColor
 
     implicitWidth: DS.Style.control.implicitWidth(control)
@@ -41,15 +39,20 @@ T.CheckDelegate {
     }
 
     contentItem: RowLayout {
-        spacing: control.spacing
-        D.DciIcon {
-            palette: D.DTK.makeIconPalette(control.palette)
-            mode: control.D.ColorSelector.controlState
-            theme: control.D.ColorSelector.controlTheme
-            name: control.icon.name
-            sourceSize: Qt.size(control.icon.width, control.icon.height)
+        D.IconLabel {
+            spacing: control.spacing
+            mirrored: control.mirrored
+            display: control.display
+            alignment: control.display === D.IconLabel.IconOnly || control.display === D.IconLabel.TextUnderIcon
+                       ? Qt.AlignCenter : Qt.AlignLeft | Qt.AlignVCenter
+            text: control.text
+            font: control.font
+            color: control.palette.windowText
+            icon: D.DTK.makeIcon(control.icon, control.D.DciIcon)
+            Layout.fillWidth: !control.content
         }
         Loader {
+            active: control.content
             sourceComponent: control.content
             Layout.fillWidth: true
         }

diff --git a/src/qml/FlowStyle.qml b/src/qml/FlowStyle.qml
@@ -294,8 +294,11 @@ QtObject {
 
         property D.Palette text : D.Palette {
             normal: D.DTK.makeColor(D.Color.HighlightedText)
+            normalDark: D.DTK.makeColor(D.Color.HighlightedText)
             hovered: D.DTK.makeColor(D.Color.HighlightedText).lightness(+10)
+            hoveredDark: D.DTK.makeColor(D.Color.HighlightedText).lightness(+10)
             pressed: D.DTK.makeColor(D.Color.HighlightedText).opacity(-20)
+            pressedDark: D.DTK.makeColor(D.Color.HighlightedText).opacity(-20)
         }
 
         property D.Palette dropShadow : D.Palette {
@@ -655,13 +658,17 @@ QtObject {
 
         property D.Palette background: D.Palette {
             normal: D.DTK.makeColor(D.Color.Highlight)
+            normalDark: D.DTK.makeColor(D.Color.Highlight)
             hovered: D.DTK.makeColor(D.Color.Highlight).lightness(+10)
+            hoveredDark: D.DTK.makeColor(D.Color.Highlight).lightness(+10)
         }
         property D.Palette dropShadow:  D.Palette {
             normal: D.DTK.makeColor(D.Color.Highlight).lightness(+20)
+            normalDark: D.DTK.makeColor(D.Color.Highlight).lightness(+20)
         }
         property D.Palette innerShadow:  D.Palette {
             normal: D.DTK.makeColor(D.Color.Highlight).lightness(-20)
+            normalDark: D.DTK.makeColor(D.Color.Highlight).lightness(-20)
         }
     }
 

diff --git a/src/targets.cmake b/src/targets.cmake
@@ -77,4 +77,4 @@ install(FILES ${PUBLIC_HEADERS} ${D_HEADERS} DESTINATION "${INCLUDE_INSTALL_DIR}
 
 # Install ${LIB_NAME}_properties
 install(TARGETS ${LIB_NAME}_properties EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeProperties DESTINATION "${LIB_INSTALL_DIR}")
-install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeProperties NAMESPACE Dtk${DTK_VERSION_MAJOR}:: FILE Dtk${DTK_VERSION_MAJOR}DeclarativeTargets-Properties.cmake DESTINATION "${CONFIG_INSTALL_DIR}")
+install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeProperties NAMESPACE Dtk${DTK_VERSION_MAJOR}:: FILE Dtk${DTK_VERSION_MAJOR}DeclarativePropertiesTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}")