Skip to content

sync: from linuxdeepin/dtkdeclarative #302

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
Sep 22, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #302

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
3 changes: 3 additions & 0 deletions qt6/src/qml/AlertToolTip.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ ToolTip {
closePolicy: Popup.NoAutoClose

background: FloatingPanel {
radius: DS.Style.alertToolTip.radius
implicitWidth: DS.Style.alertToolTip.width
implicitHeight: DS.Style.alertToolTip.height
backgroundColor: DS.Style.alertToolTip.background
insideBorderColor: DS.Style.alertToolTip.insideBorder
outsideBorderColor: DS.Style.alertToolTip.outsideBorder
Expand Down
7 changes: 5 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 @@ -449,8 +449,8 @@ QtObject {
}

property D.Palette placeholderText: D.Palette {
normal: Qt.rgba(0.33, 0.33, 0.33, 0.4)
normalDark: Qt.rgba(1, 1, 1, 0.3)
normal: Qt.rgba(0, 0, 0, 0.7)
normalDark: Qt.rgba(1, 1, 1, 0.7)
}
}

Expand Down Expand Up @@ -615,6 +615,9 @@ QtObject {
property int connectorHeight: 12
property int verticalPadding: 4
property int horizontalPadding: 10
property int width: 30
property int height: 24
property int radius: 6

property D.Palette text: D.Palette {
normal: ("#e15736")
Expand Down
1 change: 1 addition & 0 deletions qt6/src/qml/TitleBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Item {

property D.Palette textColor: DS.Style.button.text
palette.windowText: D.ColorSelector.textColor
objectName: "ColorSelectorMaster"

HoverHandler {
id: hoverHandler
Expand Down
10 changes: 7 additions & 3 deletions src/private/dquickcontrolpalette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ void DQuickControlColorSelector::findAndSetControlParent()
bool needUpdateControl = true;
bool needUpdateColorFamily = !m_state->familyIsUserSet;
do {
if (needUpdateControl && _d_isControlItem(parentItem)) {
if (needUpdateControl && (_d_isControlItem(parentItem) || specialObjectNameItems().contains(parentItem->objectName()))) {
needUpdateControl = false;
setControl(parentItem);
}
Expand Down Expand Up @@ -467,8 +467,12 @@ void DQuickControlColorSelector::setControl(QQuickItem *newControl)
auto palette = m_control->property("palette").value<QQuickPalette*>();
connect(palette, &QQuickPalette::changed, this, &DQuickControlColorSelector::updateControlTheme);
#endif
connect(m_control, SIGNAL(paletteChanged()), this, SLOT(updateControlTheme()));
connect(m_control, SIGNAL(hoveredChanged()), this, SLOT(updateControlState()));
if (m_control->metaObject()->indexOfSignal("paletteChanged()") != -1) {
connect(m_control, SIGNAL(paletteChanged()), this, SLOT(updateControlTheme()));
}
if (m_control->metaObject()->indexOfSignal("hoveredChanged()") != -1) {
connect(m_control, SIGNAL(hoveredChanged()), this, SLOT(updateControlState()));
}
if (m_control->metaObject()->indexOfSignal("pressedChanged()") != -1) {
connect(m_control, SIGNAL(pressedChanged()), this, SLOT(updateControlState()));
}
Expand Down
Loading