Skip to content

Commit 268f865

Browse files
author
Uwe Kindler
committed
Some smal improvements in FloatingDockContainer
1 parent 1dfabb3 commit 268f865

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

demo/MainWindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,13 @@ void MainWindowPrivate::createContent()
177177
DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, false);
178178
DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
179179
DockManager->addDockWidget(ads::LeftDockWidgetArea, createLongTextLabelDockWidget(ViewMenu));
180-
/*auto FileSystemWidget = createFileSystemTreeDockWidget(ViewMenu);
180+
auto FileSystemWidget = createFileSystemTreeDockWidget(ViewMenu);
181181
auto ToolBar = FileSystemWidget->toolBar();
182182
ToolBar->addAction(ui.actionSaveState);
183183
ToolBar->addAction(ui.actionRestoreState);
184-
DockManager->addDockWidget(ads::BottomDockWidgetArea, FileSystemWidget);*/
184+
DockManager->addDockWidget(ads::BottomDockWidgetArea, FileSystemWidget);
185185

186-
/*FileSystemWidget = createFileSystemTreeDockWidget(ViewMenu);
186+
FileSystemWidget = createFileSystemTreeDockWidget(ViewMenu);
187187
ToolBar = FileSystemWidget->toolBar();
188188
ToolBar->addAction(ui.actionSaveState);
189189
ToolBar->addAction(ui.actionRestoreState);
@@ -198,7 +198,7 @@ void MainWindowPrivate::createContent()
198198
DockManager->addDockWidget(ads::TopDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
199199
auto BottomDockArea = DockManager->addDockWidget(ads::BottomDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
200200
DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
201-
DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea);*/
201+
DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea);
202202
}
203203

204204

src/FloatingDockContainer.cpp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "DockWidget.h"
4444
#include "DockOverlay.h"
4545

46+
#include <iostream>
4647

4748
namespace ads
4849
{
@@ -332,13 +333,11 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event)
332333
//============================================================================
333334
void CFloatingDockContainer::hideEvent(QHideEvent *event)
334335
{
335-
qDebug() << "CFloatingDockContainer hideEvent";
336+
std::cout << "CFloatingDockContainer hideEvent" << std::endl;
336337
QWidget::hideEvent(event);
337-
auto OpenDockAreas = d->DockContainer->openedDockAreas();
338-
for (auto DockArea : OpenDockAreas)
338+
for (auto DockArea : d->DockContainer->openedDockAreas())
339339
{
340-
auto OpenDockWidgets = DockArea->openedDockWidgets();
341-
for (auto DockWidget : OpenDockWidgets)
340+
for (auto DockWidget : DockArea->openedDockWidgets())
342341
{
343342
DockWidget->toggleView(false);
344343
}
@@ -349,15 +348,22 @@ void CFloatingDockContainer::hideEvent(QHideEvent *event)
349348
//============================================================================
350349
void CFloatingDockContainer::showEvent(QShowEvent *event)
351350
{
351+
std::cout << "CFloatingDockContainer showEvent" << std::endl;
352352
QWidget::showEvent(event);
353-
CDockContainerWidget* DockContainer = dockContainer();
354-
for (int i = 0; i < DockContainer->dockAreaCount(); ++i)
353+
/*for (int i = 0; i < DockContainer->dockAreaCount(); ++i)
355354
{
356355
auto DockArea = DockContainer->dockArea(i);
357356
for (auto DockWidget : DockArea->openedDockWidgets())
358357
{
359358
DockWidget->setToggleViewActionChecked(true);
360359
}
360+
}*/
361+
for (auto DockArea : d->DockContainer->openedDockAreas())
362+
{
363+
for (auto DockWidget : DockArea->openedDockWidgets())
364+
{
365+
DockWidget->setToggleViewActionChecked(true);
366+
}
361367
}
362368
}
363369

0 commit comments

Comments
 (0)