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

fixbug192192 combobox下拉框里有的有图标，有的没有图标时，文字需要跟图标对齐

This commit is contained in:
tanjing 2023-10-25 11:32:40 +08:00 committed by xibowen
parent 3777b9f9d4
commit 2e672ea3cd
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ukui-styles/qt5-style-ukui/qt5-ukui-style.cpp
View File

@ -5342,15 +5342,17 @@ void Qt5UKUIStyle::drawControl(QStyle::ControlElement element, const QStyleOptio
bool hasIcon = false; bool hasIcon = false;
if(isComboBox) if(isComboBox)
{ {
auto *comboBox = qobject_cast<const QComboBox*>(widget); if(!menuItem->icon.isNull())
int column = comboBox->count();
for(int i = 0; i < column; i++)
{
if(!comboBox->itemIcon(i).isNull()){
hasIcon = true; hasIcon = true;
break; // auto *comboBox = qobject_cast<const QComboBox*>(widget);
} // int column = comboBox->count();
} // for(int i = 0; i < column; i++)
// {
// if(!comboBox->itemIcon(i).isNull()){
// hasIcon = true;
// break;
// }
// }
} }
else if(menuItem->maxIconWidth != 0) else if(menuItem->maxIconWidth != 0)
hasIcon = true; hasIcon = true;