Fix owner usage bugs

ComputationalBiomechanicsLab · Feb 14, 2025 · 08bd55d · 08bd55d
1 parent ed4938c
commit 08bd55d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 8 deletions.
diff --git a/libopensimcreator/UI/FrameDefinition/FrameDefinitionTab.cpp b/libopensimcreator/UI/FrameDefinition/FrameDefinitionTab.cpp
@@ -960,9 +960,10 @@ class osc::FrameDefinitionTab::Impl final : public TabPrivate {
     {
         m_PanelManager->register_toggleable_panel(
             "Navigator",
-            [this](Widget*, std::string_view panelName)
+            [this](Widget* parent, std::string_view panelName)
             {
                 return std::make_shared<NavigatorPanel>(
+                    parent,
                     panelName,
                     m_Model,
                     [this](const OpenSim::ComponentPath& rightClickedPath)

diff --git a/libopensimcreator/UI/ModelEditor/ModelEditorTab.cpp b/libopensimcreator/UI/ModelEditor/ModelEditorTab.cpp
@@ -99,9 +99,10 @@ class osc::ModelEditorTab::Impl final : public TabPrivate {
 
         m_PanelManager->register_toggleable_panel(
             "Navigator",
-            [this](Widget*, std::string_view panelName)
+            [this](Widget* parent, std::string_view panelName)
             {
                 return std::make_shared<NavigatorPanel>(
+                    parent,
                     panelName,
                     m_Model,
                     [this](const OpenSim::ComponentPath& p)

diff --git a/libopensimcreator/UI/PreviewExperimentalData/PreviewExperimentalDataTab.cpp b/libopensimcreator/UI/PreviewExperimentalData/PreviewExperimentalDataTab.cpp
@@ -330,6 +330,7 @@ class osc::PreviewExperimentalDataTab::Impl final : public TabPrivate {
             [this](Widget* parent, std::string_view panelName)
             {
                 return std::make_shared<NavigatorPanel>(
+                    parent,
                     panelName,
                     m_UiState->updSharedModelPtr(),
                     [this, parent](const OpenSim::ComponentPath& p)

diff --git a/libopensimcreator/UI/Shared/ComponentContextMenu.cpp b/libopensimcreator/UI/Shared/ComponentContextMenu.cpp
@@ -371,7 +371,7 @@ class osc::ComponentContextMenu::Impl final : public PopupPrivate {
         m_Path{std::move(path_)},
         m_Flags{flags_}
     {
-        owner.set_modal(false);
+        set_modal(false);
         OSC_ASSERT(m_Model != nullptr);
     }
 

diff --git a/libopensimcreator/UI/Shared/ImportStationsFromCSVPopup.cpp b/libopensimcreator/UI/Shared/ImportStationsFromCSVPopup.cpp
@@ -32,7 +32,7 @@ class osc::ImportStationsFromCSVPopup::Impl final : public PopupPrivate {
         PopupPrivate{owner, parent, popupName_},
         m_OnImportCallback{std::move(onImport_)}
     {
-        owner.set_modal(true);
+        set_modal(true);
     }
 
     void draw_content()

diff --git a/libopensimcreator/UI/Shared/NavigatorPanel.cpp b/libopensimcreator/UI/Shared/NavigatorPanel.cpp
@@ -92,11 +92,12 @@ class osc::NavigatorPanel::Impl final : public PanelPrivate {
 public:
     Impl(
         NavigatorPanel& owner,
+        Widget* parent,
         std::string_view panelName,
         std::shared_ptr<IModelStatePair> model,
         std::function<void(const OpenSim::ComponentPath&)> onRightClick) :
 
-        PanelPrivate{owner, nullptr, panelName},
+        PanelPrivate{owner, parent, panelName},
         m_Model{std::move(model)},
         m_OnRightClick{std::move(onRightClick)}
     {}
@@ -329,10 +330,11 @@ class osc::NavigatorPanel::Impl final : public PanelPrivate {
 };
 
 osc::NavigatorPanel::NavigatorPanel(
+    Widget* parent,
     std::string_view panelName,
     std::shared_ptr<IModelStatePair> model,
     std::function<void(const OpenSim::ComponentPath&)> onRightClick) :
 
-    Panel{std::make_unique<Impl>(*this, panelName, std::move(model), std::move(onRightClick))}
+    Panel{std::make_unique<Impl>(*this, parent, panelName, std::move(model), std::move(onRightClick))}
 {}
 void osc::NavigatorPanel::impl_draw_content() { private_data().draw_content(); }
diff --git a/libopensimcreator/UI/Shared/NavigatorPanel.h b/libopensimcreator/UI/Shared/NavigatorPanel.h
@@ -15,6 +15,7 @@ namespace osc
     class NavigatorPanel final : public Panel {
     public:
         explicit NavigatorPanel(
+            Widget* parent,
             std::string_view panelName,
             std::shared_ptr<IModelStatePair>,
             std::function<void(const OpenSim::ComponentPath&)> onRightClick = [](const auto&){}

diff --git a/libopensimcreator/UI/Simulation/SimulationTab.cpp b/libopensimcreator/UI/Simulation/SimulationTab.cpp
@@ -85,6 +85,7 @@ class osc::SimulationTab::Impl final :
             [this](Widget* parent, std::string_view panelName)
             {
                 return std::make_shared<NavigatorPanel>(
+                    parent,
                     panelName,
                     m_ShownModelState,
                     [this, parent](const OpenSim::ComponentPath& p)

diff --git a/liboscar/UI/Popups/Popup.cpp b/liboscar/UI/Popups/Popup.cpp
@@ -42,6 +42,11 @@ void osc::PopupPrivate::request_close()
     should_open_ = false;
 }
 
+void osc::PopupPrivate::set_modal(bool v)
+{
+    is_modal_ = v;
+}
+
 osc::Popup::Popup(
     Widget* parent,
     std::string_view name,
@@ -183,8 +188,7 @@ bool osc::Popup::is_modal() const
 }
 void osc::Popup::set_modal(bool v)
 {
-    PopupPrivate& pimpl = private_data();
-    pimpl.is_modal_ = v;
+    private_data().set_modal(v);
 }
 void osc::Popup::set_rect(const Rect& rect)
 {

diff --git a/liboscar/UI/Popups/PopupPrivate.h b/liboscar/UI/Popups/PopupPrivate.h
@@ -25,6 +25,7 @@ namespace osc
     protected:
         bool is_popup_opened_this_frame() const;
         void request_close();
+        void set_modal(bool);
 
         OSC_OWNER_GETTERS(Popup);
     private: