p53209761
/
qt5-ukui-platformtheme
forked from openkylin/qt5-ukui-platformtheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

combobox下拉菜单不需要透明度

This commit is contained in:
tanjing 2023-10-13 10:24:35 +08:00
parent f77d6bbc77
commit 87c10a0e78
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ukui-styles/qt5-config-style-ukui/themeconfig/UKUIConfigDefault.json
View File

@ -304,7 +304,7 @@
"OnHoverPen" : {"value": "0, 0, 0, 0.1", "type": "color"}, "OnHoverPen" : {"value": "0, 0, 0, 0.1", "type": "color"},
"OnClickPen" : {"value": "0, 0, 0, 0.1", "type": "color"}, "OnClickPen" : {"value": "0, 0, 0, 0.1", "type": "color"},
"ContentPen" : {"value": "HighLightText_at", "type": "paletterole"}, "ContentPen" : {"value": "HighLightText_at", "type": "paletterole"},
"DefaultBrush" : {"value": "NoRole_dis", "type": "paletterole"}, "DefaultBrush" : {"value": "255, 255, 255", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"OnDefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "OnDefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"OnHoverBrush" : { "type": "color"}, "OnHoverBrush" : { "type": "color"},

2
ukui-styles/qt5-config-style-ukui/themeconfig/UKUIConfigFashion.json
View File

@ -322,6 +322,7 @@
"RadioButton":{ "RadioButton":{
"DefaultRadioButton":{ "DefaultRadioButton":{
"DefaultPen" : {"value": "140, 140, 140", "type": "color"}, "DefaultPen" : {"value": "140, 140, 140", "type": "color"},
"DisablePen" : {"value": "166, 166, 166", "type": "color"},
"OnDefaultPen" : {"value": "83, 80, 171", "type": "color"}, "OnDefaultPen" : {"value": "83, 80, 171", "type": "color"},
"DefaultBrush" : {"value": "Base_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Base_at", "type": "paletterole"},
"HoverBrush" : { "type": "color"}, "HoverBrush" : { "type": "color"},
@ -727,6 +728,7 @@
"RadioButton":{ "RadioButton":{
"DefaultRadioButton":{ "DefaultRadioButton":{
"DefaultPen" : {"value": "140, 140, 140", "type": "color"}, "DefaultPen" : {"value": "140, 140, 140", "type": "color"},
"DisablePen" : {"value": "255, 255, 255, 0.15", "type": "color"},
"OnDefaultPen" : {"value": "160, 157, 248", "type": "color"}, "OnDefaultPen" : {"value": "160, 157, 248", "type": "color"},
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"OnDefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "OnDefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},

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

@ -2854,9 +2854,6 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
clickBrush = QBrush(configMixColor(defaultBrush.color(), mix, 0.15)); clickBrush = QBrush(configMixColor(defaultBrush.color(), mix, 0.15));
} }
//disable
disablePen = defaultPen;
onHoverPen = onDefaultPen; onHoverPen = onDefaultPen;
if(radioButtonColorCfg.onHoverType == Obj_Color_Type){ if(radioButtonColorCfg.onHoverType == Obj_Color_Type){
//on hover //on hover
@ -2865,6 +2862,8 @@ void UKUIConfigStyleParameters::initConfigRadioButtonParameters(bool isDark, con
} else { } else {
onHoverBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, 0.05)); onHoverBrush = QBrush(configMixColor(onDefaultBrush.color(), mix, 0.05));
} }
//disable
disablePen = defaultPen;
} }
else if(radioButtonColorCfg.onHoverType == Obj_Gradient_Type){ else if(radioButtonColorCfg.onHoverType == Obj_Gradient_Type){
QColor startColor; QColor startColor;
@ -3692,7 +3691,7 @@ void UKUIConfigStyleParameters::initConfigMenuParameters(bool isDark, const QSty
} }
auto color = menuColorCfg.menuBackgroundBrush; auto color = menuColorCfg.menuBackgroundBrush;
if (UKUIStyleSettings::isSchemaInstalled("org.ukui.style")) { if (!widget->inherits("QComboBoxPrivateContainer") && UKUIStyleSettings::isSchemaInstalled("org.ukui.style")) {
auto opacity = UKUIStyleSettings::globalInstance()->get("menuTransparency").toInt()/100.0; auto opacity = UKUIStyleSettings::globalInstance()->get("menuTransparency").toInt()/100.0;
color.setAlphaF(opacity); color.setAlphaF(opacity);
} }

2
ukui-styles/readconfig.cpp
View File

@ -894,7 +894,7 @@ UKUIColorTheme::TableColorCfg ReadThemeConfig::tableColorCfg(const QPalette pale
m_tableColorCfg.hoverGradientList.clear(); m_tableColorCfg.hoverGradientList.clear();
m_readConfig->getGradientValue(m_tableColorCfg.hoverGradientList , m_theme, UKUITable, property, C_Table_HoverBrush); m_readConfig->getGradientValue(m_tableColorCfg.hoverGradientList , m_theme, UKUITable, property, C_Table_HoverBrush);
} }
else if(m_tableColorCfg.hoverType == Obj_Color_Type){ else{
m_readConfig->getColorValue(m_tableColorCfg.hoverBrush, m_theme, UKUITable, property, C_Table_HoverBrush); m_readConfig->getColorValue(m_tableColorCfg.hoverBrush, m_theme, UKUITable, property, C_Table_HoverBrush);
} }
return m_tableColorCfg; return m_tableColorCfg;