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

Fix crash when trying to place toolbar into zero-height window.

Browse Source 
Change QToolBarAreaLayout::item() to return a pointer
and check return values in plug().

Task-number: QTBUG-37183
Change-Id: I7029eb9739cbe603460e87d3e5493f116bdb3a89
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Friedemann Kleint 2014-03-28 15:55:31 +01:00 committed by The Qt Project
parent 1a6410f91f
commit e38ad94550
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -508,8 +508,11 @@ QLayoutItem *QMainWindowLayoutState::item(const QList<int> &path)
int i = path.first(); int i = path.first();
#ifndef QT_NO_TOOLBAR #ifndef QT_NO_TOOLBAR
if (i == 0) if (i == 0) {
return toolBarAreaLayout.item(path.mid(1)).widgetItem; const QToolBarAreaLayoutItem *tbItem = toolBarAreaLayout.item(path.mid(1));
Q_ASSERT(tbItem);
return tbItem->widgetItem;
}
#endif #endif
#ifndef QT_NO_DOCKWIDGET #ifndef QT_NO_DOCKWIDGET
@ -1567,9 +1570,10 @@ bool QMainWindowLayout::plug(QLayoutItem *widgetItem)
QList<int> previousPath = layoutState.indexOf(widget); QList<int> previousPath = layoutState.indexOf(widget);
QLayoutItem *it = layoutState.plug(currentGapPos); const QLayoutItem *it = layoutState.plug(currentGapPos);
if (!it)
return false;
Q_ASSERT(it == widgetItem); Q_ASSERT(it == widgetItem);
Q_UNUSED(it);
if (!previousPath.isEmpty()) if (!previousPath.isEmpty())
layoutState.remove(previousPath); layoutState.remove(previousPath);

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

@ -1107,16 +1107,19 @@ void QToolBarAreaLayout::clear()
rect = QRect(); rect = QRect();
} }
QToolBarAreaLayoutItem &QToolBarAreaLayout::item(const QList<int> &path) QToolBarAreaLayoutItem *QToolBarAreaLayout::item(const QList<int> &path)
{ {
Q_ASSERT(path.count() == 3); Q_ASSERT(path.count() == 3);
Q_ASSERT(path.at(0) >= 0 && path.at(0) < QInternal::DockCount); if (path.at(0) < 0 || path.at(0) >= QInternal::DockCount)
return 0;
QToolBarAreaLayoutInfo &info = docks[path.at(0)]; QToolBarAreaLayoutInfo &info = docks[path.at(0)];
Q_ASSERT(path.at(1) >= 0 && path.at(1) < info.lines.count()); if (path.at(1) < 0 || path.at(1) >= info.lines.count())
return 0;
QToolBarAreaLayoutLine &line = info.lines[path.at(1)]; QToolBarAreaLayoutLine &line = info.lines[path.at(1)];
Q_ASSERT(path.at(2) >= 0 && path.at(2) < line.toolBarItems.count()); if (path.at(2) < 0 || path.at(2) >= line.toolBarItems.count())
return line.toolBarItems[path.at(2)]; return 0;
return &(line.toolBarItems[path.at(2)]);
} }
QRect QToolBarAreaLayout::itemRect(const QList<int> &path) const QRect QToolBarAreaLayout::itemRect(const QList<int> &path) const
@ -1132,23 +1135,28 @@ QRect QToolBarAreaLayout::itemRect(const QList<int> &path) const
QLayoutItem *QToolBarAreaLayout::plug(const QList<int> &path) QLayoutItem *QToolBarAreaLayout::plug(const QList<int> &path)
{ {
QToolBarAreaLayoutItem &item = this->item(path); QToolBarAreaLayoutItem *item = this->item(path);
Q_ASSERT(item.gap); if (!item) {
Q_ASSERT(item.widgetItem != 0); qWarning() << Q_FUNC_INFO << "No item at" << path;
item.gap = false; return 0;
return item.widgetItem; }
Q_ASSERT(item->gap);
Q_ASSERT(item->widgetItem != 0);
item->gap = false;
return item->widgetItem;
} }
QLayoutItem *QToolBarAreaLayout::unplug(const QList<int> &path, QToolBarAreaLayout *other) QLayoutItem *QToolBarAreaLayout::unplug(const QList<int> &path, QToolBarAreaLayout *other)
{ {
//other needs to be update as well //other needs to be update as well
Q_ASSERT(path.count() == 3); Q_ASSERT(path.count() == 3);
QToolBarAreaLayoutItem &item = this->item(path); QToolBarAreaLayoutItem *item = this->item(path);
Q_ASSERT(item);
//update the leading space here //update the leading space here
QToolBarAreaLayoutInfo &info = docks[path.at(0)]; QToolBarAreaLayoutInfo &info = docks[path.at(0)];
QToolBarAreaLayoutLine &line = info.lines[path.at(1)]; QToolBarAreaLayoutLine &line = info.lines[path.at(1)];
if (item.size != pick(line.o, item.realSizeHint())) { if (item->size != pick(line.o, item->realSizeHint())) {
//the item doesn't have its default size //the item doesn't have its default size
//so we'll give this to the next item //so we'll give this to the next item
int newExtraSpace = 0; int newExtraSpace = 0;
@ -1185,9 +1193,9 @@ QLayoutItem *QToolBarAreaLayout::unplug(const QList<int> &path, QToolBarAreaLayo
} }
} }
Q_ASSERT(!item.gap); Q_ASSERT(!item->gap);
item.gap = true; item->gap = true;
return item.widgetItem; return item->widgetItem;
} }
static QRect unpackRect(uint geom0, uint geom1, bool *floating) static QRect unpackRect(uint geom0, uint geom1, bool *floating)

2
src/widgets/widgets/qtoolbararealayout_p.h
View File

@ -232,7 +232,7 @@ public:
void remove(const QList<int> &path); void remove(const QList<int> &path);
void remove(QLayoutItem *item); void remove(QLayoutItem *item);
void clear(); void clear();
QToolBarAreaLayoutItem &item(const QList<int> &path); QToolBarAreaLayoutItem *item(const QList<int> &path);
QRect itemRect(const QList<int> &path) const; QRect itemRect(const QList<int> &path) const;
QLayoutItem *plug(const QList<int> &path); QLayoutItem *plug(const QList<int> &path);
QLayoutItem *unplug(const QList<int> &path, QToolBarAreaLayout *other); QLayoutItem *unplug(const QList<int> &path, QToolBarAreaLayout *other);