|
|
|
|
@ -4660,8 +4660,8 @@ namespace Breeze |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
QColor outlineColor; |
|
|
|
|
if( sunken ) outlineColor = _helper->focusColor( palette ); |
|
|
|
|
else if( selected ) outlineColor = _helper->hoverColor( palette ); |
|
|
|
|
if( sunken ) outlineColor = _helper->alphaColor( palette.text().color(), 0.1 ); |
|
|
|
|
else if( selected ) outlineColor = _helper->alphaColor( palette.text().color(), 0.05 ); |
|
|
|
|
_helper->renderFocusRect( painter, rect, outlineColor ); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
@ -4686,9 +4686,7 @@ namespace Breeze |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
if( useStrongFocus && sunken ) iconMode = QIcon::Selected; |
|
|
|
|
else if( useStrongFocus && selected ) iconMode = QIcon::Active; |
|
|
|
|
else iconMode = QIcon::Normal; |
|
|
|
|
iconMode = QIcon::Normal; |
|
|
|
|
|
|
|
|
|
iconState = sunken ? QIcon::On : QIcon::Off; |
|
|
|
|
|
|
|
|
|
@ -4716,7 +4714,7 @@ namespace Breeze |
|
|
|
|
const auto textRect = option->fontMetrics.boundingRect( rect, textFlags, menuItemOption->text ); |
|
|
|
|
|
|
|
|
|
// render text
|
|
|
|
|
const QPalette::ColorRole role = (useStrongFocus && sunken ) ? QPalette::HighlightedText : QPalette::WindowText; |
|
|
|
|
const QPalette::ColorRole role = QPalette::WindowText; |
|
|
|
|
drawItemText( painter, textRect, textFlags, palette, enabled, menuItemOption->text, role ); |
|
|
|
|
|
|
|
|
|
// render outline
|
|
|
|
|
|