From 59f8bcc1a954ac6ccdf69c2bbb5e7856adc31d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=9F=AF?= Date: Fri, 1 Nov 2024 10:53:25 +0800 Subject: [PATCH] complete the adaptation for QLineEdit. --- .../ukui-config-style-parameters.cpp | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp b/ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp index 06665ca..b5d22dd 100644 --- a/ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp +++ b/ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp @@ -1616,8 +1616,8 @@ void UKUIConfigStyleParameters::getDefaultConfigToolButtonLabelParameters(Config void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const QStyleOption *option, const QWidget *widget) { - int radius = (widget && widget->property("normalRadius").isValid()) ? - widget->property("normalRadius").toInt() : m_radiusStruct.normalRadius; + int radius =m_dtconfig->kradiusNormal(); + bool needTranslucent = false; if (widget && widget->property("needTranslucent").isValid()) { needTranslucent = widget->property("needTranslucent").toBool(); @@ -1627,10 +1627,10 @@ void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const UKUIColorTheme::LineEditColorCfg lineEditColorCfg = readCfg()->lineEditColorCfg(palette, needTranslucent ? C_LineEdit_Translucent : C_LineEdit_Default); - QBrush defaultBrush = lineEditColorCfg.defaultBrush; - QBrush hoverBrush = lineEditColorCfg.hoverBrush; - QBrush focusBrush = lineEditColorCfg.focusBrush; - QBrush disableBrush = lineEditColorCfg.disableBrush; + QBrush defaultBrush = QBrush(m_dtconfig->buttonActive()); + QBrush hoverBrush = QBrush(m_dtconfig->kComponentHover()); + QBrush focusBrush = QBrush(m_dtconfig->kComponentClick()); + QBrush disableBrush = QBrush(m_dtconfig->kComponentDisable()); QPen defaultPen = QPen(lineEditColorCfg.defaultPen, lineEditColorCfg.defaultPen.alpha() == 0 ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen hoverPen = QPen(lineEditColorCfg.hoverPen, lineEditColorCfg.hoverPen.alpha() == 0 ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); @@ -1650,7 +1650,18 @@ void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const linearGradient.setColorAt(1, endColor); hoverBrush = QBrush(linearGradient); } - + bool isImportant = false; + if(widget){ + if (widget->property("isImportant").isValid()) { + isImportant = widget->property("isImportant").toBool(); + } + if(isImportant){ + defaultBrush = QBrush(m_dtconfig->kContainGeneralNormal()); + hoverBrush = QBrush(m_dtconfig->kContainGeneralNormal()); + focusBrush = QBrush(m_dtconfig->kContainGeneralNormal()); + disableBrush = QBrush(m_dtconfig->kContainGeneralNormal()); + } + } auto *w = const_cast(widget); if (w) { w->setProperty("radius", radius);