From add8262f72befc4c6a25403a21269030111054d1 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 27 Aug 2020 11:35:39 +0200 Subject: Remove QStyleOptionProgressBar::orientation member MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Address ### Qt 6 comment; the information is already stored in the state variable, using the QStyle::State_Horizontal bit. Change-Id: I61d143ba057776f9d622793a0592b5dd4726f25d Reviewed-by: Qt CI Bot Reviewed-by: Tor Arne Vestbø --- src/widgets/styles/qcommonstyle.cpp | 8 ++++---- src/widgets/styles/qfusionstyle.cpp | 5 ++--- src/widgets/styles/qpixmapstyle.cpp | 8 ++++---- src/widgets/styles/qstyleoption.cpp | 15 ++------------- src/widgets/styles/qstyleoption.h | 1 - src/widgets/styles/qstylesheetstyle.cpp | 2 +- src/widgets/styles/qwindowsstyle.cpp | 4 ++-- 7 files changed, 15 insertions(+), 28 deletions(-) (limited to 'src/widgets/styles') diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 94745d3ec9..37f17f784a 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -307,7 +307,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q { bool vertical = false; if (const QStyleOptionProgressBar *pb = qstyleoption_cast(opt)) - vertical = pb->orientation == Qt::Vertical; + vertical = !(pb->state & QStyle::State_Horizontal); if (!vertical) { p->fillRect(opt->rect.x(), opt->rect.y() + 3, opt->rect.width() -2, opt->rect.height() - 6, opt->palette.brush(QPalette::Highlight)); @@ -1526,7 +1526,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, break; case CE_ProgressBarLabel: if (const QStyleOptionProgressBar *pb = qstyleoption_cast(opt)) { - const bool vertical = pb->orientation == Qt::Vertical; + const bool vertical = !(pb->state & QStyle::State_Horizontal); if (!vertical) { QPalette::ColorRole textRole = QPalette::NoRole; if ((pb->textAlignment & Qt::AlignCenter) && pb->textVisible @@ -1551,7 +1551,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, if (const QStyleOptionProgressBar *pb = qstyleoption_cast(opt)) { QRect rect = pb->rect; - const bool vertical = pb->orientation == Qt::Vertical; + const bool vertical = !(pb->state & QStyle::State_Horizontal); const bool inverted = pb->invertedAppearance; qint64 minimum = qint64(pb->minimum); qint64 maximum = qint64(pb->maximum); @@ -2591,7 +2591,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, case SE_ProgressBarLabel: if (const QStyleOptionProgressBar *pb = qstyleoption_cast(opt)) { int textw = 0; - const bool vertical = pb->orientation == Qt::Vertical; + const bool vertical = !(pb->state & QStyle::State_Horizontal); if (!vertical) { if (pb->textVisible) textw = qMax(pb->fontMetrics.horizontalAdvance(pb->text), pb->fontMetrics.horizontalAdvance(QLatin1String("100%"))) + 6; diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 3f985bfe4c..daf0710b70 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1364,8 +1364,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio bool indeterminate = (bar->minimum == 0 && bar->maximum == 0); bool complete = bar->progress == bar->maximum; - // Get extra style options if version 2 - vertical = (bar->orientation == Qt::Vertical); + vertical = !(bar->state & QStyle::State_Horizontal); inverted = bar->invertedAppearance; // If the orientation is vertical, we use a transform to rotate @@ -1474,7 +1473,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio painter->save(); bool vertical = false, inverted = false; - vertical = (bar->orientation == Qt::Vertical); + vertical = !(bar->state & QStyle::State_Horizontal); inverted = bar->invertedAppearance; if (vertical) rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp index 7cc32b2039..9213ff759e 100644 --- a/src/widgets/styles/qpixmapstyle.cpp +++ b/src/widgets/styles/qpixmapstyle.cpp @@ -825,7 +825,7 @@ void QPixmapStyle::drawProgressBarBackground(const QStyleOption *option, bool vertical = false; if (const QStyleOptionProgressBar *pb = qstyleoption_cast(option)) { - vertical = pb->orientation == Qt::Vertical; + vertical = !(pb->state & QStyle::State_Horizontal); } drawCachedPixmap(vertical ? PB_VBackground : PB_HBackground, option->rect, painter); } @@ -835,7 +835,7 @@ void QPixmapStyle::drawProgressBarLabel(const QStyleOption *option, { if (const QStyleOptionProgressBar *pb = qstyleoption_cast(option)) { - const bool vertical = pb->orientation == Qt::Vertical; + const bool vertical = !(pb->state & QStyle::State_Horizontal); if (!vertical) { QPalette::ColorRole textRole = QPalette::ButtonText; proxy()->drawItemText(painter, pb->rect, @@ -850,7 +850,7 @@ void QPixmapStyle::drawProgressBarFill(const QStyleOption *option, { const QStyleOptionProgressBar *pbar = qstyleoption_cast(option); - const bool vertical = pbar->orientation == Qt::Vertical; + const bool vertical = !(pbar->state & QStyle::State_Horizontal); const bool flip = (pbar->direction == Qt::RightToLeft) ^ pbar->invertedAppearance; if (pbar->progress == pbar->maximum) { @@ -1026,7 +1026,7 @@ QSize QPixmapStyle::progressBarSizeFromContents(const QStyleOption *option, bool vertical = false; if (const QStyleOptionProgressBar *pb = qstyleoption_cast(option)) { - vertical = pb->orientation == Qt::Vertical; + vertical = !(pb->state & QStyle::State_Horizontal); } QSize result = QCommonStyle::sizeFromContents(CT_Slider, option, contentsSize, widget); if (vertical) { diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index aab5696398..b7b5b99e3a 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1496,7 +1496,7 @@ QStyleOptionTab::QStyleOptionTab(int version) QStyleOptionProgressBar::QStyleOptionProgressBar() : QStyleOption(QStyleOptionProgressBar::Version, SO_ProgressBar), minimum(0), maximum(0), progress(0), textAlignment(Qt::AlignLeft), textVisible(false), - orientation(Qt::Horizontal), invertedAppearance(false), bottomToTop(false) + invertedAppearance(false), bottomToTop(false) { } @@ -1506,7 +1506,7 @@ QStyleOptionProgressBar::QStyleOptionProgressBar() QStyleOptionProgressBar::QStyleOptionProgressBar(int version) : QStyleOption(version, SO_ProgressBar), minimum(0), maximum(0), progress(0), textAlignment(Qt::AlignLeft), textVisible(false), - orientation(Qt::Horizontal), invertedAppearance(false), bottomToTop(false) + invertedAppearance(false), bottomToTop(false) { } @@ -1608,17 +1608,6 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version) \sa QProgressBar::value */ -/*! - \variable QStyleOptionProgressBar::orientation - \brief the progress bar's orientation (horizontal or vertical); - the default orentation is Qt::Horizontal - - \deprecated - Use the QStyle::State_Horizontal flag instead (in the QStyleOption::state member). - - \sa QProgressBar::orientation -*/ - /*! \variable QStyleOptionProgressBar::invertedAppearance \brief whether the progress bar's appearance is inverted diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index fb5e92526e..22ac309cc6 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -336,7 +336,6 @@ public: QString text; Qt::Alignment textAlignment; bool textVisible; - Qt::Orientation orientation; // ### Qt 6: remove bool invertedAppearance; bool bottomToTop; diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index b2f84e2f30..e53b81b292 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -3993,7 +3993,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q qint64 minimum = qint64(pb->minimum); qint64 maximum = qint64(pb->maximum); qint64 progress = qint64(pb->progress); - bool vertical = (pb->orientation == Qt::Vertical); + bool vertical = !(pb->state & QStyle::State_Horizontal); bool inverted = pb->invertedAppearance; QTransform m; diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 619dbcdb52..e3c2a54051 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1025,7 +1025,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, { bool vertical = false, inverted = false; if (const QStyleOptionProgressBar *pb = qstyleoption_cast(opt)) { - vertical = pb->orientation == Qt::Vertical; + vertical = !(pb->state & QStyle::State_Horizontal); inverted = pb->invertedAppearance; } @@ -1691,7 +1691,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai if (!rect.isValid()) return; - const bool vertical = pb->orientation == Qt::Vertical; + const bool vertical = !(pb->state & QStyle::State_Horizontal); const bool inverted = pb->invertedAppearance; QTransform m; -- cgit v1.2.3