mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 21:25:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented proper support for setting floating widget focused widget

Browse Source
This commit is contained in:
Uwe Kindler 2020-06-05 06:55:43 +02:00
commit 4041aa72cc
5 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/MainWindow.cpp
View File

@ -571,7 +571,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
// dock widget.
// CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
//CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
CDockManager::setConfigFlag(CDockManager::FocusStyling, true);
// Now create the dock manager and its content

4
src/DockContainerWidget.cpp
View File

@ -1464,7 +1464,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
if (SingleDroppedDockWidget)
{
std::cout << "SingleDockWidget dropped" << std::endl;
d->DockManager->emitWidgetDroppedSignals(SingleDroppedDockWidget);
d->DockManager->notifyWidgetDrop(SingleDroppedDockWidget);
}
d->DockManager->notifyFloatingWidgetDrop(FloatingWidget);
}
@ -1499,7 +1499,7 @@ void CDockContainerWidget::dropWidget(QWidget* Widget, DockWidgetArea DropArea,
}
window()->activateWindow();
d->DockManager->emitWidgetDroppedSignals(Widget);
d->DockManager->notifyWidgetDrop(Widget);
}

55
src/DockManager.cpp
View File

@ -67,7 +67,7 @@
* name. Normally, when resources are built as part of the application, the
* resources are loaded automatically at startup. The Q_INIT_RESOURCE() macro
* is necessary on some platforms for resources stored in a static library.
* Because GCC caues a linker error if we put Q_INIT_RESOURCE into the
* Because GCC causes a linker error if we put Q_INIT_RESOURCE into the
* loadStyleSheet() function, we place it into a function outside of the ads
* namespace
*/
@ -80,7 +80,7 @@ static void initResource()
namespace ads
{
/**
* Internal file version in case the sturture changes interbally
* Internal file version in case the structure changes internally
*/
enum eStateFileVersion
{
@ -267,8 +267,8 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state, int versi
}
ADS_PRINT(s.attributes().value("UserVersion"));
// Older files do not support UserVersion so we skip this if the file does
// not have this attribute
// Older files do not support UserVersion but we still want to load them so
// we first test if the attribute exists
if (!s.attributes().value("UserVersion").isEmpty())
{
v = s.attributes().value("UserVersion").toInt(&ok);
@ -512,21 +512,20 @@ void DockManagerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
FocusedDockWidget = DockWidget;
updateDockWidgetFocusStyle(FocusedDockWidget, true);
NewFocusedDockArea = FocusedDockWidget->dockAreaWidget();
if (!NewFocusedDockArea || (FocusedArea == NewFocusedDockArea))
if (NewFocusedDockArea && (FocusedArea != NewFocusedDockArea))
{
return;
if (FocusedArea)
{
std::cout << "FocusedArea" << std::endl;
QObject::disconnect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
updateDockAreaFocusStyle(FocusedArea, false);
}
FocusedArea = NewFocusedDockArea;
updateDockAreaFocusStyle(FocusedArea, true);
QObject::connect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
}
if (FocusedArea)
{
std::cout << "FocusedArea" << std::endl;
QObject::disconnect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
updateDockAreaFocusStyle(FocusedArea, false);
}
FocusedArea = NewFocusedDockArea;
updateDockAreaFocusStyle(FocusedArea, true);
QObject::connect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
auto NewFloatingWidget = FocusedDockWidget->dockContainer()->floatingWidget();
if (NewFloatingWidget)
@ -1077,9 +1076,9 @@ void CDockManager::onFocusedDockAreaViewToggled(bool Open)
//===========================================================================
void CDockManager::emitWidgetDroppedSignals(QWidget* DroppedWidget)
void CDockManager::notifyWidgetDrop(QWidget* DroppedWidget)
{
std::cout << "CDockManager::emitWidgetDroppedSignals" << std::endl;
std::cout << "\n\nCDockManager::notifyWidgetDrop" << std::endl;
CDockWidget* DockWidget = qobject_cast<CDockWidget*>(DroppedWidget);
if (DockWidget)
{
@ -1097,12 +1096,14 @@ void CDockManager::emitWidgetDroppedSignals(QWidget* DroppedWidget)
DockWidget = DockArea->currentDockWidget();
CDockManager::setWidgetFocus(DockWidget->tabWidget());
std::cout << "\n\n" << std::endl;
}
//===========================================================================
void CDockManager::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget)
{
std::cout << "\n\nCDockManager::notifyFloatingWidgetDrop" << std::endl;
if (!FloatingWidget)
{
return;
@ -1113,27 +1114,15 @@ void CDockManager::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidg
{
return;
}
std::cout << "vDockWidget.isValid()" << std::endl;
auto DockWidget = vDockWidget.value<CDockWidget*>();
if (DockWidget)
{
std::cout << "Dropped focus dock widget " << DockWidget->objectName().toStdString() << std::endl;
DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget);
CDockManager::setWidgetFocus(DockWidget->tabWidget());
}
}
//===========================================================================
void CDockManager::notifyDockWidgetRelocation(CDockWidget* DockWidget, CDockContainerWidget* ContainerOld)
{
}
//===========================================================================
void CDockManager::notifyDockAreaRelocation(CDockAreaWidget* DockArea, CDockContainerWidget* ContainerOld)
{
std::cout << "\n\n" << std::endl;
}

14
src/DockManager.h
View File

@ -126,7 +126,7 @@ protected:
* A container needs to call this function if a widget has been dropped
* into it
*/
void emitWidgetDroppedSignals(QWidget* DroppedWidget);
void notifyWidgetDrop(QWidget* DroppedWidget);
/**
* This function is called, if a floating widget has been dropped into
@ -136,18 +136,6 @@ protected:
*/
void notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget);
/**
* This function is called, if the given DockWidget has been relocated from
* the old container ContainerOld to the new container DockWidget->dockContainer()
*/
void notifyDockWidgetRelocation(CDockWidget* DockWidget, CDockContainerWidget* ContainerOld);
/**
* This function is called, if the given DockAreahas been relocated from
* the old container ContainerOld to the new container DockArea->dockContainer()
*/
void notifyDockAreaRelocation(CDockAreaWidget* DockArea, CDockContainerWidget* ContainerOld);
/**
* Show the floating widgets that has been created floating
*/

2
src/DockWidgetTab.cpp
View File

@ -472,7 +472,7 @@ void CDockWidgetTab::setActiveTab(bool active)
bool UpdateFocusStyle = false;
if (active && !hasFocus())
{
//setFocus(Qt::OtherFocusReason);
setFocus(Qt::OtherFocusReason);
UpdateFocusStyle = true;
}