Skip to content

Commit 316e532

Browse files
author
Uwe Kindler
committed
Fixed showing of unassigned dock widgets
1 parent 6843703 commit 316e532

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/DockWidget.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,10 @@ void CDockWidget::toggleViewInternal(bool Open)
459459
CDockWidget::emitTopLevelEventForWidget(TopLevelDockWidgetBefore, false);
460460
}
461461

462+
// Here we need to call the dockContainer() function again, because if
463+
// this dock widget was unassigned before the call to showDockWidget() then
464+
// it has a dock container now
465+
DockContainer = dockContainer();
462466
CDockWidget* TopLevelDockWidgetAfter = DockContainer
463467
? DockContainer->topLevelDockWidget() : nullptr;
464468
CDockWidget::emitTopLevelEventForWidget(TopLevelDockWidgetAfter, true);

src/FloatingDockContainer.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@
3737
#include <QAction>
3838
#include <QDebug>
3939
#include <QAbstractButton>
40+
#include <QElapsedTimer>
4041

4142
#include "DockContainerWidget.h"
4243
#include "DockAreaWidget.h"
4344
#include "DockManager.h"
4445
#include "DockWidget.h"
4546
#include "DockOverlay.h"
4647

48+
#include <iostream>
4749

4850
namespace ads
4951
{
@@ -148,6 +150,10 @@ void FloatingDockContainerPrivate::titleMouseReleaseEvent()
148150
//============================================================================
149151
void FloatingDockContainerPrivate::updateDropOverlays(const QPoint& GlobalPos)
150152
{
153+
static QElapsedTimer MsSinceLastCallTimer;
154+
QElapsedTimer PerformanceTimer;
155+
PerformanceTimer.start();
156+
151157
if (!_this->isVisible() || !DockManager)
152158
{
153159
return;
@@ -219,6 +225,8 @@ void FloatingDockContainerPrivate::updateDropOverlays(const QPoint& GlobalPos)
219225
{
220226
DockAreaOverlay->hideOverlay();
221227
}
228+
229+
std::cout << "updateDropOverlays us: " << PerformanceTimer.nsecsElapsed() / 1000 << std::endl;
222230
}
223231

224232

0 commit comments

Comments
 (0)