--- src/gui/styles/qwindowsstyle.cpp Ïò ñåí 10 19:05:26 2010 +++ src/gui/styles/qwindowsstyle.cpp Ñð ñåí 22 07:19:05 2010 @@ -1858,13 +1858,23 @@ QRect vCheckRect = visualRect(opt->direction, menuitem->rect, QRect(menuitem->rect.x(), menuitem->rect.y(), checkcol, menuitem->rect.height())); if (checked) { - if (act && !dis) { - qDrawShadePanel(p, vCheckRect, - menuitem->palette, true, 1, - &menuitem->palette.brush(QPalette::Button)); - } else { - QBrush fill(menuitem->palette.light().color(), Qt::Dense4Pattern); - qDrawShadePanel(p, vCheckRect, menuitem->palette, true, 1, &fill); + //if (act && !dis) { + // qDrawShadePanel(p, vCheckRect, + // menuitem->palette, true, 1, + // &menuitem->palette.brush(QPalette::Button)); + //} else { + // QBrush fill(menuitem->palette.light().color(), Qt::Dense4Pattern); + // qDrawShadePanel(p, vCheckRect, menuitem->palette, true, 1, &fill); + //} + if (!menuitem->icon.isNull()) { + if (act && !dis) { + qDrawShadePanel(p, vCheckRect, + menuitem->palette, true, 1, + &menuitem->palette.brush(QPalette::Button)); + } else { + QBrush fill(menuitem->palette.light().color(), Qt::Dense4Pattern); + qDrawShadePanel(p, vCheckRect, menuitem->palette, true, 1, &fill); + } } } else if (!act) { p->fillRect(vCheckRect, menuitem->palette.brush(QPalette::Button)); @@ -1884,9 +1894,9 @@ pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, opt, widget), mode); int pixw = pixmap.width(); int pixh = pixmap.height(); - if (act && !dis && !checked) - qDrawShadePanel(p, vCheckRect, menuitem->palette, false, 1, - &menuitem->palette.brush(QPalette::Button)); + //if (act && !dis && !checked) + // qDrawShadePanel(p, vCheckRect, menuitem->palette, false, 1, + // &menuitem->palette.brush(QPalette::Button)); QRect pmr(0, 0, pixw, pixh); pmr.moveCenter(vCheckRect.center()); p->setPen(menuitem->palette.text().color());