Skip to content

fix: fix show-desktop line color error #309

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
yixinshark merged 1 commit into from
May 6, 2024
Merged

fix: fix show-desktop line color error #309

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
9 changes: 9 additions & 0 deletions panels/dock/DockPalette.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,13 @@ Item {

property D.Palette taskmanagerWindowIndicatorActiveColor: D.DTK.palette.highlight

property D.Palette showDesktopLineColor: D.Palette {
normal {
common: Qt.rgba(0, 0, 0, 0.2)
}
normalDark {
common: Qt.rgba(1, 1, 1, 0.2)
}
}

}
14 changes: 11 additions & 3 deletions panels/dock/showdesktop/package/showdesktop.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import QtQuick 2.15
import QtQuick.Controls 2.15

import org.deepin.ds 1.0
import org.deepin.dtk 1.0 as D
import org.deepin.ds.dock 1.0

AppletItem {
id: showdesktop
Expand All @@ -23,13 +25,19 @@ AppletItem {
color: "gray"
opacity: 0.01
}
Rectangle {

Control {
anchors.left: parent.left
anchors.top: parent.top
implicitWidth: showdesktop.implicitWidth === showDesktopWidth ? 1 : showdesktop.implicitWidth
implicitHeight: showdesktop.implicitWidth === showDesktopWidth ? showdesktop.implicitHeight : 1
color: "gray"
opacity: 0.5

Rectangle {
property D.Palette lineColor: DockPalette.showDesktopLineColor

anchors.fill: parent
color: D.ColorSelector.lineColor
}
}

MouseArea {
Expand Down