diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp index 58dc1c4..d57c369 100644 --- a/src/gui/styles/qwindowsvistastyle.cpp +++ b/src/gui/styles/qwindowsvistastyle.cpp @@ -1344,6 +1344,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption int xm = windowsItemFrame + checkcol + windowsItemHMargin; int xpos = menuitem->rect.x() + xm; QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin); + qDebug() << __FUNCTION__ << textRect << menuitem->text; QRect vTextRect = visualRect(option->direction, menuitem->rect, textRect); QString s = menuitem->text; if (!s.isEmpty()) { // draw text diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 23062d7..ea52bb0 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -364,6 +364,7 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const tearoffHeight; int x = hmargin + fw + leftmargin; y = base_y; + qDebug() << __FUNCTION__<< ncols; for(int i = 0; i < actions.count(); i++) { QRect &rect = actionRects[i]; @@ -379,9 +380,12 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const //we need to update the widgets geometry if (QWidget *widget = widgetItems.value(actions.at(i))) { + qDebug() << i << widget; widget->setGeometry(rect); widget->setVisible(actions.at(i)->isVisible()); + } + qDebug() << rect << i ; y += rect.height(); } @@ -2243,6 +2247,7 @@ void QMenu::paintEvent(QPaintEvent *e) QStyleOptionMenuItem opt; initStyleOption(&opt, action); opt.rect = adjustedActionRect; + qDebug() << __FUNCTION__ << adjustedActionRect << i; style()->drawControl(QStyle::CE_MenuItem, &opt, &p, this); }