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

list tree table默认选中为灰色，并增加一个设置选中为高亮色的接口

This commit is contained in:
tanjing 2023-08-30 11:32:00 +08:00
parent 7ce82c4605
commit b6b68dafd9
6 changed files with 164 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ukui-styles/qt5-config-style-ukui/themeconfig/UKUIConfigClassical.json
View File

@ -240,6 +240,13 @@
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"HighlightListView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"TranslucentListView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : {"type": "color"},
@ -255,6 +262,13 @@
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"HighlightTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
}
},
"Table":{
@ -264,6 +278,13 @@
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"HighlightTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
}
},
"CheckBox":{
@ -601,6 +622,13 @@
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"HighlightListView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"TranslucentListView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : {"type": "color"},
@ -616,6 +644,13 @@
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"HighlightTreeView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : { "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
}
},
"Table":{
@ -625,6 +660,13 @@
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
},
"HighlightTable":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : { "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "ButtonText_at", "type": "paletterole"},
"TextSelectPen" : {"value": "ButtonText_at", "type": "paletterole"}
}
},
"CheckBox":{

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

@ -235,6 +235,14 @@
},
"ListView":{
"DefaultListView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : {"value": "0, 0, 0, 0.05", "type": "color"},
"SelectBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightListView":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"HoverBrush" : {"value": "0, 0, 0, 0.05", "type": "color"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -253,6 +261,14 @@
},
"TreeView":{
"DefaultTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "0, 0, 0, 0.05", "type": "color"},
"SelectBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "0, 0, 0, 0.05", "type": "color"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -263,6 +279,14 @@
},
"Table":{
"DefaultTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "0, 0, 0, 0.05", "type": "color"},
"SelectBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "0, 0, 0, 0.05", "type": "color"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -619,6 +643,14 @@
},
"ListView":{
"DefaultListView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "255, 255, 255, 0.15", "type": "color"},
"SelectBrush" : {"value": "64, 64, 64", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightListView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "255, 255, 255, 0.15", "type": "color"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -637,6 +669,14 @@
},
"TreeView":{
"DefaultTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "255, 255, 255, 0.15", "type": "color"},
"SelectBrush" : {"value": "64, 64, 64", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "255, 255, 255, 0.15", "type": "color"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -647,6 +687,14 @@
},
"Table":{
"DefaultTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "255, 255, 255, 0.15", "type": "color"},
"SelectBrush" : {"value": "64, 64, 64", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"value": "255, 255, 255, 0.15", "type": "color"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},

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

@ -233,6 +233,14 @@
},
"ListView":{
"DefaultListView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"type": "gradient"},
"SelectBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightListView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"type": "gradient"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -250,6 +258,14 @@
},
"TreeView":{
"DefaultTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -260,6 +276,14 @@
},
"Table":{
"DefaultTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -613,6 +637,14 @@
},
"ListView":{
"DefaultListView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"type": "gradient"},
"SelectBrush" : {"value": "64, 64, 64", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightListView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : {"type": "gradient"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -630,6 +662,14 @@
},
"TreeView":{
"DefaultTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "64, 64, 64", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTreeView":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},
@ -640,6 +680,14 @@
},
"Table":{
"DefaultTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "64, 64, 64", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextHoverPen" : {"value": "Text_at", "type": "paletterole"},
"TextSelectPen" : {"value": "Text_at", "type": "paletterole"}
},
"HighlightTable":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"HoverBrush" : { "type": "gradient"},
"SelectBrush" : {"value": "HighLight_at", "type": "paletterole"},

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

@ -2125,11 +2125,15 @@ void UKUIConfigStyleParameters::initConfigListParameters(bool isDark, const QSty
int radius = m_radiusStruct.normalRadius;
bool needTranslucent = false;
bool highlightMode = false;
if (widget && widget->property("highlightMode").isValid()) {
highlightMode = widget->property("highlightMode").toBool();
}
if (widget && widget->property("needTranslucent").isValid()) {
needTranslucent = widget->property("needTranslucent").toBool();
}
UKUIColorTheme::ListViewColorCfg listViewColorCfg = readCfg()->listViewColorCfg(option->palette ,needTranslucent ? C_ListView_Translucent : C_ListView_Default);
UKUIColorTheme::ListViewColorCfg listViewColorCfg = readCfg()->listViewColorCfg(option->palette, highlightMode ? C_ListView_Highlight : (needTranslucent ? C_ListView_Translucent : C_ListView_Default));
QBrush defaultBrush = listViewColorCfg.defaultBrush;
QBrush hoverBrush = listViewColorCfg.hoverBrush;
@ -2261,7 +2265,11 @@ void UKUIConfigStyleParameters::initConfigTreeParameters(bool isDark, const QSty
{
int radius = m_radiusStruct.normalRadius;;
UKUIColorTheme::TreeViewColorCfg treeViewColorCfg = readCfg()->treeViewColorCfg(option->palette, C_TreeView_Default);
bool highlightMode = false;
if (widget && widget->property("highlightMode").isValid()) {
highlightMode = widget->property("highlightMode").toBool();
}
UKUIColorTheme::TreeViewColorCfg treeViewColorCfg = readCfg()->treeViewColorCfg(option->palette, highlightMode ? C_TreeView_HighLight : C_TreeView_Default);
QBrush defaultBrush = treeViewColorCfg.defaultBrush;
QBrush hoverBrush = treeViewColorCfg.hoverBrush;
@ -2400,8 +2408,13 @@ void UKUIConfigStyleParameters::initConfigTreeParameters(bool isDark, const QSty
void UKUIConfigStyleParameters::initConfigTableParameters(bool isDark, const QStyleOption *option, const QWidget *widget)
{
int radius = m_radiusStruct.normalRadius;;
UKUIColorTheme::TableColorCfg tableColorCfg = readCfg()->tableColorCfg(option->palette, C_Table_Default);
int radius = m_radiusStruct.normalRadius;
bool highlightMode = false;
if (widget && widget->property("highlightMode").isValid()) {
highlightMode = widget->property("highlightMode").toBool();
}
UKUIColorTheme::TableColorCfg tableColorCfg = readCfg()->tableColorCfg(option->palette, highlightMode ? C_Table_Highlight : C_Table_Default);
QBrush defaultBrush = tableColorCfg.defaultBrush;
QBrush hoverBrush = QBrush(tableColorCfg.hoverBrush);

6
ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
View File

@ -2200,6 +2200,12 @@ void UKUIConfigStyle::drawPrimitive(QStyle::PrimitiveElement element, const QSty
target = HighLightEffect::ordinaryGeneratePixmap(pixmap, option, widget);
else if(!sp->indicatorIconHoverNeedHighLight)
target = HighLightEffect::ordinaryGeneratePixmap(pixmap, option, widget);
else if(widget && (widget->inherits("QTreeView") || widget->inherits("QTreeWidget"))){
if(widget->property("highlightMode").isValid() && widget->property("highlightMode").toBool())
target = HighLightEffect::bothOrdinaryAndHoverGeneratePixmap(pixmap, option, widget);
else
target = HighLightEffect::ordinaryGeneratePixmap(pixmap, option, widget);
}
else
target = HighLightEffect::bothOrdinaryAndHoverGeneratePixmap(pixmap, option, widget);

3
ukui-styles/themeinformation.h
View File

@ -184,6 +184,7 @@
#define UKUITable "Table"
#define C_Table_Default "DefaultTable"
#define C_Table_Highlight "HighlightTable"
#define C_Table_DefaultBrush "DefaultBrush"
#define C_Table_HoverBrush "HoverBrush"
#define C_Table_SelectBrush "SelectBrush"
@ -195,6 +196,7 @@
#define UKUIListView "ListView"
#define C_ListView_Default "DefaultListView"
#define C_ListView_Highlight "HighlightListView"
#define C_ListView_Translucent "TranslucentListView"
#define C_ListView_DefaultBrush "DefaultBrush"
#define C_ListView_HoverBrush "HoverBrush"
@ -207,6 +209,7 @@
#define UKUITreeView "TreeView"
#define C_TreeView_Default "DefaultTreeView"
#define C_TreeView_HighLight "HighlightTreeView"
#define C_TreeView_Translucent "TranslucentTreeView"
#define C_TreeView_DefaultBrush "DefaultBrush"
#define C_TreeView_HoverBrush "HoverBrush"