suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct selection/highlight colors for Annotation objects

Browse Source
This commit is contained in:
Yorik van Havre 2016-12-28 12:31:56 -02:00
parent cbf717f317
commit 6378f61158
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Gui/ViewProviderAnnotation.cpp
View File

@ -57,6 +57,7 @@
#include "SoTextLabel.h"
#include "Application.h"
#include "Document.h"
#include "Window.h"
using namespace Gui;
@ -189,6 +190,22 @@ void ViewProviderAnnotation::attach(App::DocumentObject* f)
SoAnnotation* anno3d = new SoAnnotation();
SoFCSelection* textsep = new SoFCSelection();
// set selection/highlight colors
float transparency;
ParameterGrp::handle hGrp = Gui::WindowParameter::getDefaultParameter()->GetGroup("View");
SbColor highlightColor = textsep->colorHighlight.getValue();
unsigned long highlight = (unsigned long)(highlightColor.getPackedValue());
highlight = hGrp->GetUnsigned("HighlightColor", highlight);
highlightColor.setPackedValue((uint32_t)highlight, transparency);
textsep->colorHighlight.setValue(highlightColor);
// Do the same with the selection color
SbColor selectionColor = textsep->colorSelection.getValue();
unsigned long selection = (unsigned long)(selectionColor.getPackedValue());
selection = hGrp->GetUnsigned("SelectionColor", selection);
selectionColor.setPackedValue((uint32_t)selection, transparency);
textsep->colorSelection.setValue(selectionColor);
textsep->objectName = pcObject->getNameInDocument();
textsep->documentName = pcObject->getDocument()->getName();
textsep->subElementName = "Main";
@ -199,6 +216,11 @@ void ViewProviderAnnotation::attach(App::DocumentObject* f)
textsep->addChild(pLabel);
SoFCSelection* textsep3d = new SoFCSelection();
// set sel/highlight color here too
textsep3d->colorHighlight.setValue(highlightColor);
textsep3d->colorSelection.setValue(selectionColor);
textsep3d->objectName = pcObject->getNameInDocument();
textsep3d->documentName = pcObject->getDocument()->getName();
textsep3d->subElementName = "Main";