openkylin
/
qt5-ukui-platformtheme
mirror of https://gitee.com/openkylin/qt5-ukui-platformtheme.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

DT is adapted to all widgets.

This commit is contained in:
李柯 2024-11-21 14:41:12 +08:00
parent 3ef263daf9
commit 2d2ba3dead
1 changed files with 107 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp
View File

@ -1611,19 +1611,19 @@ void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const
QBrush focusBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentClick()); QBrush focusBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentClick());
QBrush disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentDisable()); QBrush disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentDisable());
QPen defaultPen = QPen(lineEditColorCfg.defaultPen, lineEditColorCfg.defaultPen.alpha() == 0 ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen defaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentNormal()).color(), parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentNormal()).color().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); QPen hoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentHover()).color(), parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentHover()).color().alpha() == 0 ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen focusPen = QPen(lineEditColorCfg.focusPen, m_adjustColorRules == 0 ? 2 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen focusPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentClick()).color(), m_adjustColorRules == 0 ? 2 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen disablePen = QPen(lineEditColorCfg.disablePen, lineEditColorCfg.disablePen.alpha() == 0 ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen disablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentDisable()).color(), parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentDisable()).color().alpha() == 0 ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
if(lineEditColorCfg.hoverType == Obj_Gradient_Type){ if(m_dtconfig->kComponentHover().colorType() == Qt::LinearGradientPattern){
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(option ? option->rect.topLeft() : QPoint(0, 0)); linearGradient.setStart(option ? option->rect.topLeft() : QPoint(0, 0));
linearGradient.setFinalStop(option ? option->rect.bottomLeft() :QPoint(0, 0)); linearGradient.setFinalStop(option ? option->rect.bottomLeft() :QPoint(0, 0));
startColor = lineEditColorCfg.hoverGradientList.value(0); startColor = m_dtconfig->kComponentHover().mixStartColor();
endColor = lineEditColorCfg.hoverGradientList.value(1); endColor = m_dtconfig->kComponentHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
@ -1639,6 +1639,10 @@ void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const
hoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal()); hoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
focusBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal()); focusBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal()); disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
defaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color(), parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color().alpha() == 0 ? 0 : m_dtconfig->focusline(), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
hoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color(), parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color().alpha() == 0 ? 0 : m_dtconfig->focusline(), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
focusPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color(), m_adjustColorRules == 0 ? 2 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
disablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color(), parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()).color().alpha() == 0 ? 0 : m_dtconfig->focusline(), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
} }
} }
auto *w = const_cast<QWidget *>(widget); auto *w = const_cast<QWidget *>(widget);
@ -1777,14 +1781,14 @@ void UKUIConfigStyleParameters::initConfigSpinBoxParameters(bool isDark, const Q
if (isHorizonLayout) if (isHorizonLayout)
hoverPen.setWidth(m_adjustColorRules == 0 ? 2 : 1); hoverPen.setWidth(m_adjustColorRules == 0 ? 2 : 1);
if(spinBoxColorCfg.hoverType == Obj_Gradient_Type) { if(m_dtconfig->kComponentHover().colorType() == Qt::LinearGradientPattern) {
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0, 0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0, 0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0, 0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0, 0) : option->rect.bottomLeft());
startColor = spinBoxColorCfg.hoverGradientList.value(0); startColor = m_dtconfig->kComponentHover().mixStartColor();
endColor = spinBoxColorCfg.hoverGradientList.value(1); endColor = m_dtconfig->kComponentHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
@ -1812,15 +1816,15 @@ void UKUIConfigStyleParameters::initConfigSpinBoxParameters(bool isDark, const Q
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB:{ case AdjustColorRules::DefaultRGB:{
//up hover //up hover
if (spinBoxColorCfg.upHoverBrushType == Obj_Gradient_Type) { if (m_dtconfig->kComponentHover().colorType() == Qt::LinearGradientPattern) {
startColor = spinBoxColorCfg.upHoverBrushGradientList.value(0); startColor = m_dtconfig->kComponentHover().mixStartColor();
endColor = spinBoxColorCfg.upHoverBrushGradientList.value(1); endColor = m_dtconfig->kComponentHover().mixEndColor();
upLinearGradient.setColorAt(0, startColor); upLinearGradient.setColorAt(0, startColor);
upLinearGradient.setColorAt(1, endColor); upLinearGradient.setColorAt(1, endColor);
upHoverBrush = QBrush(upLinearGradient); upHoverBrush = QBrush(upLinearGradient);
startColor = spinBoxColorCfg.downHoverBrushGradientList.value(0); startColor = m_dtconfig->kComponentHover().mixStartColor();
endColor = spinBoxColorCfg.downHoverBrushGradientList.value(1); endColor = m_dtconfig->kComponentHover().mixEndColor();
downLinearGradient.setColorAt(0, startColor); downLinearGradient.setColorAt(0, startColor);
downLinearGradient.setColorAt(1, endColor); downLinearGradient.setColorAt(1, endColor);
downHoverBrush = QBrush(downLinearGradient); downHoverBrush = QBrush(downLinearGradient);
@ -1828,13 +1832,13 @@ void UKUIConfigStyleParameters::initConfigSpinBoxParameters(bool isDark, const Q
//up focus hover //up focus hover
if(!isHorizonLayout){ if(!isHorizonLayout){
if (spinBoxColorCfg.upFocusHoverBrushType == Obj_Color_Type) { if (m_dtconfig->kComponentClick().colorType() == Qt::SolidPattern) {
if (isDark) { if (isDark) {
upFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.2)); upFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else { } else {
upFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.05)); upFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
} }
} else if (spinBoxColorCfg.upFocusHoverBrushType == Obj_Gradient_Type) { } else if (m_dtconfig->kComponentClick().colorType() == Qt::LinearGradientPattern) {
if (isDark) { if (isDark) {
startColor = configMixColor(highlight, QColor(Qt::white), 0.2); startColor = configMixColor(highlight, QColor(Qt::white), 0.2);
@ -1843,20 +1847,21 @@ void UKUIConfigStyleParameters::initConfigSpinBoxParameters(bool isDark, const Q
startColor = configMixColor(highlight, QColor(Qt::black), 0.05); startColor = configMixColor(highlight, QColor(Qt::black), 0.05);
endColor = configMixColor(highlight, QColor(Qt::black), 0.2); endColor = configMixColor(highlight, QColor(Qt::black), 0.2);
} }
startColor = m_dtconfig->kComponentClick().mixStartColor();
endColor = m_dtconfig->kComponentClick().mixEndColor();
upLinearGradient.setColorAt(0, startColor); upLinearGradient.setColorAt(0, startColor);
upLinearGradient.setColorAt(1, endColor); upLinearGradient.setColorAt(1, endColor);
upFocusHoverBrush = QBrush(upLinearGradient); upFocusHoverBrush = QBrush(upLinearGradient);
} }
//down focus hover //down focus hover
if(spinBoxColorCfg.downFocusHoverBrushType == Obj_Color_Type) { if(m_dtconfig->kComponentClick().colorType() == Qt::SolidPattern) {
if (isDark) { if (isDark) {
downFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.2)); downFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else { } else {
downFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.05)); downFocusHoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
} }
} else if (spinBoxColorCfg.downFocusHoverBrushType == Obj_Gradient_Type) { } else if (m_dtconfig->kComponentClick().colorType() == Qt::LinearGradientPattern) {
if (isDark) { if (isDark) {
startColor = configMixColor(highlight, QColor(Qt::white), 0.2); startColor = configMixColor(highlight, QColor(Qt::white), 0.2);
endColor = configMixColor(highlight, QColor(Qt::white), 0.05); endColor = configMixColor(highlight, QColor(Qt::white), 0.05);
@ -1864,7 +1869,8 @@ void UKUIConfigStyleParameters::initConfigSpinBoxParameters(bool isDark, const Q
startColor = configMixColor(highlight, QColor(Qt::black), 0.05); startColor = configMixColor(highlight, QColor(Qt::black), 0.05);
endColor = configMixColor(highlight, QColor(Qt::black), 0.2); endColor = configMixColor(highlight, QColor(Qt::black), 0.2);
} }
startColor = m_dtconfig->kComponentClick().mixStartColor();
endColor = m_dtconfig->kComponentClick().mixEndColor();
downLinearGradient.setColorAt(0, startColor); downLinearGradient.setColorAt(0, startColor);
downLinearGradient.setColorAt(1, endColor); downLinearGradient.setColorAt(1, endColor);
downFocusHoverBrush = QBrush(downLinearGradient); downFocusHoverBrush = QBrush(downLinearGradient);
@ -2295,15 +2301,15 @@ void UKUIConfigStyleParameters::initConfigListParameters(bool isDark, const QSty
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB: case AdjustColorRules::DefaultRGB:
//hover //hover
if (listViewColorCfg.hoverType == Obj_Gradient_Type) { if (m_dtconfig->kContainHover().colorType() == Qt::LinearGradientPattern) {
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
startColor = listViewColorCfg.hoverGradientList.value(0); startColor = m_dtconfig->kContainHover().mixStartColor();
endColor = listViewColorCfg.hoverGradientList.value(1); endColor = m_dtconfig->kContainHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
@ -2432,7 +2438,7 @@ void UKUIConfigStyleParameters::getHighlightModeConfigListParameters(ConfigListP
void UKUIConfigStyleParameters::initConfigTreeParameters(bool isDark, const QStyleOption *option, const QWidget *widget, bool highlight) void UKUIConfigStyleParameters::initConfigTreeParameters(bool isDark, const QStyleOption *option, const QWidget *widget, bool highlight)
{ {
int radius = (widget && widget->property("normalRadius").isValid()) ? int radius = (widget && widget->property("normalRadius").isValid()) ?
widget->property("normalRadius").toInt() : m_radiusStruct.normalRadius; widget->property("normalRadius").toInt() : m_dtconfig->kradiusNormal();
bool highlightMode = highlight; bool highlightMode = highlight;
if (widget && widget->property("highlightMode").isValid()) { if (widget && widget->property("highlightMode").isValid()) {
@ -2443,18 +2449,19 @@ void UKUIConfigStyleParameters::initConfigTreeParameters(bool isDark, const QSty
UKUIColorTheme::TreeViewColorCfg treeViewColorCfg = readCfg()->treeViewColorCfg(palette, UKUIColorTheme::TreeViewColorCfg treeViewColorCfg = readCfg()->treeViewColorCfg(palette,
highlightMode ? C_TreeView_HighLight : C_TreeView_Default); highlightMode ? C_TreeView_HighLight : C_TreeView_Default);
QBrush defaultBrush = treeViewColorCfg.defaultBrush; QBrush defaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->baseActive());
QBrush hoverBrush = treeViewColorCfg.hoverBrush; QBrush hoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainHover());
QBrush selectBrush = treeViewColorCfg.selectBrush; QBrush selectBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainClick());
QBrush disableBrush = treeViewColorCfg.disableBrush; QBrush disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->baseActive());
QPen textHoverPen = QPen(treeViewColorCfg.textHoverPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen textSelectPen = QPen(treeViewColorCfg.textSelectPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen textHoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kFontPrimary()).color(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen textDisablePen = QPen(treeViewColorCfg.textDisablePen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen textSelectPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kFontPrimary()).color(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen hoverPen = QPen(treeViewColorCfg.hoverPen, (treeViewColorCfg.hoverPen == Qt::NoPen || treeViewColorCfg.hoverPen.alpha() == 0) QPen textDisablePen = QPen(parseDTColor(option ? option->rect : QRect(),m_dtconfig->kFontSecondaryDisable()).color(), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen hoverPen = QPen(parseDTColor(option ? option->rect : QRect(),m_dtconfig->kContainHover()).color(), (parseDTColor(option ? option->rect : QRect(),m_dtconfig->kContainHover()).color() == Qt::NoPen || parseDTColor(option ? option->rect : QRect(),m_dtconfig->kContainHover()).color().alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen selectPen = QPen(treeViewColorCfg.selectPen, (treeViewColorCfg.selectPen == Qt::NoPen || treeViewColorCfg.selectPen.alpha() == 0) QPen selectPen = QPen(treeViewColorCfg.selectPen, (treeViewColorCfg.selectPen == Qt::NoPen || treeViewColorCfg.selectPen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen focusPen = QPen(treeViewColorCfg.focusPen, (treeViewColorCfg.focusPen == Qt::NoPen || treeViewColorCfg.focusPen.alpha() == 0) QPen focusPen = QPen(parseDTColor(option ? option->rect : QRect(),m_dtconfig->kLineBrandNormal()).color(), (parseDTColor(option ? option->rect : QRect(),m_dtconfig->kLineBrandNormal()).color() == Qt::NoPen || parseDTColor(option ? option->rect : QRect(),m_dtconfig->kLineBrandNormal()).color().alpha() == 0)
? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QBrush branchDefaultBrush = treeViewColorCfg.branchDefaultBrush; QBrush branchDefaultBrush = treeViewColorCfg.branchDefaultBrush;
@ -2466,14 +2473,14 @@ void UKUIConfigStyleParameters::initConfigTreeParameters(bool isDark, const QSty
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB:{ case AdjustColorRules::DefaultRGB:{
//hover //hover
if (treeViewColorCfg.hoverType == Obj_Gradient_Type) { if (m_dtconfig->kContainHover().colorType() == Qt::LinearGradientPattern) {
QLinearGradient linearGradient; QLinearGradient linearGradient;
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
startColor = treeViewColorCfg.hoverGradientList.value(0); startColor = m_dtconfig->kContainHover().mixStartColor();
endColor = treeViewColorCfg.hoverGradientList.value(1); endColor = m_dtconfig->kContainHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
@ -2667,14 +2674,14 @@ void UKUIConfigStyleParameters::initConfigTableParameters(bool isDark, const QSt
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB:{ case AdjustColorRules::DefaultRGB:{
if(tableColorCfg.hoverType == Obj_Gradient_Type) { if(m_dtconfig->kComponentHover().colorType() == Qt::LinearGradientPattern) {
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
startColor = tableColorCfg.hoverGradientList.value(0); startColor = m_dtconfig->kComponentHover().mixStartColor();
endColor = tableColorCfg.hoverGradientList.value(1); endColor = m_dtconfig->kComponentHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
@ -2818,7 +2825,7 @@ void UKUIConfigStyleParameters::initConfigCheckBoxParameters(bool isDark, const
QPen defaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen defaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen hoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen hoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen clickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen clickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen disablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen disablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineDisable()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen onDefaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onDefaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen onHoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onHoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen onClickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onClickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
@ -2840,23 +2847,23 @@ void UKUIConfigStyleParameters::initConfigCheckBoxParameters(bool isDark, const
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB:{ case AdjustColorRules::DefaultRGB:{
if (checkboxColorCfg.hoverType == Obj_Gradient_Type) { if (m_dtconfig->kComponentHover().colorType() == Qt::LinearGradientPattern) {
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
startColor = checkboxColorCfg.hoverGradientList.value(0); startColor = m_dtconfig->kComponentHover().mixStartColor();
endColor = checkboxColorCfg.hoverGradientList.value(1); endColor = m_dtconfig->kComponentHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
} }
if(checkboxColorCfg.onHoverType == Obj_Color_Type){ if(m_dtconfig->kBrandHover().colorType() == Qt::SolidPattern){
onHoverBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, isDark? 0.2 : 0.05)); onHoverBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, isDark? 0.2 : 0.05));
onClickBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, isDark ? 0.05 : 0.2)); onClickBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, isDark ? 0.05 : 0.2));
} else if (checkboxColorCfg.onHoverType == Obj_Gradient_Type) { } else if (m_dtconfig->kBrandHover().colorType() == Qt::LinearGradientPattern) {
//on default //on default
QColor DefaultPenColor = palette.color(QPalette::Active, QPalette::Highlight); QColor DefaultPenColor = palette.color(QPalette::Active, QPalette::Highlight);
QColor onDefaultPenColor = configMixColor(DefaultPenColor, mix, 0.1); QColor onDefaultPenColor = configMixColor(DefaultPenColor, mix, 0.1);
@ -2873,6 +2880,7 @@ void UKUIConfigStyleParameters::initConfigCheckBoxParameters(bool isDark, const
onHoverPen = QPen(QBrush(onHoverPenColor), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); onHoverPen = QPen(QBrush(onHoverPenColor), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
@ -2883,6 +2891,9 @@ void UKUIConfigStyleParameters::initConfigCheckBoxParameters(bool isDark, const
startColor = configMixColor(onDefaultBrush.color(), QColor(Qt::white), 0.05); startColor = configMixColor(onDefaultBrush.color(), QColor(Qt::white), 0.05);
endColor = configMixColor(onDefaultBrush.color(), QColor(Qt::black), 0.2); endColor = configMixColor(onDefaultBrush.color(), QColor(Qt::black), 0.2);
} }
startColor = m_dtconfig->kBrandHover().mixStartColor();
endColor = m_dtconfig->kBrandHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
onHoverBrush = QBrush(linearGradient); onHoverBrush = QBrush(linearGradient);
@ -2908,8 +2919,8 @@ void UKUIConfigStyleParameters::initConfigCheckBoxParameters(bool isDark, const
case AdjustColorRules::HSL:{ case AdjustColorRules::HSL:{
normalButtonColor(isDark, palette, defaultPen, defaultBrush, hoverPen, hoverBrush, normalButtonColor(isDark, palette, defaultPen, defaultBrush, hoverPen, hoverBrush,
clickPen, clickBrush, disablePen, disableBrush); clickPen, clickBrush, disablePen, disableBrush);
defaultPen = QPen(checkboxColorCfg.defaultPen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); defaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
disablePen = QPen(checkboxColorCfg.disablePen, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); disablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineDisable()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
//on default //on default
@ -3079,8 +3090,8 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
QPen onClickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen onClickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineNormal()), 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QBrush defaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->buttonActive()); QBrush defaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->buttonActive());
QBrush hoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentClick()); QBrush hoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentHover());
QBrush clickBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentHover()); QBrush clickBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentClick());
QBrush disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->buttonDisable()); QBrush disableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->buttonDisable());
QBrush onDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive()); QBrush onDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->highLightActive());
QBrush onClickBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kBrandClick()); QBrush onClickBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kBrandClick());
@ -3090,12 +3101,12 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
QBrush childrenOnDisableBrush = QBrush(QColor(179, 179, 179)); QBrush childrenOnDisableBrush = QBrush(QColor(179, 179, 179));
QBrush onHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kBrandHover()); QBrush onHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kBrandHover());
if (radioButtonColorCfg.onHoverType == Obj_Gradient_Type) { if (m_dtconfig->kBrandHover().colorType() == Qt::LinearGradientPattern) {
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
linearGradient.setColorAt(0, radioButtonColorCfg.onHoverGradientList.value(0)); linearGradient.setColorAt(0, m_dtconfig->kBrandHover().mixStartColor());
linearGradient.setColorAt(1, radioButtonColorCfg.onHoverGradientList.value(1)); linearGradient.setColorAt(1, m_dtconfig->kBrandHover().mixEndColor());
onHoverBrush = QBrush(linearGradient); onHoverBrush = QBrush(linearGradient);
} }
@ -3124,7 +3135,7 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
// } // }
onHoverPen = onDefaultPen; onHoverPen = onDefaultPen;
if (radioButtonColorCfg.onHoverType == Obj_Color_Type) { if (m_dtconfig->kBrandHover().colorType() == Qt::SolidPattern) {
//on hover //on hover
if (isDark) { if (isDark) {
onHoverBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, 0.2)); onHoverBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, 0.2));
@ -3133,7 +3144,7 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
} }
//disable //disable
// disablePen = defaultPen; // disablePen = defaultPen;
} else if (radioButtonColorCfg.onHoverType == Obj_Gradient_Type) { } else if (m_dtconfig->kBrandHover().colorType() == Qt::LinearGradientPattern) {
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
@ -3146,6 +3157,8 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
startColor = configMixColor(onDefaultBrush.color(), QColor(Qt::white), 0.05); startColor = configMixColor(onDefaultBrush.color(), QColor(Qt::white), 0.05);
endColor = configMixColor(onDefaultBrush.color(), QColor(Qt::black), 0.2); endColor = configMixColor(onDefaultBrush.color(), QColor(Qt::black), 0.2);
} }
startColor = m_dtconfig->kBrandHover().mixStartColor();
endColor = m_dtconfig->kBrandHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
onHoverBrush = QBrush(linearGradient); onHoverBrush = QBrush(linearGradient);
@ -3338,18 +3351,18 @@ void UKUIConfigStyleParameters::initConfigSliderParameters(bool isDark, const QS
QBrush grooveUnvalueHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->midlightDisable()); QBrush grooveUnvalueHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->midlightDisable());
QBrush grooveUnvalueDisableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->midlightDisable()); QBrush grooveUnvalueDisableBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->midlightDisable());
QPen handleDefaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()) , (sliderColorCfg.handleDefaultPen.alpha() == 0 || QPen handleDefaultPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() , (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color().alpha() == 0 ||
sliderColorCfg.handleDefaultPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen handleHoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()) , (sliderColorCfg.handleHoverPen.alpha() == 0 || QPen handleHoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() , (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color().alpha() == 0 ||
sliderColorCfg.handleHoverPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen handleClickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()) , (sliderColorCfg.handleClickPen.alpha() == 0 || QPen handleClickPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() , (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color().alpha() == 0 ||
sliderColorCfg.handleClickPen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen handleDisablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandDisable()) , (sliderColorCfg.handleDisablePen.alpha() == 0 || QPen handleDisablePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandDisable()).color() , (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandDisable()).color().alpha() == 0 ||
sliderColorCfg.handleDisablePen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandDisable()).color() == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen sliderGroovePen = QPen(sliderColorCfg.sliderGroovePen , (sliderColorCfg.sliderGroovePen.alpha() == 0 || QPen sliderGroovePen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentNormal()).color() , (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentNormal()).color().alpha() == 0 ||
sliderColorCfg.sliderGroovePen == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentNormal()).color() == Qt::NoPen) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPen focusPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()) , (sliderColorCfg.focusPen.alpha() == 0 || QPen focusPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() , (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() .alpha() == 0 ||
sliderColorCfg.focusPen == Qt::NoPen) ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineBrandNormal()).color() == Qt::NoPen) ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QPainterPath handlePath; QPainterPath handlePath;
int radius = (widget && widget->property("normalRadius").isValid()) ? int radius = (widget && widget->property("normalRadius").isValid()) ?
@ -3366,17 +3379,19 @@ void UKUIConfigStyleParameters::initConfigSliderParameters(bool isDark, const QS
QColor highlight = palette.color(QPalette::Active, QPalette::Highlight); QColor highlight = palette.color(QPalette::Active, QPalette::Highlight);
QColor mix = palette.color(QPalette::Active, QPalette::BrightText); QColor mix = palette.color(QPalette::Active, QPalette::BrightText);
if (sliderColorCfg.handleHoverType == Obj_Color_Type) { if (m_dtconfig->kBrandHover().colorType() == Qt::SolidPattern) {
//handle hover //handle hover
if (isDark) { if (isDark) {
handleHoverBrush = QBrush(configMixColor(highlight, mix, 0.2)); handleHoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else { } else {
handleHoverBrush = QBrush(configMixColor(highlight, mix, 0.05)); handleHoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
} }
} else if (sliderColorCfg.handleHoverType == Obj_Gradient_Type) { } else if (m_dtconfig->kBrandHover().colorType() == Qt::LinearGradientPattern) {
//handle hover //handle hover
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
startColor = m_dtconfig->kBrandHover().mixStartColor();
endColor = m_dtconfig->kBrandHover().mixEndColor();
QLinearGradient linearGradient; QLinearGradient linearGradient;
if (!horizontal) { if (!horizontal) {
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topRight()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topRight());
@ -3717,10 +3732,17 @@ void UKUIConfigStyleParameters::initConfigProgressBarParameters(bool isDark, con
m_ProgressBarParameters.progressBarGrooveDisablePen = grooveDisablePen; m_ProgressBarParameters.progressBarGrooveDisablePen = grooveDisablePen;
m_ProgressBarParameters.progressBarContentBrush = QBrush(QColor(0,200,0)); m_ProgressBarParameters.progressBarContentBrush = QBrush(QColor(0,200,0));
m_ProgressBarParameters.progressBarGrooveDefaultBrush = grooveDefaultBrush; m_ProgressBarParameters.progressBarGrooveDefaultBrush = QBrush(QColor(255,200,0));
m_ProgressBarParameters.progressBarGrooveDisableBrush = grooveDisableBrush; m_ProgressBarParameters.progressBarGrooveDisableBrush = QBrush(QColor(255,0,200));
m_ProgressBarParameters.progressBarContentHightColor = QColor(0,0,0); m_ProgressBarParameters.progressBarContentHightColor = QColor(0,0,0);
m_ProgressBarParameters.progressBarContentMidLightColor = startColor; m_ProgressBarParameters.progressBarContentMidLightColor = startColor;
m_ProgressBarParameters.progressBarContentBrush = contentBrush;
m_ProgressBarParameters.progressBarGrooveDefaultBrush = grooveDefaultBrush;
m_ProgressBarParameters.progressBarGrooveDisableBrush = grooveDisableBrush;
m_ProgressBarParameters.progressBarContentHightColor = endColor;
m_ProgressBarParameters.progressBarContentMidLightColor = startColor;
} }
void UKUIConfigStyleParameters::getDefaultProgressBarParameters(ConfigProgressBarParameters *p, bool isDark) void UKUIConfigStyleParameters::getDefaultProgressBarParameters(ConfigProgressBarParameters *p, bool isDark)
@ -3750,7 +3772,7 @@ void UKUIConfigStyleParameters::initConfigScrollBarParameters(bool isDark, const
needTranslucent ? C_ScrollBar_Translucent : C_ScrollBar_Default); needTranslucent ? C_ScrollBar_Translucent : C_ScrollBar_Default);
QBrush grooveDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal()); QBrush grooveDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
QBrush grooveInactiveBrush = scrollBarColorCfg.grooveInactiveBrush; QBrush grooveInactiveBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
QBrush sliderDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kGray6()); QBrush sliderDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kGray6());
QBrush sliderHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainHover()); QBrush sliderHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainHover());
QBrush sliderClickBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainClick()); QBrush sliderClickBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainClick());
@ -3789,7 +3811,7 @@ void UKUIConfigStyleParameters::initConfigScrollBarParameters(bool isDark, const
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB: case AdjustColorRules::DefaultRGB:
if (!needTranslucent) { if (!needTranslucent) {
if (scrollBarColorCfg.sliderHoverType == Obj_Gradient_Type) { if (m_dtconfig->kContainHover().colorType() == Qt::LinearGradientPattern) {
if (bar && bar->orientation == Qt::Horizontal) { if (bar && bar->orientation == Qt::Horizontal) {
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
@ -3797,9 +3819,8 @@ void UKUIConfigStyleParameters::initConfigScrollBarParameters(bool isDark, const
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topRight()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topRight());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.topLeft());
} }
startColor = scrollBarColorCfg.sliderHoverGradientList.value(0); startColor = m_dtconfig->kContainHover().mixStartColor();
endColor = scrollBarColorCfg.sliderHoverGradientList.value(1); endColor = m_dtconfig->kContainHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
sliderHoverBrush = QBrush(linearGradient); sliderHoverBrush = QBrush(linearGradient);
@ -3946,7 +3967,7 @@ void UKUIConfigStyleParameters::initConfigTabWidgetParameters(bool isDark, const
UKUIColorTheme::TabWidgetColorCfg tabWidgetColorCfg = readCfg()->tabWidgetColorCfg(palette, C_TabWidget_Default); UKUIColorTheme::TabWidgetColorCfg tabWidgetColorCfg = readCfg()->tabWidgetColorCfg(palette, C_TabWidget_Default);
QBrush widgetBackgroundBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->baseActive()); QBrush widgetBackgroundBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->baseActive());
QBrush tabBarBackgroundBrush = tabWidgetColorCfg.tabBarBackgroundBrush; QBrush tabBarBackgroundBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
QBrush tabBarDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal()); QBrush tabBarDefaultBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
QBrush tabBarHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainHover()); QBrush tabBarHoverBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainHover());
QBrush tabBarSelectBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal()); QBrush tabBarSelectBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kContainGeneralNormal());
@ -3967,15 +3988,15 @@ void UKUIConfigStyleParameters::initConfigTabWidgetParameters(bool isDark, const
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB: case AdjustColorRules::DefaultRGB:
if (tabWidgetColorCfg.tabBarHoverType == Obj_Gradient_Type) { if (m_dtconfig->kContainHover().colorType() == Qt::LinearGradientPattern) {
//tabbar hover //tabbar hover
QColor startColor; QColor startColor;
QColor endColor; QColor endColor;
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft()); linearGradient.setStart(!option ? QPoint(0,0) : option->rect.topLeft());
linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft()); linearGradient.setFinalStop(!option ? QPoint(0,0) : option->rect.bottomLeft());
startColor = tabWidgetColorCfg.tabBarHoverGradientList.value(0); startColor = m_dtconfig->kContainHover().mixStartColor();
endColor = tabWidgetColorCfg.tabBarHoverGradientList.value(1); endColor = m_dtconfig->kContainHover().mixEndColor();
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
tabBarHoverBrush = QBrush(linearGradient); tabBarHoverBrush = QBrush(linearGradient);
@ -4070,7 +4091,7 @@ void UKUIConfigStyleParameters::initConfigTabWidgetParameters(bool isDark, const
m_TabWidgetParameters.radius = tabradius; m_TabWidgetParameters.radius = tabradius;
m_TabWidgetParameters.tabWidgetBackgroundBrush = widgetBackgroundBrush; m_TabWidgetParameters.tabWidgetBackgroundBrush = widgetBackgroundBrush;
m_TabWidgetParameters.tabBarBackgroundBrush = tabBarBackgroundBrush; m_TabWidgetParameters.tabBarBackgroundBrush = QBrush(QColor(255,0,0));
m_TabWidgetParameters.tabBarDefaultBrush = tabBarDefaultBrush; m_TabWidgetParameters.tabBarDefaultBrush = tabBarDefaultBrush;
m_TabWidgetParameters.tabBarHoverBrush = tabBarHoverBrush; m_TabWidgetParameters.tabBarHoverBrush = tabBarHoverBrush;
m_TabWidgetParameters.tabBarClickBrush = tabBarClickBrush; m_TabWidgetParameters.tabBarClickBrush = tabBarClickBrush;
@ -4116,10 +4137,11 @@ void UKUIConfigStyleParameters::initConfigMenuParameters(bool isDark, const QSty
QPen menuBackgroundPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineWindowAcitive()), (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineWindowAcitive()).color().alpha() == 0 || QPen menuBackgroundPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineWindowAcitive()), (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineWindowAcitive()).color().alpha() == 0 ||
parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineWindowAcitive()).color() == Qt::NoPen ) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineWindowAcitive()).color() == Qt::NoPen ) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
QBrush itemSelectBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentHover()); QBrush itemSelectBrush = parseDTColor(option ? option->rect : QRect(), m_dtconfig->kComponentClick());
QPen menuHoverPen = menuColorCfg.menuTextHoverPen; QPen menuHoverPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kFontPrimary()), (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kFontPrimary()).color().alpha() == 0 ||
QPen menuItemFocusPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentHover()), (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentHover()).color().alpha() == 0 || parseDTColor(option ? option->rect : QRect(), m_dtconfig->kFontPrimary()).color() == Qt::NoPen ) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentHover()).color() == Qt::NoPen ) ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QPen menuItemFocusPen = QPen(parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentClick()), (parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentClick()).color().alpha() == 0 ||
parseDTColor(option ? option->rect : QRect(), m_dtconfig->kLineComponentClick()).color() == Qt::NoPen ) ? 0 : 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
//item select brush //item select brush
switch (m_adjustColorRules) { switch (m_adjustColorRules) {