From 961bef36c00e01f5a9945595ac718376b324f59b Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 3 Feb 2023 17:10:42 +0100 Subject: [PATCH] Gui: fix regression that NaviCube cannot be switched off any more --- src/Gui/DlgSettingsNavigation.cpp | 3 +-- src/Gui/View3DInventorViewer.cpp | 13 ++----------- src/Gui/View3DInventorViewer.h | 3 +-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Gui/DlgSettingsNavigation.cpp b/src/Gui/DlgSettingsNavigation.cpp index b571639abb..29c2b1c5d4 100644 --- a/src/Gui/DlgSettingsNavigation.cpp +++ b/src/Gui/DlgSettingsNavigation.cpp @@ -123,8 +123,7 @@ void DlgSettingsNavigation::recreateNaviCubes() for (auto view : views) { if (auto view3d = qobject_cast(view)) { auto viewer = view3d->getViewer(); - viewer->deleteNavigationCube(); - viewer->createNavigationCube(); + viewer->updateNavigationCube(); } } } diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 1a18403144..40835f5866 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -1176,20 +1176,11 @@ NaviCube* View3DInventorViewer::getNavigationCube() const return naviCube; } -void View3DInventorViewer::createNavigationCube() -{ - if (!naviCube) { - naviCube = new NaviCube(this); - naviCubeEnabled = true; - } -} - -void View3DInventorViewer::deleteNavigationCube() +void View3DInventorViewer::updateNavigationCube() { if (naviCube) { delete naviCube; - naviCube = nullptr; - naviCubeEnabled = false; + naviCube = new NaviCube(this); } } diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index bb5a7881cb..6c57891062 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -387,8 +387,7 @@ public: bool isEnabledNaviCube() const; void setNaviCubeCorner(int); NaviCube* getNavigationCube() const; - void createNavigationCube(); - void deleteNavigationCube(); + void updateNavigationCube(); void setEnabledVBO(bool b); bool isEnabledVBO() const; void setRenderCache(int);