From 9dec3c540e2e1cdf98eec35955ae1e59d8aea924 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Wed, 13 Jul 2016 19:38:52 -0400 Subject: [PATCH] Fix default normal/select/preselect colors --- src/Mod/TechDraw/Gui/QGIPrimPath.cpp | 7 ++++--- src/Mod/TechDraw/Gui/QGIView.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp index 06cd9a974f..e3b6e30db9 100644 --- a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp +++ b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp @@ -54,11 +54,12 @@ QGIPrimPath::QGIPrimPath() Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); - App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); + App::Color fcColor; + fcColor.setPackedValue(hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asValue(); - fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); + fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x00FF0000)); m_colSel = fcColor.asValue(); - fcColor.setPackedValue(hGrp->GetUnsigned("PreSelectColor", 0x00080800)); + fcColor.setPackedValue(hGrp->GetUnsigned("PreSelectColor", 0xFFFF0000)); m_colPre = fcColor.asValue(); setPrettyNormal(); diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index 659f1f32d1..31ac2397af 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -77,11 +77,12 @@ QGIView::QGIView() Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); - App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); + App::Color fcColor; + fcColor.setPackedValue(hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asValue(); - fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); + fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x00FF00000)); m_colSel = fcColor.asValue(); - fcColor.setPackedValue(hGrp->GetUnsigned("PreSelectColor", 0x00080800)); + fcColor.setPackedValue(hGrp->GetUnsigned("PreSelectColor", 0xFFFF0000)); m_colPre = fcColor.asValue(); m_colCurrent = m_colNormal;