diff options
| author | Christian Ehrlicher <[email protected]> | 2024-11-21 19:05:45 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <[email protected]> | 2025-03-02 13:34:58 +0000 |
| commit | 5b320c146b2d67bb9bec92d647ec7fb5ae6b601d (patch) | |
| tree | 9a730a9b4f47fb272b37ded20b737d7dcbe59006 | |
| parent | df97b6b2de6282bd6422f1e531a42475dadc980d (diff) | |
Style: pass widget to styleHint() where appropriate
QStyle::styleHint() take the QWidget as optional third parameter. Add
this to calls to styleHint() where appropriate.
Task-number: QTBUG-2501
Pick-to: 6.9 6.8
Change-Id: I62aa251f7dd9d78178ea8aefc1e2882d3ac040be
Reviewed-by: Volker Hilsheimer <[email protected]>
| -rw-r--r-- | src/widgets/accessible/qaccessiblemenu.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp index 1d72a824562..a79970a525c 100644 --- a/src/widgets/accessible/qaccessiblemenu.cpp +++ b/src/widgets/accessible/qaccessiblemenu.cpp @@ -259,7 +259,7 @@ QAccessible::State QAccessibleMenuItem::state() const s.focused = true; #endif } - if (own && own->style()->styleHint(QStyle::SH_Menu_MouseTracking)) + if (own && own->style()->styleHint(QStyle::SH_Menu_MouseTracking, nullptr, own)) s.hotTracked = true; if (m_action->isSeparator() || !m_action->isEnabled()) s.disabled = true; diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 6dc7c6caf0a..67e72c38c6c 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -1793,7 +1793,7 @@ void QListViewPrivate::prepareItemsLayout() layoutBounds = QRect(QPoint(), q->maximumViewportSize()); int frameAroundContents = 0; - if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) { + if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, nullptr, q)) { QStyleOption option; option.initFrom(q); frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, &option, q) * 2; diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 24d7c7ee16f..09b520a5746 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -565,7 +565,7 @@ public: Q_Q(QWidget); if (qApp->autoSipEnabled()) { QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel( - q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel)); + q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel, nullptr, q)); if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) { QGuiApplication::inputMethod()->show(); } diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index ed0f9b8ba6c..3036f61d17e 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -775,7 +775,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, case PE_FrameFocusRect: if (const QStyleOptionFocusRect *fropt = qstyleoption_cast<const QStyleOptionFocusRect *>(opt)) { //### check for d->alt_down - if (!(fropt->state & State_KeyboardFocusChange) && !proxy()->styleHint(SH_UnderlineShortcut, opt)) + if (!(fropt->state & State_KeyboardFocusChange) && !proxy()->styleHint(SH_UnderlineShortcut, opt, w)) return; QRect r = opt->rect; p->save(); |