1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style: pass widget to styleHint() where appropriate

Browse Source 
QStyle::styleHint() take the QWidget as optional third parameter. Add
this to calls to styleHint() where appropriate.

Fixes: QTBUG-2501
Pick-to: 6.9 6.8
Change-Id: Id4e4158cc889236064f2f618495608736607d457
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Christian Ehrlicher 2024-11-21 18:57:44 +01:00
parent 176baa955a
commit aa341ecca8
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qabstractbutton.cpp
View File

@ -326,7 +326,7 @@ void QAbstractButtonPrivate::init()
{ {
Q_Q(QAbstractButton); Q_Q(QAbstractButton);
q->setFocusPolicy(Qt::FocusPolicy(q->style()->styleHint(QStyle::SH_Button_FocusPolicy))); q->setFocusPolicy(Qt::FocusPolicy(q->style()->styleHint(QStyle::SH_Button_FocusPolicy, nullptr, q)));
q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed, controlType)); q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed, controlType));
q->setAttribute(Qt::WA_WState_OwnSizePolicy, false); q->setAttribute(Qt::WA_WState_OwnSizePolicy, false);
q->setForegroundRole(QPalette::ButtonText); q->setForegroundRole(QPalette::ButtonText);

5
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -1462,7 +1462,8 @@ void QCalendarView::mouseDoubleClickEvent(QMouseEvent *event)
QDate date = handleMouseEvent(event); QDate date = handleMouseEvent(event);
validDateClicked = false; validDateClicked = false;
if (date == calendarModel->m_date && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) { if (date == calendarModel->m_date &&
!style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, nullptr, this)) {
emit editingFinished(); emit editingFinished();
} }
} }
@ -1539,7 +1540,7 @@ void QCalendarView::mouseReleaseEvent(QMouseEvent *event)
if (date.isValid()) { if (date.isValid()) {
emit changeDate(date, true); emit changeDate(date, true);
emit clicked(date); emit clicked(date);
if (style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) if (style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, nullptr, this))
emit editingFinished(); emit editingFinished();
} }
validDateClicked = false; validDateClicked = false;

2
src/widgets/widgets/qcombobox.cpp
View File

@ -2897,7 +2897,7 @@ void QComboBox::hidePopup()
QItemSelectionModel *selectionModel = d->container->itemView() QItemSelectionModel *selectionModel = d->container->itemView()
? d->container->itemView()->selectionModel() : nullptr; ? d->container->itemView()->selectionModel() : nullptr;
// Flash selected/triggered item (if any) before hiding the popup. // Flash selected/triggered item (if any) before hiding the popup.
if (style()->styleHint(QStyle::SH_Menu_FlashTriggeredItem) && if (style()->styleHint(QStyle::SH_Menu_FlashTriggeredItem, nullptr, this) &&
selectionModel && selectionModel->hasSelection()) { selectionModel && selectionModel->hasSelection()) {
const QItemSelection selection = selectionModel->selection(); const QItemSelection selection = selectionModel->selection();

2
src/widgets/widgets/qpushbutton.cpp
View File

@ -367,7 +367,7 @@ QSize QPushButton::sizeHint() const
// calculate contents size... // calculate contents size...
#if !defined(QT_NO_ICON) && QT_CONFIG(dialogbuttonbox) #if !defined(QT_NO_ICON) && QT_CONFIG(dialogbuttonbox)
bool showButtonBoxIcons = qobject_cast<QDialogButtonBox*>(parentWidget()) bool showButtonBoxIcons = qobject_cast<QDialogButtonBox*>(parentWidget())
&& style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons); && style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, nullptr, this);
if (!icon().isNull() || showButtonBoxIcons) { if (!icon().isNull() || showButtonBoxIcons) {
int ih = opt.iconSize.height(); int ih = opt.iconSize.height();

6
src/widgets/widgets/qslider.cpp
View File

@ -43,7 +43,7 @@ void QSliderPrivate::init()
tickInterval = 0; tickInterval = 0;
tickPosition = QSlider::NoTicks; tickPosition = QSlider::NoTicks;
hoverControl = QStyle::SC_None; hoverControl = QStyle::SC_None;
q->setFocusPolicy(Qt::FocusPolicy(q->style()->styleHint(QStyle::SH_Button_FocusPolicy))); q->setFocusPolicy(Qt::FocusPolicy(q->style()->styleHint(QStyle::SH_Button_FocusPolicy, nullptr, q)));
QSizePolicy sp(QSizePolicy::Expanding, QSizePolicy::Fixed, QSizePolicy::Slider); QSizePolicy sp(QSizePolicy::Expanding, QSizePolicy::Fixed, QSizePolicy::Slider);
if (orientation == Qt::Vertical) if (orientation == Qt::Vertical)
sp.transpose(); sp.transpose();
@ -333,7 +333,7 @@ void QSlider::mousePressEvent(QMouseEvent *ev)
setEditFocus(true); setEditFocus(true);
#endif #endif
ev->accept(); ev->accept();
if ((ev->button() & style()->styleHint(QStyle::SH_Slider_AbsoluteSetButtons)) == ev->button()) { if ((ev->button() & style()->styleHint(QStyle::SH_Slider_AbsoluteSetButtons, nullptr, this)) == ev->button()) {
QStyleOptionSlider opt; QStyleOptionSlider opt;
initStyleOption(&opt); initStyleOption(&opt);
const QRect sliderRect = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this); const QRect sliderRect = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
@ -345,7 +345,7 @@ void QSlider::mousePressEvent(QMouseEvent *ev)
setRepeatAction(SliderNoAction); setRepeatAction(SliderNoAction);
d->pressedControl = QStyle::SC_SliderHandle; d->pressedControl = QStyle::SC_SliderHandle;
update(); update();
} else if ((ev->button() & style()->styleHint(QStyle::SH_Slider_PageSetButtons)) == ev->button()) { } else if ((ev->button() & style()->styleHint(QStyle::SH_Slider_PageSetButtons, nullptr, this)) == ev->button()) {
QStyleOptionSlider opt; QStyleOptionSlider opt;
initStyleOption(&opt); initStyleOption(&opt);
d->pressedControl = style()->hitTestComplexControl(QStyle::CC_Slider, d->pressedControl = style()->hitTestComplexControl(QStyle::CC_Slider,

4
src/widgets/widgets/qtabbar.cpp
View File

@ -1758,7 +1758,7 @@ bool QTabBar::event(QEvent *event)
if (isTabEnabled(tabIndex) && d->switchTabCurrentIndex != tabIndex) { if (isTabEnabled(tabIndex) && d->switchTabCurrentIndex != tabIndex) {
d->switchTabCurrentIndex = tabIndex; d->switchTabCurrentIndex = tabIndex;
d->switchTabTimer.start( d->switchTabTimer.start(
style()->styleHint(QStyle::SH_TabBar_ChangeCurrentDelay) * 1ms, this); style()->styleHint(QStyle::SH_TabBar_ChangeCurrentDelay, nullptr, this) * 1ms, this);
} }
event->ignore(); event->ignore();
} }
@ -2378,7 +2378,7 @@ void QTabBar::keyPressEvent(QKeyEvent *event)
void QTabBar::wheelEvent(QWheelEvent *event) void QTabBar::wheelEvent(QWheelEvent *event)
{ {
Q_D(QTabBar); Q_D(QTabBar);
if (style()->styleHint(QStyle::SH_TabBar_AllowWheelScrolling)) { if (style()->styleHint(QStyle::SH_TabBar_AllowWheelScrolling, nullptr, this)) {
const bool wheelVertical = qAbs(event->angleDelta().y()) > qAbs(event->angleDelta().x()); const bool wheelVertical = qAbs(event->angleDelta().y()) > qAbs(event->angleDelta().x());
const bool tabsVertical = verticalTabs(d->shape); const bool tabsVertical = verticalTabs(d->shape);
if (event->device()->capabilities().testFlag(QInputDevice::Capability::PixelScroll)) { if (event->device()->capabilities().testFlag(QInputDevice::Capability::PixelScroll)) {