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

QToolBarLayout: replace deprecated calls to QLayout::margin()

Browse Source 
Replace QLayout::margin() with QLayout::contentsMargins() and add two
new helper functions to get the correct margins.

Change-Id: I3ad24747e7c6323eaf4386c00c47029009d64f8c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-02-09 14:52:26 +01:00
parent 3c907d0f4a
commit d493f676a3
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qmenu_p.h
View File

@ -95,6 +95,12 @@ static inline int &rperp(Qt::Orientation o, QPoint &pos)
static inline int &rperp(Qt::Orientation o, QSize &size) static inline int &rperp(Qt::Orientation o, QSize &size)
{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); } { return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
static inline int pick(Qt::Orientation o, const QMargins &m)
{ return o == Qt::Horizontal ? (m.left() + m.right()) : (m.top() + m.bottom()); }
static inline int perp(Qt::Orientation o, const QMargins &m)
{ return o == Qt::Vertical ? (m.left() + m.right()) : (m.top() + m.bottom()); }
class QTornOffMenu; class QTornOffMenu;
class QEventLoop; class QEventLoop;

45
src/widgets/widgets/qtoolbarlayout.cpp
View File

@ -119,8 +119,9 @@ void QToolBarLayout::updateMarginAndSpacing()
QStyle *style = tb->style(); QStyle *style = tb->style();
QStyleOptionToolBar opt; QStyleOptionToolBar opt;
tb->initStyleOption(&opt); tb->initStyleOption(&opt);
setMargin(style->pixelMetric(QStyle::PM_ToolBarItemMargin, &opt, tb) const int margin = style->pixelMetric(QStyle::PM_ToolBarItemMargin, &opt, tb)
+ style->pixelMetric(QStyle::PM_ToolBarFrameWidth, &opt, tb)); + style->pixelMetric(QStyle::PM_ToolBarFrameWidth, &opt, tb);
setContentsMargins(margin, margin, margin, margin);
setSpacing(style->pixelMetric(QStyle::PM_ToolBarItemSpacing, &opt, tb)); setSpacing(style->pixelMetric(QStyle::PM_ToolBarItemSpacing, &opt, tb));
} }
@ -268,7 +269,7 @@ void QToolBarLayout::updateGeomArray() const
tb->initStyleOption(&opt); tb->initStyleOption(&opt);
const int handleExtent = movable() const int handleExtent = movable()
? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0; ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
const int margin = this->margin(); const QMargins margins = contentsMargins();
const int spacing = this->spacing(); const int spacing = this->spacing();
const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb); const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
Qt::Orientation o = tb->orientation(); Qt::Orientation o = tb->orientation();
@ -330,12 +331,12 @@ void QToolBarLayout::updateGeomArray() const
that->empty = count == 0; that->empty = count == 0;
rpick(o, that->minSize) += handleExtent; rpick(o, that->minSize) += handleExtent;
that->minSize += QSize(2*margin, 2*margin); that->minSize += QSize(pick(Qt::Horizontal, margins), pick(Qt::Vertical, margins));
if (items.count() > 1) if (items.count() > 1)
rpick(o, that->minSize) += spacing + extensionExtent; rpick(o, that->minSize) += spacing + extensionExtent;
rpick(o, that->hint) += handleExtent; rpick(o, that->hint) += handleExtent;
that->hint += QSize(2*margin, 2*margin); that->hint += QSize(pick(Qt::Horizontal, margins), pick(Qt::Vertical, margins));
that->dirty = false; that->dirty = false;
} }
@ -384,7 +385,7 @@ void QToolBarLayout::setGeometry(const QRect &rect)
QStyle *style = tb->style(); QStyle *style = tb->style();
QStyleOptionToolBar opt; QStyleOptionToolBar opt;
tb->initStyleOption(&opt); tb->initStyleOption(&opt);
const int margin = this->margin(); const QMargins margins = contentsMargins();
const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb); const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
Qt::Orientation o = tb->orientation(); Qt::Orientation o = tb->orientation();
@ -403,14 +404,18 @@ void QToolBarLayout::setGeometry(const QRect &rect)
QSize hint = sizeHint(); QSize hint = sizeHint();
QPoint pos; QPoint pos;
rpick(o, pos) = pick(o, rect.bottomRight()) - margin - extensionExtent + 2; rpick(o, pos) = pick(o, rect.bottomRight()) -
pick(o, QSize(margins.bottom(), margins.right())) - extensionExtent + 2;
if (area == Qt::LeftToolBarArea || area == Qt::TopToolBarArea) if (area == Qt::LeftToolBarArea || area == Qt::TopToolBarArea)
rperp(o, pos) = perp(o, rect.topLeft()) + margin; rperp(o, pos) = perp(o, rect.topLeft()) +
perp(o, QSize(margins.top(), margins.left()));
else else
rperp(o, pos) = perp(o, rect.bottomRight()) - margin - (perp(o, hint) - 2*margin) + 1; rperp(o, pos) = perp(o, rect.bottomRight()) -
perp(o, QSize(margins.bottom(), margins.right())) -
(perp(o, hint) - perp(o, margins)) + 1;
QSize size; QSize size;
rpick(o, size) = extensionExtent; rpick(o, size) = extensionExtent;
rperp(o, size) = perp(o, hint) - 2*margin; rperp(o, size) = perp(o, hint) - perp(o, margins);
QRect r(pos, size); QRect r(pos, size);
if (o == Qt::Horizontal) if (o == Qt::Horizontal)
@ -443,13 +448,13 @@ bool QToolBarLayout::layoutActions(const QSize &size)
tb->initStyleOption(&opt); tb->initStyleOption(&opt);
const int handleExtent = movable() const int handleExtent = movable()
? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0; ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
const int margin = this->margin(); const QMargins margins = contentsMargins();
const int spacing = this->spacing(); const int spacing = this->spacing();
const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb); const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
Qt::Orientation o = tb->orientation(); Qt::Orientation o = tb->orientation();
bool extensionMenuContainsOnlyWidgetActions = true; bool extensionMenuContainsOnlyWidgetActions = true;
int space = pick(o, rect.size()) - 2*margin - handleExtent; int space = pick(o, rect.size()) - pick(o, margins) - handleExtent;
if (space <= 0) if (space <= 0)
return false; // nothing to do. return false; // nothing to do.
@ -458,7 +463,7 @@ bool QToolBarLayout::layoutActions(const QSize &size)
bool ranOutOfSpace = false; bool ranOutOfSpace = false;
int rows = 0; int rows = 0;
int rowPos = perp(o, rect.topLeft()) + margin; int rowPos = perp(o, rect.topLeft()) + perp(o, QSize(margins.top(), margins.left()));
int i = 0; int i = 0;
while (i < items.count()) { while (i < items.count()) {
QVector<QLayoutStruct> a = geomArray; QVector<QLayoutStruct> a = geomArray;
@ -521,14 +526,14 @@ bool QToolBarLayout::layoutActions(const QSize &size)
} }
QPoint pos; QPoint pos;
rpick(o, pos) = margin + handleExtent + a[j].pos; rpick(o, pos) = pick(o, QSize(margins.top(), margins.left())) + handleExtent + a[j].pos;
rperp(o, pos) = rowPos; rperp(o, pos) = rowPos;
QSize size; QSize size;
rpick(o, size) = a[j].size; rpick(o, size) = a[j].size;
if (expanded) if (expanded)
rperp(o, size) = rowHeight; rperp(o, size) = rowHeight;
else else
rperp(o, size) = perp(o, rect.size()) - 2*margin; rperp(o, size) = perp(o, rect.size()) - perp(o, QSize(margins.top(), margins.left()));
QRect r(pos, size); QRect r(pos, size);
if (o == Qt::Horizontal) if (o == Qt::Horizontal)
@ -589,7 +594,7 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
tb->initStyleOption(&opt); tb->initStyleOption(&opt);
const int handleExtent = movable() const int handleExtent = movable()
? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0; ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
const int margin = this->margin(); const QMargins margins = contentsMargins();
const int spacing = this->spacing(); const int spacing = this->spacing();
const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb); const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
@ -609,9 +614,9 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
if (rows == 1) if (rows == 1)
++rows; // we want to expand to at least two rows ++rows; // we want to expand to at least two rows
int space = total_w/rows + spacing + extensionExtent; int space = total_w/rows + spacing + extensionExtent;
space = qMax(space, min_w - 2*margin - handleExtent); space = qMax(space, min_w - pick(o, margins) - handleExtent);
if (win != 0) if (win != 0)
space = qMin(space, pick(o, win->size()) - 2*margin - handleExtent); space = qMin(space, pick(o, win->size()) - pick(o, margins) - handleExtent);
int w = 0; int w = 0;
int h = 0; int h = 0;
@ -644,11 +649,11 @@ QSize QToolBarLayout::expandedSize(const QSize &size) const
h += rowHeight + spacing; h += rowHeight + spacing;
} }
w += 2*margin + handleExtent + spacing + extensionExtent; w += pick(Qt::Horizontal, margins) + handleExtent + spacing + extensionExtent;
w = qMax(w, min_w); w = qMax(w, min_w);
if (win != 0) if (win != 0)
w = qMin(w, pick(o, win->size())); w = qMin(w, pick(o, win->size()));
h += 2*margin - spacing; //there is no spacing before the first row h += pick(Qt::Vertical, margins) - spacing; //there is no spacing before the first row
QSize result; QSize result;
rpick(o, result) = w; rpick(o, result) = w;