AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect rendering of checked menu items on Windows Classic

Browse Source 
Modify rendering of checked menu items when using Windows Classic
style to be more native looking.

Changes:
* Checked menu items with no icon are not drawn sunken
* Disabled checked menu items with an icon have a plain background
  instead of a checkerboard pattern same as when enabled
* Check mark is drawn with highlighted text color when selected to
  match text
* Fix check mark offset for disabled unselected checked menu item
  as the entire check mark was drawn shifted (1, 1)
* Fix color of check mark shadow for disabled unselected checked
  menu item as it was same color as the check mark when it should
  be a light color

Task-number: QTBUG-15098
Merge-request: 2513
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
(cherry picked from commit e89a2b72050dd782da16ff24bc2eb84dc36ed6a5)
This commit is contained in:
Jonathan Liu 2011-04-12 13:55:46 +02:00 committed by Olivier Goffart
parent 758978564c
commit 11140fc40a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/styles/qcommonstyle.cpp
View File

@ -223,16 +223,13 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
--yy;
}
if (!(opt->state & State_Enabled) && !(opt->state & State_On)) {
int pnt;
p->setPen(opt->palette.highlightedText().color());
QPoint offset(1, 1);
for (pnt = 0; pnt < a.size(); ++pnt)
a[pnt].translate(offset.x(), offset.y());
p->save();
p->translate(1, 1);
p->setPen(opt->palette.light().color());
p->drawLines(a);
for (pnt = 0; pnt < a.size(); ++pnt)
a[pnt].translate(offset.x(), offset.y());
p->restore();
}
p->setPen(opt->palette.text().color());
p->setPen((opt->state & State_On) ? opt->palette.highlightedText().color() : opt->palette.text().color());
p->drawLines(a);
break; }
case PE_Frame:

4
src/gui/styles/qwindowsstyle.cpp
View File

@ -1858,8 +1858,8 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
}
QRect vCheckRect = visualRect(opt->direction, menuitem->rect, QRect(menuitem->rect.x(), menuitem->rect.y(), checkcol, menuitem->rect.height()));
if (checked) {
if (act && !dis) {
if (!menuitem->icon.isNull() && checked) {
if (act) {
qDrawShadePanel(p, vCheckRect,
menuitem->palette, true, 1,
&menuitem->palette.brush(QPalette::Button));