← Back to branch summary

~ubuntu-branches/debian/sid/calibre/sid

« back to all changes in this revision

Viewing changes to src/qtcurve/style/qtcurve.cpp

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2014-05-14 18:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 75.
  • Revision ID: package-import@ubuntu.com-20140514181750-efj1wymey2vb4cao
Tags: upstream-1.36.0+dfsg
Import upstream version 1.36.0+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qtcurve/style/qtcurve.cpp
8148
8148
                drawControl(CE_ToolButtonLabel, &label, painter, widget);
8149
8149
 
8150
8150
                if (!(toolbutton->subControls&SC_ToolButtonMenu) &&
8151
 
                     (toolbutton->features&QStyleOptionToolButton::HasMenu))
 
8151
                     (toolbutton->features&QStyleOptionToolButton::HasMenu &&
 
8152
                      toolbutton->features & QStyleOptionToolButton::PopupDelay))
8152
8153
                {
8153
8154
                    QRect arrow(r.right()-(LARGE_ARR_WIDTH+(etched ? 3 : 2)),
8154
8155
                                r.bottom()-(LARGE_ARR_HEIGHT+(etched ? 4 : 3)),