diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp index 0f61ab81e1..9710afacf6 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp +++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.cpp @@ -53,16 +53,17 @@ int GeometryLayerParameters::getSubLayerIndex(const int geoId, : SubLayer::Normal); } -SbColor DrawingParameters::InformationColor(0.0f, 1.0f, 0.0f); // #00FF00 -> ( 0,255, 0) -SbColor DrawingParameters::CreateCurveColor(0.5f, 0.5f, 0.5f); // ##7f7f7f -> (127,127,127) +SbColor DrawingParameters::InformationColor(0.0f, 1.0f, 0.0f); // #00FF00 -> ( 0,255, 0) +SbColor DrawingParameters::CreateCurveColor(0.5f, 0.5f, 0.5f); // ##7f7f7f -> (127,127,127) -namespace { // Anonymous namespace to avoid making those variables global - unsigned long HColorLong = Gui::ViewParams::instance()->getAxisXColor(); - App::Color Hcolor = App::Color(static_cast(HColorLong)); - - unsigned long VColorLong = Gui::ViewParams::instance()->getAxisYColor(); - App::Color Vcolor = App::Color(static_cast(VColorLong)); -} +namespace +{ // Anonymous namespace to avoid making those variables global +unsigned long HColorLong = Gui::ViewParams::instance()->getAxisXColor(); +App::Color Hcolor = App::Color(static_cast(HColorLong)); + +unsigned long VColorLong = Gui::ViewParams::instance()->getAxisYColor(); +App::Color Vcolor = App::Color(static_cast(VColorLong)); +} // namespace SbColor DrawingParameters::CrossColorH(Hcolor.r, Hcolor.g, Hcolor.b); SbColor DrawingParameters::CrossColorV(Vcolor.r, Vcolor.g, Vcolor.b); diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h index 938589dbb5..0e1082f417 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h +++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h @@ -103,7 +103,7 @@ struct DrawingParameters //@{ static SbColor InformationColor; // Information Overlay Color static SbColor CreateCurveColor; // Color for Edit Curves during creation - static SbColor CrossColorH; // Color for the Horizontal Axis + static SbColor CrossColorH; // Color for the Horizontal Axis static SbColor CrossColorV; // Color for the Vertical Axis static SbColor InvalidSketchColor; // Color for rendering an invalid sketch static SbColor FullyConstrainedColor; // Color for a fully constrained sketch @@ -150,7 +150,8 @@ struct DrawingParameters unsigned int ExternalPattern = 0b1111110011111100; // pattern of external edges //@} - DrawingParameters() { + DrawingParameters() + { unsigned long colorLong; App::Color color;