5353#include < QRubberBand>
5454#include < QPlainTextEdit>
5555#include < QTableWidget>
56+ #include < QScreen>
57+ #include < QStyle>
5658
5759#ifdef Q_OS_WIN
5860#include < QAxWidget>
@@ -297,14 +299,17 @@ void MainWindowPrivate::createContent()
297299 auto RighDockArea = DockManager->addDockWidget (ads::RightDockWidgetArea, createLongTextLabelDockWidget (ViewMenu), TopDockArea);
298300 DockManager->addDockWidget (ads::TopDockWidgetArea, createLongTextLabelDockWidget (ViewMenu), RighDockArea);
299301 auto BottomDockArea = DockManager->addDockWidget (ads::BottomDockWidgetArea, createLongTextLabelDockWidget (ViewMenu), RighDockArea);
300- DockManager->addDockWidget (ads::RightDockWidgetArea , createLongTextLabelDockWidget (ViewMenu), RighDockArea);
302+ DockManager->addDockWidget (ads::CenterDockWidgetArea , createLongTextLabelDockWidget (ViewMenu), RighDockArea);
301303 DockManager->addDockWidget (ads::CenterDockWidgetArea, createLongTextLabelDockWidget (ViewMenu), BottomDockArea);
302304
303305 auto Action = ui.menuView ->addAction (QString (" Set %1 floating" ).arg (DockWidget->windowTitle ()));
304306 DockWidget->connect (Action, SIGNAL (triggered ()), SLOT (setFloating ()));
305307
306308#ifdef Q_OS_WIN
307- DockManager->addDockWidgetFloating (createActiveXWidget (ViewMenu));
309+ if (!DockManager->configFlags ().testFlag (ads::CDockManager::OpaqueUndocking))
310+ {
311+ DockManager->addDockWidget (ads::CenterDockWidgetArea, createActiveXWidget (ViewMenu), RighDockArea);
312+ }
308313#endif
309314
310315 for (auto DockWidget : DockManager->dockWidgetsMap ())
@@ -404,8 +409,8 @@ CMainWindow::CMainWindow(QWidget *parent) :
404409 // not change if the visibility of the close button changes
405410 // CDockManager::setConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden, true);
406411
407- // uncomment the following line if you want to use non opaque undocking and splitter
408- // movements
412+ // comment the following line if you want to use opaque undocking and
413+ // opaque splitter resizing
409414 CDockManager::setConfigFlags (CDockManager::DefaultNonOpaqueConfig);
410415
411416 // Now create the dock manager and its content
@@ -419,8 +424,12 @@ CMainWindow::CMainWindow(QWidget *parent) :
419424 d->DockManager , SLOT (openPerspective (const QString&)));
420425
421426 d->createContent ();
422- // Default window geometry
427+ // Default window geometry - center on screen
423428 resize (1280 , 720 );
429+ setGeometry (QStyle::alignedRect (
430+ Qt::LeftToRight, Qt::AlignCenter, frameSize (),
431+ QGuiApplication::primaryScreen ()->availableGeometry ()
432+ ));
424433
425434 // d->restoreState();
426435 d->restorePerspectives ();
0 commit comments