From dd34ac5c3450b93296480c766b092d37c6f87a36 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 2 Jul 2020 14:17:52 +0200 Subject: Keep track of mouse button state in QTabBar Get rid of call to QGuiApplication::mouseButtons Task-number: QTBUG-73829 Change-Id: I7cc706b5e037c68ecf3c778b824ae8c93e5cfe38 Reviewed-by: Shawn Rutledge --- src/widgets/widgets/qtabbar_p.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/widgets/widgets/qtabbar_p.h') diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 7bca487d72..4d005af9a9 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -88,14 +88,17 @@ class Q_WIDGETS_EXPORT QTabBarPrivate : public QWidgetPrivate Q_DECLARE_PUBLIC(QTabBar) public: QTabBarPrivate() - :currentIndex(-1), pressedIndex(-1), firstVisible(0), lastVisible(-1), shape(QTabBar::RoundedNorth), layoutDirty(false), - drawBase(true), scrollOffset(0), hoverIndex(-1), elideModeSetByUser(false), useScrollButtonsSetByUser(false), expanding(true), closeButtonOnTabs(false), - selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), - dragInProgress(false), documentMode(false), autoHide(false), changeCurrentOnDrag(false), - switchTabCurrentIndex(-1), switchTabTimerId(0), movingTab(nullptr) + : currentIndex(-1), mouseButtons(Qt::NoButton), pressedIndex(-1), firstVisible(0), lastVisible(-1), + shape(QTabBar::RoundedNorth), layoutDirty(false), drawBase(true), scrollOffset(0), + hoverIndex(-1), elideModeSetByUser(false), useScrollButtonsSetByUser(false), expanding(true), + closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), + paintWithOffsets(true), movable(false), dragInProgress(false), documentMode(false), + autoHide(false), changeCurrentOnDrag(false), switchTabCurrentIndex(-1), switchTabTimerId(0), + movingTab(nullptr) {} int currentIndex; + Qt::MouseButtons mouseButtons; int pressedIndex; int firstVisible; int lastVisible; -- cgit v1.2.3