#6107: Active layer is using bold style

codereader · Sep 25, 2022 · eecf59f · eecf59f
1 parent 104080e
commit eecf59f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/libs/wxutil/dataview/TreeViewItemStyle.h b/libs/wxutil/dataview/TreeViewItemStyle.h
@@ -53,6 +53,14 @@ class TreeViewItemStyle
         return italic;
     }
 
+    static wxDataViewItemAttr ActiveItemStyle()
+    {
+        wxDataViewItemAttr bold;
+        bold.SetBold(true);
+
+        return bold;
+    }
+
     // Styles used by the merge action visualisation in data views
 
     static void ApplyKeyValueAddedStyle(wxDataViewItemAttr& attr)

diff --git a/radiant/ui/layers/LayerControlDialog.cpp b/radiant/ui/layers/LayerControlDialog.cpp
@@ -12,11 +12,11 @@
 #include <wx/panel.h>
 #include <wx/artprov.h>
 
-#include "wxutil/ScrollWindow.h"
 #include "wxutil/Button.h"
 
 #include "scene/LayerUsageBreakdown.h"
 #include "wxutil/dataview/TreeView.h"
+#include "wxutil/dataview/TreeViewItemStyle.h"
 
 namespace ui
 {
@@ -104,19 +104,26 @@ void LayerControlDialog::refresh()
 
 	// Traverse the layers
     auto& layerManager = GlobalMapModule().getRoot()->getLayerManager();
+    auto activeLayerId = layerManager.getActiveLayer();
 
-    layerManager.foreachLayer([&](int layerID, const std::string& layerName)
+    layerManager.foreachLayer([&](int layerId, const std::string& layerName)
     {
         // Store the object in a sorted container
         auto row = _layerStore->AddItem();
 
-        row[_columns.id] = layerID;
+        row[_columns.id] = layerId;
         row[_columns.name] = layerName;
-        row[_columns.visible] = layerManager.layerIsVisible(layerID);
+
+        if (activeLayerId == layerId)
+        {
+            row[_columns.name] = wxutil::TreeViewItemStyle::ActiveItemStyle();
+        }
+
+        row[_columns.visible] = layerManager.layerIsVisible(layerId);
 
         row.SendItemAdded();
 
-        _layerItemMap.emplace(layerID, row.getItem());
+        _layerItemMap.emplace(layerId, row.getItem());
     });
 
 #if 0
@@ -146,7 +153,8 @@ void LayerControlDialog::update()
 		return;
 	}
 
-	auto& layerSystem = GlobalMapModule().getRoot()->getLayerManager();
+	auto& layerManager = GlobalMapModule().getRoot()->getLayerManager();
+    auto activeLayerId = layerManager.getActiveLayer();
 
 	// Update usage next time round
 	_rescanSelectionOnIdle = true;
@@ -155,17 +163,20 @@ void LayerControlDialog::update()
     std::size_t numVisible = 0;
     std::size_t numHidden = 0;
 
-	layerSystem.foreachLayer([&](int layerID, const std::string& layerName)
+    layerManager.foreachLayer([&](int layerId, const std::string& layerName)
     {
-        auto existingItem = _layerItemMap.find(layerID);
+        auto existingItem = _layerItemMap.find(layerId);
 
         if (existingItem == _layerItemMap.end()) return; // tracking error?
 
         wxutil::TreeModel::Row row(existingItem->second, *_layerStore);
 
         row[_columns.name] = layerName;
 
-	    if (layerSystem.layerIsVisible(layerID))
+        row[_columns.name] = activeLayerId == layerId ? 
+            wxutil::TreeViewItemStyle::ActiveItemStyle() : wxDataViewItemAttr(); // no style
+
+        if (layerManager.layerIsVisible(layerId))
         {
             row[_columns.visible] = true;
             numVisible++;