#5613: Implement EntityInspector::updatePrimitiveNumber()

codereader · Oct 22, 2021 · d95a6ce · d95a6ce
1 parent aaca0b1
commit d95a6ce
Showing 1 changed file with 44 additions and 2 deletions.
diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -777,11 +777,53 @@ void EntityInspector::updateGUIElements()
 
 void EntityInspector::updatePrimitiveNumber()
 {
-    if (GlobalMapModule().getEditMode() == IMap::EditMode::Merge && _entitySelection->size() > 1)
+    auto numSelectedEntities = _entitySelection->size();
+
+    if (GlobalMapModule().getEditMode() == IMap::EditMode::Merge)
+    {
+        if (numSelectedEntities > 1)
+        {
+            _primitiveNumLabel->SetLabelText(_("No multi-selection in merge mode"));
+            return;
+        }
+        else if (numSelectedEntities == 1)
+        {
+            _primitiveNumLabel->SetLabelText(_("Merge Preview"));
+            return;
+        }
+    }
+
+    // Do we have exactly one primitive selected?
+    if (numSelectedEntities > 1)
     {
-        _primitiveNumLabel->SetLabelText(_("No multi-selection in merge mode"));
+        _primitiveNumLabel->SetLabelText(fmt::format("[{0} Entities]", numSelectedEntities));
         return;
     }
+
+    // Check if the node is a primitive
+    if (GlobalSelectionSystem().countSelected() == 1)
+    {
+        try
+        {
+            auto selectedNode = GlobalSelectionSystem().ultimateSelected();
+            auto indices = scene::getNodeIndices(selectedNode);
+
+            if (Node_isEntity(selectedNode))
+            {
+                _primitiveNumLabel->SetLabelText(fmt::format(_("Entity {0}"), indices.first));
+            }
+            else
+            {
+                _primitiveNumLabel->SetLabelText(fmt::format(_("Entity {0}, Primitive {1}"), indices.first, indices.second));
+            }
+
+            return;
+        }
+        catch (const std::out_of_range& ex)
+        {
+            rWarning() << ex.what() << std::endl;
+        }
+    }
 
     _primitiveNumLabel->SetLabelText("");
 }