#5532: Hide the grid and the toolbar button in the MaterialPreview

libs/wxutil/preview/RenderPreview.cpp

@@ -426,6 +426,14 @@ bool RenderPreview::drawPreview()
     if (!_initialised)
     {
         initialisePreview();
+
+        // Since we shouldn't call the virtual canDrawGrid() in the constructor
+        // adjust the tool bar here.
+        if (!canDrawGrid())
+        {
+            auto* utilToolbar = findNamedObject<wxToolBar>(_mainPanel, "RenderPreviewUtilToolbar");
+            utilToolbar->DeleteTool(getToolBarToolByLabel(utilToolbar, "gridButton")->GetId());
+        }
     }
 
     util::ScopedBoolLock lock(_renderingInProgress);
@@ -476,7 +484,7 @@ bool RenderPreview::drawPreview()
 	glMatrixMode(GL_MODELVIEW);
 	glLoadMatrixd(_volumeTest.GetModelview());
 
-	if (_renderGrid)
+	if (_renderGrid && canDrawGrid())
 	{
 		drawGrid();
 	}
@@ -732,6 +740,11 @@ void RenderPreview::onSizeAllocate(wxSizeEvent& ev)
     _previewHeight = ev.GetSize().GetHeight();
 }
 
+bool RenderPreview::canDrawGrid()
+{
+    return true;
+}
+
 void RenderPreview::drawGrid()
 {
 	static float GRID_MAX_DIM = 512.0f;

libs/wxutil/preview/RenderPreview.h

@@ -164,6 +164,9 @@ class RenderPreview :
 
     void associateRenderSystem();
 
+    // Base method will return true, which will also make the corresponding button appear on the toolbar
+    virtual bool canDrawGrid();
+
     // Can be overridden by subclasses to update their scene/models
     virtual void onRenderModeChanged() {}
 

radiant/ui/materials/MaterialPreview.cpp

@@ -17,4 +17,9 @@ void MaterialPreview::setMaterial(const MaterialPtr& material)
     _material = material;
 }
 
+bool MaterialPreview::canDrawGrid()
+{
+    return false;
+}
+
 }

radiant/ui/materials/MaterialPreview.h

@@ -17,6 +17,9 @@ class MaterialPreview :
 
     const MaterialPtr& getMaterial();
     void setMaterial(const MaterialPtr& material);
+
+protected:
+    bool canDrawGrid() override;
 };
 
 }