From 09dba18994cbdd62fba47df58fa55108c0571b8b Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sat, 8 Jan 2022 16:01:05 +0800 Subject: [PATCH] fix QDockWidget --- src/data/core/vnotex.json | 2 +- src/widgets/dockwidgethelper.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index 0ad9f067..431f4c77 100644 --- a/src/data/core/vnotex.json +++ b/src/data/core/vnotex.json @@ -6,7 +6,7 @@ "version" : "3.11.0" }, "core" : { - "theme" : "pure", + "theme" : "moonlight", "locale" : "", "shortcuts" : { "FullScreen" : "F11", diff --git a/src/widgets/dockwidgethelper.cpp b/src/widgets/dockwidgethelper.cpp index 31d500a6..699823a7 100644 --- a/src/widgets/dockwidgethelper.cpp +++ b/src/widgets/dockwidgethelper.cpp @@ -243,6 +243,8 @@ void DockWidgetHelper::activateDock(DockIndex p_dockIndex) void DockWidgetHelper::activateDock(QDockWidget *p_dock) { + bool needUpdateTabBar = !p_dock->isVisible(); + p_dock->show(); Q_FOREACH(QTabBar* tabBar, m_mainWindow->findChildren(QString(), Qt::FindDirectChildrenOnly)) { bool found = false; @@ -258,7 +260,12 @@ void DockWidgetHelper::activateDock(QDockWidget *p_dock) break; } } + p_dock->setFocus(); + + if (needUpdateTabBar) { + updateDockWidgetTabBar(); + } } const QVector &DockWidgetHelper::getDocks() const