From 136da90645f114a962ef54d1e9fa302535f3b02b Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:08:28 +0100 Subject: [PATCH] [Sketcher] Correct default OVP and Geometry Creation colors... (#14763) * [Sketcher] Correct default OVP and Geometry Creation colors * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- src/Mod/Sketcher/Gui/DrawSketchController.h | 2 +- .../Sketcher/Gui/EditModeCoinManagerParameters.cpp | 7 ++++--- src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Mod/Sketcher/Gui/DrawSketchController.h b/src/Mod/Sketcher/Gui/DrawSketchController.h index 604a4dc0e0..5d26a03069 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchController.h +++ b/src/Mod/Sketcher/Gui/DrawSketchController.h @@ -168,7 +168,7 @@ private: "User parameter:BaseApp/Preferences/View"); dimConstrColor = SbColor(1.0f, 0.149f, 0.0f); // NOLINT - dimConstrDeactivatedColor = SbColor(0.8f, 0.8f, 0.8f); // NOLINT + dimConstrDeactivatedColor = SbColor(0.5f, 0.5f, 0.5f); // NOLINT float transparency = 0.f; unsigned long color = (unsigned long)(dimConstrColor.getPackedValue()); diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp index aecf0ad0b6..70c7bb1690 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp +++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp @@ -28,7 +28,7 @@ using namespace SketcherGui; SbColor DrawingParameters::InformationColor(0.0f, 1.0f, 0.0f); // #00FF00 -> ( 0,255, 0) -SbColor DrawingParameters::CreateCurveColor(0.8f, 0.8f, 0.8f); // #CCCCCC -> (204,204,204) +SbColor DrawingParameters::CreateCurveColor(0.5f, 0.5f, 0.5f); // ##7f7f7f -> (127,127,127) SbColor DrawingParameters::CrossColorH(0.8f, 0.4f, 0.4f); // #CC6666 -> (204,102,102) SbColor DrawingParameters::CrossColorV(0.47f, 1.0f, 0.51f); // #83FF83 -> (120,255,131) SbColor DrawingParameters::InvalidSketchColor(1.0f, 0.42f, 0.0f); // #FF6D00 -> (255,109, 0) @@ -57,7 +57,8 @@ SbColor DrawingParameters::ConstrIcoColor(1.0f, 0.149f, 0.0f); // #FF2600 -> (2 SbColor DrawingParameters::NonDrivingConstrDimColor(0.0f, 0.149f, 1.0f); // #0026FF -> ( 0, 38,255) SbColor DrawingParameters::ExprBasedConstrDimColor(1.0f, 0.5f, 0.149f); // #FF7F26 -> (255, 127,38) -SbColor DrawingParameters::DeactivatedConstrDimColor(0.8f, 0.8f, 0.8f); // #CCCCCC -> (204,204,204) -SbColor DrawingParameters::CursorTextColor(0.0f, 0.0f, 1.0f); // #0000FF -> (0,0,255) +SbColor + DrawingParameters::DeactivatedConstrDimColor(0.5f, 0.5f, 0.5f); // ##7f7f7f -> (127,127,127) +SbColor DrawingParameters::CursorTextColor(0.0f, 0.0f, 1.0f); // #0000FF -> (0,0,255) const MultiFieldId MultiFieldId::Invalid = MultiFieldId(); diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui index cdf9cb8071..6cb5b7dbdc 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsAppearance.ui @@ -42,9 +42,9 @@ - 204 - 204 - 204 + 127 + 127 + 127 @@ -754,9 +754,9 @@ - 204 - 204 - 204 + 127 + 127 + 127