4 files changed, 16 insertions(+), 1 deletions(-)

M module-apps/apps-common/windows/AppWindow.cpp
M module-apps/apps-common/windows/AppWindow.hpp
M module-gui/gui/dom/Item2JsonSerializingVisitor.cpp
M module-gui/gui/widgets/Window.hpp

@@ 275,4 275,10 @@ namespace gui
         visitor.visit(*this);
     }
 
+    std::string AppWindow::getUniqueName()
+    {
+        constexpr auto separator = "/";
+        return application->GetName() + separator + getName();
+    }
+
 } /* namespace gui */

@@ 69,6 69,8 @@ namespace gui
             return application;
         };
 
+        std::string getUniqueName() override;
+
         virtual bool onDatabaseMessage(sys::Message *msg);
 
         bool updateSim();

@@ 74,7 74,7 @@ void Item2JsonSerializingVisitor::visit(gui::Window &item)
     if (itemName.empty()) {
         itemName = magic_enum::enum_name(visitor::Names::Window);
     }
-    sink.emplace(magic_enum::enum_name(visitor::Window::WindowName), std::string{item.getName()});
+    sink.emplace(magic_enum::enum_name(visitor::Window::WindowName), std::string{item.getUniqueName()});
     visit(static_cast<gui::Item &>(item));
 }
 

@@ 67,10 67,17 @@ namespace gui
 
         void buildDrawListImplementation(std::list<Command> &commands) override;
 
+        /// used for window switching purposes
         std::string getName()
         {
             return name;
         };
+
+        /// used for fetching unique name of window
+        virtual std::string getUniqueName()
+        {
+            return name;
+        }
     };
 
 } /* namespace gui */