From 110dfad9d1654f43cea9afbcabc56cb3da2ff24a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 16 Aug 2014 21:03:57 +0530 Subject: [PATCH] Fix a bug in the calibre style that prevented popup arrow from showing on buttons that have a popup delay, such as the authors to author sort button in the edit metadata dialog --- src/calibre/gui2/progress_indicator/QProgressIndicator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp b/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp index 087ec79109..7884e3b4fa 100644 --- a/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp +++ b/src/calibre/gui2/progress_indicator/QProgressIndicator.cpp @@ -182,7 +182,7 @@ class CalibreStyle: public QProxyStyle { case CC_ToolButton: // We do not want an arrow if the toolbutton has an instant popup toolbutton = qstyleoption_cast(option); - if (toolbutton && toolbutton->features & QStyleOptionToolButton::HasMenu & ~QStyleOptionToolButton::PopupDelay) { + if (toolbutton && (toolbutton->features & QStyleOptionToolButton::HasMenu) && !(toolbutton->features & QStyleOptionToolButton::PopupDelay)) { QStyleOptionToolButton opt = QStyleOptionToolButton(*toolbutton); opt.features = toolbutton->features & ~QStyleOptionToolButton::HasMenu; return QProxyStyle::drawComplexControl(control, &opt, painter, widget);