feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Change workaround for scrambled dock widget layouts

Browse Source 
The workaround from 3d92a79a introduces a bug by itself: When a user moves
all docks off the bottom area, the workaround will trigger as the
condition "nothing below the tool bar" is met.

This here changes the condition to toolbar.width() != mainwindow.width(),
which will trigger in the known scrambled situations (there was always
something to the right of the toolbar), but not in the situation
described above.

Task-number: QTCREATORBUG-21669
Task-number: QTCREATORBUG-21455
Change-Id: Ic2eabbe2ed07352680add4fc5e3b5f6673600479
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-01-24 15:04:47 +01:00
parent 5f5e2543a5
commit e8a511f313
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -372,25 +372,17 @@ void DebuggerMainWindowPrivate::fixupLayoutIfNeeded()
{ {
// Evil workaround for QTCREATORBUG-21455: In some so far unknown situation // Evil workaround for QTCREATORBUG-21455: In some so far unknown situation
// the saveLayout/restoreLayout process leads to a situation where some docks // the saveLayout/restoreLayout process leads to a situation where some docks
// does not end up below the perspective toolbar even though they were there // do not end up below the perspective toolbar even though they were there
// initially, leading to an awkward dock layout. // initially, leading to an awkward dock layout.
// This here tries to detect the situation (no other dock directly below the // This here tries to detect the situation (sonmething else in the bottom
// toolbar) and "corrects" that by restoring the default layout. // area is at the right of the toolbar) "corrects" that by restoring the
const QRect toolbarRect = m_toolBarDock->geometry(); // default layout.
const int targetX = toolbarRect.left();
const int targetY = toolbarRect.bottom();
const QList<QDockWidget *> docks = q->dockWidgets();
for (QDockWidget *dock : docks) {
const QRect dockRect = dock->geometry();
// 10 for some decoration wiggle room. Found something below? Good.
if (targetX == dockRect.left() && qAbs(targetY - dockRect.top()) < 10)
return;
}
if (m_toolBarDock->width() != q->width()) {
qDebug() << "Scrambled dock layout found. Resetting it."; qDebug() << "Scrambled dock layout found. Resetting it.";
resetCurrentPerspective(); resetCurrentPerspective();
} }
}
void DebuggerMainWindowPrivate::selectPerspective(Perspective *perspective) void DebuggerMainWindowPrivate::selectPerspective(Perspective *perspective)
{ {