From 528504d72ec1436c9b182fe8111e7778f099d13b Mon Sep 17 00:00:00 2001 From: Sven Eberhardt Date: Sat, 27 Aug 2016 20:10:58 -0400 Subject: [PATCH] Editor: Hide grade circle in viewport when using rectangle or picker tool --- src/editor/C4EditCursor.cpp | 2 +- src/editor/C4ToolsDlg.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/editor/C4EditCursor.cpp b/src/editor/C4EditCursor.cpp index 6a5a63390..8a1978cd4 100644 --- a/src/editor/C4EditCursor.cpp +++ b/src/editor/C4EditCursor.cpp @@ -877,7 +877,7 @@ void C4EditCursor::Draw(C4TargetFacet &cgo) DropTarget->GetX() + cgo.X - cgo.TargetX - ::GraphicsResource.fctDropTarget.Wdt / 2, DropTarget->GetY() + DropTarget->Shape.y + cgo.Y - cgo.TargetY - ::GraphicsResource.fctDropTarget.Hgt); // Draw paint circle - if (Mode == C4CNS_ModeDraw && has_mouse_hover && ::Console.ToolsDlg.Grade>0) + if (Mode == C4CNS_ModeDraw && has_mouse_hover && ::Console.ToolsDlg.Grade>0 && ::Console.ToolsDlg.IsGradedTool()) { // shadow for recognition on white background/material pDraw->DrawCircleDw(cgo.Surface, X + cgo.X - cgo.TargetX + 1.0f/cgo.Zoom, Y + cgo.Y - cgo.TargetY + 1.0f / cgo.Zoom, ::Console.ToolsDlg.Grade, 0xff000000, line_width); diff --git a/src/editor/C4ToolsDlg.h b/src/editor/C4ToolsDlg.h index 62f5d52b5..deac1ca15 100644 --- a/src/editor/C4ToolsDlg.h +++ b/src/editor/C4ToolsDlg.h @@ -78,6 +78,7 @@ public: bool SelectBackMaterial(const char *szMaterial, bool by_console_gui = false); void SetAlternateTool(); void ResetAlternateTool(); + bool IsGradedTool() const { return Tool == C4TLS_Brush || Tool == C4TLS_Line || Tool == C4TLS_Fill; } // return whether Grade measure affects selected tool protected: void AssertValidTexture(); void AssertValidBackTexture();