AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Mac unified toolbar workarounds.

Browse Source 
QMainWindow::unifiedTitleAndToolBarOnMac() will
again return true, but the new implementation is
much more similar to the cross platform one so these
workarounds are not needed.

Task-number: QTBUG-34411
Change-Id: I8f63067f929c94aab252fc2e88f98fb94c870c44
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
Morten Johan Sørvig 2013-12-16 23:15:38 +01:00 committed by The Qt Project
parent a813fcf470
commit 6eeab0b0e1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/widgets/qtoolbararealayout.cpp
View File

@ -655,9 +655,7 @@ QRect QToolBarAreaLayout::fitLayout()
docks[QInternal::BottomDock].rect = QRect(rect.left(), center.bottom() + 1, docks[QInternal::BottomDock].rect = QRect(rect.left(), center.bottom() + 1,
rect.width(), bottom_hint.height()); rect.width(), bottom_hint.height());
if (!mainWindow->unifiedTitleAndToolBarOnMac()) { docks[QInternal::TopDock].fitLayout();
docks[QInternal::TopDock].fitLayout();
}
docks[QInternal::LeftDock].fitLayout(); docks[QInternal::LeftDock].fitLayout();
docks[QInternal::RightDock].fitLayout(); docks[QInternal::RightDock].fitLayout();
docks[QInternal::BottomDock].fitLayout(); docks[QInternal::BottomDock].fitLayout();
@ -1307,8 +1305,6 @@ bool QToolBarAreaLayout::restoreState(QDataStream &stream, const QList<QToolBar*
QList<QToolBar*> toolBars = _toolBars; QList<QToolBar*> toolBars = _toolBars;
int lines; int lines;
stream >> lines; stream >> lines;
if (!testing)
testing = mainWindow->unifiedTitleAndToolBarOnMac();
for (int j = 0; j < lines; ++j) { for (int j = 0; j < lines; ++j) {
int pos; int pos;
@ -1319,7 +1315,7 @@ bool QToolBarAreaLayout::restoreState(QDataStream &stream, const QList<QToolBar*
stream >> cnt; stream >> cnt;
QToolBarAreaLayoutInfo &dock = docks[pos]; QToolBarAreaLayoutInfo &dock = docks[pos];
const bool applyingLayout = !testing && !(pos == QInternal::TopDock && mainWindow->unifiedTitleAndToolBarOnMac()); const bool applyingLayout = !testing;
QToolBarAreaLayoutLine line(dock.o); QToolBarAreaLayoutLine line(dock.o);
for (int k = 0; k < cnt; ++k) { for (int k = 0; k < cnt; ++k) {