Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove use of obsolete QStyleOption*V<N>

Browse source 
upstream commits:
80d7b19b80

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-01-11 14:24:34 +02:00
parent bc9930689c
commit 4f7a725ee5
2 changed files with 33 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/gui/styles/qcommonstyle.cpp
View file

@ -267,8 +267,8 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
case PE_IndicatorProgressChunk: case PE_IndicatorProgressChunk:
{ {
bool vertical = false; bool vertical = false;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(opt)) if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt))
vertical = (pb2->orientation == Qt::Vertical); vertical = pb->orientation == Qt::Vertical;
if (!vertical) { if (!vertical) {
p->fillRect(opt->rect.x(), opt->rect.y() + 3, opt->rect.width() -2, opt->rect.height() - 6, p->fillRect(opt->rect.x(), opt->rect.y() + 3, opt->rect.width() -2, opt->rect.height() - 6,
opt->palette.brush(QPalette::Highlight)); opt->palette.brush(QPalette::Highlight));
@ -1013,7 +1013,7 @@ void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItemV4 *opt, QRe
Uses the same computation than in QTabBar::tabSizeHint Uses the same computation than in QTabBar::tabSizeHint
*/ */
void QCommonStylePrivate::tabLayout(const QStyleOptionTabV3 *opt, const QWidget *widget, QRect *textRect, QRect *iconRect) const void QCommonStylePrivate::tabLayout(const QStyleOptionTab *opt, const QWidget *widget, QRect *textRect, QRect *iconRect) const
{ {
Q_ASSERT(textRect); Q_ASSERT(textRect);
Q_ASSERT(iconRect); Q_ASSERT(iconRect);
@ -1272,7 +1272,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
case CE_ProgressBar: case CE_ProgressBar:
if (const QStyleOptionProgressBar *pb if (const QStyleOptionProgressBar *pb
= qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
QStyleOptionProgressBarV2 subopt = *pb; QStyleOptionProgressBar subopt = *pb;
subopt.rect = subElementRect(SE_ProgressBarGroove, pb, widget); subopt.rect = subElementRect(SE_ProgressBarGroove, pb, widget);
proxy()->drawControl(CE_ProgressBarGroove, &subopt, p, widget); proxy()->drawControl(CE_ProgressBarGroove, &subopt, p, widget);
subopt.rect = subElementRect(SE_ProgressBarContents, pb, widget); subopt.rect = subElementRect(SE_ProgressBarContents, pb, widget);
@ -1290,10 +1290,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
break; break;
case CE_ProgressBarLabel: case CE_ProgressBarLabel:
if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
bool vertical = false; const bool vertical = pb->orientation == Qt::Vertical;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(opt)) {
vertical = (pb2->orientation == Qt::Vertical);
}
if (!vertical) { if (!vertical) {
QPalette::ColorRole textRole = QPalette::NoRole; QPalette::ColorRole textRole = QPalette::NoRole;
if ((pb->textAlignment & Qt::AlignCenter) && pb->textVisible if ((pb->textAlignment & Qt::AlignCenter) && pb->textVisible
@ -1318,18 +1315,12 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
QRect rect = pb->rect; QRect rect = pb->rect;
bool vertical = false; const bool vertical = pb->orientation == Qt::Vertical;
bool inverted = false; const bool inverted = pb->invertedAppearance;
qint64 minimum = qint64(pb->minimum); qint64 minimum = qint64(pb->minimum);
qint64 maximum = qint64(pb->maximum); qint64 maximum = qint64(pb->maximum);
qint64 progress = qint64(pb->progress); qint64 progress = qint64(pb->progress);
// Get extra style options if version 2
const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(opt);
if (pb2) {
vertical = (pb2->orientation == Qt::Vertical);
inverted = pb2->invertedAppearance;
}
QMatrix m; QMatrix m;
if (vertical) { if (vertical) {
@ -1389,7 +1380,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
int x0 = reverse ? rect.right() - ((unit_width > 1) ? unit_width : 0) int x0 = reverse ? rect.right() - ((unit_width > 1) ? unit_width : 0)
: rect.x(); : rect.x();
QStyleOptionProgressBarV2 pbBits = *pb; QStyleOptionProgressBar pbBits = *pb;
pbBits.rect = rect; pbBits.rect = rect;
pbBits.palette = pal2; pbBits.palette = pal2;
int myY = pbBits.rect.y(); int myY = pbBits.rect.y();
@ -1734,12 +1725,11 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
break; break;
case CE_TabBarTabLabel: case CE_TabBarTabLabel:
if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) { if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) {
QStyleOptionTabV3 tabV2(*tab); QRect tr = tab->rect;
QRect tr = tabV2.rect; bool verticalTabs = tab->shape == QTabBar::RoundedEast
bool verticalTabs = tabV2.shape == QTabBar::RoundedEast || tab->shape == QTabBar::RoundedWest
|| tabV2.shape == QTabBar::RoundedWest || tab->shape == QTabBar::TriangularEast
|| tabV2.shape == QTabBar::TriangularEast || tab->shape == QTabBar::TriangularWest;
|| tabV2.shape == QTabBar::TriangularWest;
int alignment = Qt::AlignCenter | Qt::TextShowMnemonic; int alignment = Qt::AlignCenter | Qt::TextShowMnemonic;
if (!proxy()->styleHint(SH_UnderlineShortcut, opt, widget)) if (!proxy()->styleHint(SH_UnderlineShortcut, opt, widget))
@ -1748,7 +1738,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
if (verticalTabs) { if (verticalTabs) {
p->save(); p->save();
int newX, newY, newRot; int newX, newY, newRot;
if (tabV2.shape == QTabBar::RoundedEast || tabV2.shape == QTabBar::TriangularEast) { if (tab->shape == QTabBar::RoundedEast || tab->shape == QTabBar::TriangularEast) {
newX = tr.width() + tr.x(); newX = tr.width() + tr.x();
newY = tr.y(); newY = tr.y();
newRot = 90; newRot = 90;
@ -1762,14 +1752,14 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
p->setTransform(m, true); p->setTransform(m, true);
} }
QRect iconRect; QRect iconRect;
d->tabLayout(&tabV2, widget, &tr, &iconRect); d->tabLayout(tab, widget, &tr, &iconRect);
tr = proxy()->subElementRect(SE_TabBarTabText, opt, widget); //we compute tr twice because the style may override subElementRect tr = proxy()->subElementRect(SE_TabBarTabText, opt, widget); //we compute tr twice because the style may override subElementRect
if (!tabV2.icon.isNull()) { if (!tab->icon.isNull()) {
QPixmap tabIcon = tabV2.icon.pixmap(tabV2.iconSize, QPixmap tabIcon = tab->icon.pixmap(tab->iconSize,
(tabV2.state & State_Enabled) ? QIcon::Normal (tab->state & State_Enabled) ? QIcon::Normal
: QIcon::Disabled, : QIcon::Disabled,
(tabV2.state & State_Selected) ? QIcon::On (tab->state & State_Selected) ? QIcon::On
: QIcon::Off); : QIcon::Off);
p->drawPixmap(iconRect.x(), iconRect.y(), tabIcon); p->drawPixmap(iconRect.x(), iconRect.y(), tabIcon);
} }
@ -1778,17 +1768,17 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
if (verticalTabs) if (verticalTabs)
p->restore(); p->restore();
if (tabV2.state & State_HasFocus) { if (tab->state & State_HasFocus) {
const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth); const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth);
int x1, x2; int x1, x2;
x1 = tabV2.rect.left(); x1 = tab->rect.left();
x2 = tabV2.rect.right() - 1; x2 = tab->rect.right() - 1;
QStyleOptionFocusRect fropt; QStyleOptionFocusRect fropt;
fropt.QStyleOption::operator=(*tab); fropt.QStyleOption::operator=(*tab);
fropt.rect.setRect(x1 + 1 + OFFSET, tabV2.rect.y() + OFFSET, fropt.rect.setRect(x1 + 1 + OFFSET, tab->rect.y() + OFFSET,
x2 - x1 - 2*OFFSET, tabV2.rect.height() - 2*OFFSET); x2 - x1 - 2*OFFSET, tab->rect.height() - 2*OFFSET);
drawPrimitive(PE_FrameFocusRect, &fropt, p, widget); drawPrimitive(PE_FrameFocusRect, &fropt, p, widget);
} }
} }
@ -1907,9 +1897,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
} }
if (!dwOpt->title.isEmpty()) { if (!dwOpt->title.isEmpty()) {
const QStyleOptionDockWidgetV2 *v2 const bool verticalTitleBar = dwOpt->verticalTitleBar;
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt);
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
if (verticalTitleBar) { if (verticalTitleBar) {
QSize s = r.size(); QSize s = r.size();
@ -2347,10 +2335,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
case SE_ProgressBarLabel: case SE_ProgressBarLabel:
if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
int textw = 0; int textw = 0;
bool vertical = false; const bool vertical = pb->orientation == Qt::Vertical;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(opt)) {
vertical = (pb2->orientation == Qt::Vertical);
}
if (!vertical) { if (!vertical) {
if (pb->textVisible) if (pb->textVisible)
textw = qMax(pb->fontMetrics.width(pb->text), pb->fontMetrics.width(QLatin1String("100%"))) + 6; textw = qMax(pb->fontMetrics.width(pb->text), pb->fontMetrics.width(QLatin1String("100%"))) + 6;
@ -2603,14 +2588,13 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
break; break;
case SE_TabBarTabText: case SE_TabBarTabText:
if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) { if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) {
QStyleOptionTabV3 tabV3(*tab);
QRect dummyIconRect; QRect dummyIconRect;
d->tabLayout(&tabV3, widget, &r, &dummyIconRect); d->tabLayout(tab, widget, &r, &dummyIconRect);
} }
break; break;
case SE_TabBarTabLeftButton: case SE_TabBarTabLeftButton:
case SE_TabBarTabRightButton: case SE_TabBarTabRightButton:
if (const QStyleOptionTabV3 *tab = qstyleoption_cast<const QStyleOptionTabV3 *>(opt)) { if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) {
bool selected = tab->state & State_Selected; bool selected = tab->state & State_Selected;
int verticalShift = proxy()->pixelMetric(QStyle::PM_TabBarTabShiftVertical, tab, widget); int verticalShift = proxy()->pixelMetric(QStyle::PM_TabBarTabShiftVertical, tab, widget);
int horizontalShift = proxy()->pixelMetric(QStyle::PM_TabBarTabShiftHorizontal, tab, widget); int horizontalShift = proxy()->pixelMetric(QStyle::PM_TabBarTabShiftHorizontal, tab, widget);
@ -2783,9 +2767,8 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
= qstyleoption_cast<const QStyleOptionDockWidget*>(opt); = qstyleoption_cast<const QStyleOptionDockWidget*>(opt);
bool canClose = dwOpt == 0 ? true : dwOpt->closable; bool canClose = dwOpt == 0 ? true : dwOpt->closable;
bool canFloat = dwOpt == 0 ? false : dwOpt->floatable; bool canFloat = dwOpt == 0 ? false : dwOpt->floatable;
const QStyleOptionDockWidgetV2 *v2
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt); const bool verticalTitleBar = dwOpt && dwOpt->verticalTitleBar;
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
// If this is a vertical titlebar, we transpose and work as if it was // If this is a vertical titlebar, we transpose and work as if it was
// horizontal, then transpose again. // horizontal, then transpose again.

2
src/gui/styles/qcommonstyle_p.h
View file

@ -104,7 +104,7 @@ public:
#endif #endif
mutable QIcon tabBarcloseButtonIcon; mutable QIcon tabBarcloseButtonIcon;
#ifndef QT_NO_TABBAR #ifndef QT_NO_TABBAR
void tabLayout(const QStyleOptionTabV3 *opt, const QWidget *widget, QRect *textRect, QRect *pixmapRect) const; void tabLayout(const QStyleOptionTab *opt, const QWidget *widget, QRect *textRect, QRect *pixmapRect) const;
#endif #endif
}; };