kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Bugfix]Sketcher: some user colors aren't taken into account

Browse Source
This commit is contained in:
0penBrain
2022-09-02 10:33:03 +02:00
committed by Uwe
parent fdeac88239
commit c2c45f6ca7
3 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp
View File

@@ -2366,18 +2366,24 @@ void EditModeConstraintCoinManager::clearCoinImage(SoImage *soImagePtr)
QColor EditModeConstraintCoinManager::constrColor(int constraintId)
{
auto toQColor = [](auto sbcolor) -> QColor {
return QColor( (int)(sbcolor[0] * 255.0f),
(int)(sbcolor[1] * 255.0f),
(int)(sbcolor[2] * 255.0f));
};
const auto constraints = ViewProviderSketchCoinAttorney::getConstraints(viewProvider);
if (ViewProviderSketchCoinAttorney::isConstraintPreselected(viewProvider,constraintId))
return drawingParameters.constrIconPreselColor;
return toQColor(drawingParameters.PreselectColor);
else if (ViewProviderSketchCoinAttorney::isConstraintSelected(viewProvider, constraintId))
return drawingParameters.constrIconSelColor;
return toQColor(drawingParameters.SelectColor);
else if (!constraints[constraintId]->isActive)
return drawingParameters.constrIconDisabledColor;
return toQColor(drawingParameters.DeactivatedConstrDimColor);
else if (!constraints[constraintId]->isDriving)
return drawingParameters.nonDrivingConstrIcoColor;
return toQColor(drawingParameters.NonDrivingConstrDimColor);
else
return drawingParameters.constrIcoColor;
return toQColor(drawingParameters.ConstrIcoColor);
}