Skip to content

sync: from linuxdeepin/dtkdeclarative #276

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

Merged
18202781743 merged 1 commit into from
Jul 15, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #276

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
41 changes: 4 additions & 37 deletions qt6/src/qml/AlertToolTip.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,10 @@ ToolTip {
margins: 0
closePolicy: Popup.NoAutoClose

background: Item {
BoxShadow {
anchors.fill: _background
shadowBlur: 20
shadowOffsetY: 6
shadowColor: Qt.rgba(0, 0, 0, 0.2)
cornerRadius: _background.radius
}

Rectangle {
property D.Palette backgroundColor: DS.Style.alertToolTip.background
property D.Palette borderColor: DS.Style.control.border
id: _background
anchors.fill: parent
color: D.ColorSelector.backgroundColor
border.color: D.ColorSelector.borderColor
radius: DS.Style.control.radius
}
background: FloatingPanel {
backgroundColor: DS.Style.alertToolTip.background
insideBorderColor: DS.Style.alertToolTip.insideBorder
outsideBorderColor: DS.Style.alertToolTip.outsideBorder
}

contentItem: Text {
Expand All @@ -59,23 +45,4 @@ ToolTip {
NumberAnimation { properties: "opacity"; from: 1.0; to: 0.0 }
NumberAnimation { properties: "y"; from: control.target.height + DS.Style.control.spacing ; to: control.target.height }
}

BoxShadow {
property D.Palette dropShadowColor: DS.Style.alertToolTip.connecterdropShadow
property D.Palette backgroundColor: DS.Style.alertToolTip.connecterBackground
y: - height * (0.75) - control.topMargin - control.topPadding
width: DS.Style.alertToolTip.connectorWidth
height: DS.Style.alertToolTip.connectorHeight
shadowBlur: 4
shadowOffsetY: 2
shadowColor: D.ColorSelector.dropShadowColor
cornerRadius: _background.radius

Rectangle {
anchors.fill: parent
color: parent.D.ColorSelector.backgroundColor
border.color: _background.D.ColorSelector.borderColor
border.width: 1
}
}
}
2 changes: 1 addition & 1 deletion qt6/src/qml/FloatingPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Control {

Loader {
anchors.fill: backgroundRect
active: control.insideBorderColor && control.D.ColorSelector.controlTheme === D.ApplicationHelper.DarkType
active: control.insideBorderColor
sourceComponent: InsideBoxBorder {
radius: backgroundRect.radius
color: control.D.ColorSelector.insideBorderColor
Expand Down
19 changes: 17 additions & 2 deletions qt6/src/qml/FlowStyle.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,8 @@ QtObject {
}

property D.Palette background: D.Palette {
normal: Qt.rgba(247 / 255, 247 / 255, 247 / 255, 0.6)
normalDark: Qt.rgba(59 / 255, 59 / 255, 59 / 255, 0.6)
normal: Qt.rgba(247 / 255.0, 247 / 255.0, 247 / 255.0, 0.5)
normalDark: Qt.rgba(59 / 255.0, 59 / 255.0, 59 / 255.0, 0.5)
}

property D.Palette connecterdropShadow: D.Palette {
Expand All @@ -631,6 +631,21 @@ QtObject {
normal: Qt.rgba(1, 1, 1, 1)
normalDark: Qt.rgba(0, 0, 0, 0.1)
}

property D.Palette dropShadow: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.1)
normalDark: Qt.rgba(0, 0, 0, 0.2)
}

property D.Palette outsideBorder: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.1)
normalDark: Qt.rgba(0, 0, 0, 0.7)
}

property D.Palette insideBorder: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.3)
normalDark: Qt.rgba(1, 1, 1, 0.1)
}
}

property QtObject menu: QtObject {
Expand Down
Loading