Skip to content

fix: text color of ToolTip doesn't change with theme #326

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

Closed
18202781743 wants to merge 1 commit into from
Closed

fix: text color of ToolTip doesn't change with theme #326

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
4 changes: 4 additions & 0 deletions qt6/src/qml/FlowStyle.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,10 @@ QtObject {
property int verticalPadding: 4
property int horizontalPadding: 5
property int height: 24
property D.Palette text: D.Palette {
normal: Qt.rgba(0, 0, 0, 1)
normalDark: Qt.rgba(1, 1, 1, 1)
}
}

property QtObject alertToolTip: QtObject {
Expand Down
7 changes: 5 additions & 2 deletions qt6/src/qml/ToolTip.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: LGPL-3.0-or-later

import QtQuick 2.11
import QtQuick
import QtQuick.Templates as T
import org.deepin.dtk 1.0 as D
import org.deepin.dtk.style 1.0 as DS
Expand All @@ -13,6 +13,8 @@ T.ToolTip {
x: parent ? (parent.width - implicitWidth) / 2 : 0
y: -implicitHeight - 3

property D.Palette textColor: DS.Style.toolTip.text

implicitWidth: DS.Style.control.implicitWidth(control)
implicitHeight: DS.Style.control.implicitHeight(control)

Expand All @@ -23,13 +25,14 @@ T.ToolTip {
closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent

contentItem: Text {
property alias textColor: control.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
text: control.text
font: control.font
wrapMode: Text.WordWrap
opacity: enabled ? 1.0 : 0.4
color: control.palette.toolTipText
color: D.ColorSelector.textColor
}

background: FloatingPanel {
Expand Down
7 changes: 5 additions & 2 deletions src/private/dquickcontrolpalette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ DQUICK_BEGIN_NAMESPACE
static inline bool _d_isControlItem(QQuickItem *item) {
#define _D_FOR_EACH_SIMILAR_CONTROL_ITEM(F) \
F(QQuickControl), \
F(QQuickTextField)
F(QQuickTextField), \
F(QQuickText)

#if defined(QT_NAMESPACE)
#define SIMILAR_CONTROL_ITEM_NAMESPACE_STR1(NAME, Item) #NAME "::" #Item
Expand Down Expand Up @@ -461,7 +462,9 @@ void DQuickControlColorSelector::setControl(QQuickItem *newControl)
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("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