Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed setting of tab widget visibility and toggleViewAction() state when dragging dock areas with closed dock widgets

Browse Source
This commit is contained in:
Uwe Kindler
2018-09-07 12:38:11 +02:00
parent 67199a81f4
commit c9123c3640
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DockWidget.cpp
View File

@@ -49,6 +49,8 @@
#include "DockSplitter.h"
#include "ads_globals.h"
#include <iostream>
namespace ads
{
/**
@@ -121,7 +123,7 @@ void DockWidgetPrivate::showDockWidget()
else
{
DockArea->show();
DockArea->setCurrentIndex(DockArea->tabIndex(_this));
DockArea->setCurrentDockWidget(_this);
QSplitter* Splitter = internal::findParent<QSplitter*>(_this);
while (Splitter && !Splitter->isVisible())
{
@@ -380,6 +382,8 @@ void CDockWidget::setToggleViewActionMode(eToggleViewActionMode Mode)
//============================================================================
void CDockWidget::toggleView(bool Open)
{
std::cout << "CDockWidget::toggleView " << objectName().toStdString()
<< " " << Open << std::endl;
QAction* Sender = qobject_cast<QAction*>(sender());
if (Sender == d->ToggleViewAction && !d->ToggleViewAction->isCheckable())
{
@@ -412,7 +416,7 @@ void CDockWidget::toggleView(bool Open)
void CDockWidget::setDockArea(CDockAreaWidget* DockArea)
{
d->DockArea = DockArea;
d->ToggleViewAction->setChecked(DockArea != nullptr);
d->ToggleViewAction->setChecked(DockArea != nullptr && !this->isClosed());
}