diff --git a/qt6/src/qml/DialogWindow.qml b/qt6/src/qml/DialogWindow.qml index 5e5b899e8..ff77d5c0a 100644 --- a/qt6/src/qml/DialogWindow.qml +++ b/qt6/src/qml/DialogWindow.qml @@ -21,6 +21,7 @@ Window { D.DWindow.wmWindowTypes: D.WindowManagerHelper.DialogType flags: Qt.Dialog | Qt.WindowCloseButtonHint | Qt.MSWindowsFixedSizeDialogHint D.ColorSelector.family: D.Palette.CrystalColor + property bool enableBehindWindowBlur: true color: "transparent" height: content.height width: content.width @@ -34,6 +35,7 @@ Window { property real topPadding: title === "" ? 0 : DS.Style.dialogWindow.contentVMargin D.StyledBehindWindowBlur { + visible: control.enableBehindWindowBlur control: control anchors.fill: parent blendColor: { diff --git a/qt6/src/qml/settings/SettingsDialog.qml b/qt6/src/qml/settings/SettingsDialog.qml index e11726df0..6b67d514a 100644 --- a/qt6/src/qml/settings/SettingsDialog.qml +++ b/qt6/src/qml/settings/SettingsDialog.qml @@ -10,6 +10,8 @@ import org.deepin.dtk 1.0 DialogWindow { id: control + enableBehindWindowBlur: false + color: palette.base property list groups property QtObject config @@ -39,6 +41,7 @@ DialogWindow { ListView { id: navigationView + clip: true model: container.navigationModel leftMargin: DS.Style.settings.navigation.margin rightMargin: DS.Style.settings.navigation.margin @@ -57,14 +60,30 @@ DialogWindow { left: navigationBg.right top: control.top } - padding: DS.Style.settings.content.margin + height: Math.max(0, control.height - parent.y) + leftPadding: DS.Style.settings.content.margin + rightPadding: DS.Style.settings.content.margin + topPadding: DS.Style.settings.content.margin + bottomPadding: DS.Style.settings.content.margin background: Rectangle { anchors.fill: parent - color: palette.base + color: palette.window + radius: DS.Style.control.radius + Rectangle { + anchors { + fill: parent + leftMargin: contentBg.leftPadding + rightMargin: contentBg.rightPadding + topMargin: contentBg.topPadding + bottomMargin: contentBg.bottomPadding + } + color: palette.base + } } ListView { id: contentView + clip: true model: container.contentModel highlightRangeMode: ListView.StrictlyEnforceRange currentIndex: 0