Skip to content

feat: add window blur control to DialogWindow #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wjyrich wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add window blur control to DialogWindow #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions qt6/src/qml/DialogWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: {
Expand Down
23 changes: 21 additions & 2 deletions qt6/src/qml/settings/SettingsDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import org.deepin.dtk 1.0

DialogWindow {
id: control
enableBehindWindowBlur: false
color: palette.base

property list<Settings.SettingsGroup> groups
property QtObject config
Expand Down Expand Up @@ -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
Expand All @@ -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)
Comment thread
wjyrich marked this conversation as resolved.
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
Expand Down
Loading