From 7fc7558221828a4a4e4c56aa11fafd47dcca2b87 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 2 May 2014 13:35:01 +0200 Subject: [PATCH] [ComboTabBar] Correctly returns tabAt over tab icon --- src/lib/tabwidget/combotabbar.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/tabwidget/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp index af3fa9163..da9dfcd2e 100644 --- a/src/lib/tabwidget/combotabbar.cpp +++ b/src/lib/tabwidget/combotabbar.cpp @@ -18,6 +18,7 @@ * ============================================================ */ #include "combotabbar.h" #include "toolbutton.h" +#include "tabicon.h" #include "mainapplication.h" #include "proxystyle.h" #include "qzsettings.h" @@ -217,7 +218,8 @@ QRect ComboTabBar::tabRect(int index) const int ComboTabBar::tabAt(const QPoint &pos) const { - if (!qobject_cast(QApplication::widgetAt(mapToGlobal(pos)))) + QWidget* w = QApplication::widgetAt(mapToGlobal(pos)); + if (!qobject_cast(w) && !qobject_cast(w)) return -1; int index = m_pinnedTabBarWidget->tabAt(m_pinnedTabBarWidget->mapFromParent(pos));