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

Base: Move App::Color to Base

Browse Source 
Every basic data type is stored in Base module, color is standing out as
one that does not. Moving it to Base opens possibilities to integrate it
better with the rest of FreeCAD.
This commit is contained in:
Kacper Donat
2025-02-15 22:58:19 +01:00
parent 145af5cddc
commit a72a63232a
215 changed files with 1057 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/TechDraw/App/Preferences.cpp
View File

@@ -77,14 +77,14 @@ double Preferences::dimArrowSize()
return getPreferenceGroup("Dimensions")->GetFloat("ArrowSize", DefaultArrowSize);
}
App::Color Preferences::normalColor()
Base::Color Preferences::normalColor()
{
App::Color fcColor;
Base::Color fcColor;
fcColor.setPackedValue(getPreferenceGroup("Colors")->GetUnsigned("NormalColor", 0x000000FF));//#000000 black
return fcColor;
}
App::Color Preferences::selectColor()
Base::Color Preferences::selectColor()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
@@ -93,12 +93,12 @@ App::Color Preferences::selectColor()
->GetGroup("View");
unsigned int defColor = hGrp->GetUnsigned("SelectionColor", 0x00FF00FF);//#00FF00 lime
App::Color fcColor;
Base::Color fcColor;
fcColor.setPackedValue(getPreferenceGroup("Colors")->GetUnsigned("SelectColor", defColor));
return fcColor;
}
App::Color Preferences::preselectColor()
Base::Color Preferences::preselectColor()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
@@ -107,14 +107,14 @@ App::Color Preferences::preselectColor()
->GetGroup("View");
unsigned int defColor = hGrp->GetUnsigned("HighlightColor", 0xFFFF00FF);//#FFFF00 yellow
App::Color fcColor;
Base::Color fcColor;
fcColor.setPackedValue(getPreferenceGroup("Colors")->GetUnsigned("PreSelectColor", defColor));
return fcColor;
}
App::Color Preferences::vertexColor()
Base::Color Preferences::vertexColor()
{
App::Color fcColor;
Base::Color fcColor;
fcColor.setPackedValue(getPreferenceGroup("Decorations")->GetUnsigned("VertexColor", 0x000000FF));//#000000 black
return fcColor;
}
@@ -376,16 +376,16 @@ void Preferences::monochrome(bool state)
getPreferenceGroup("Colors")->SetBool("Monochrome", state);
}
App::Color Preferences::lightTextColor()
Base::Color Preferences::lightTextColor()
{
App::Color result;
Base::Color result;
result.setPackedValue(getPreferenceGroup("Colors")->GetUnsigned("LightTextColor", 0xFFFFFFFF));//#FFFFFFFF white
return result;
}
//! attempt to lighten the give color
// not currently used
App::Color Preferences::lightenColor(App::Color orig)
Base::Color Preferences::lightenColor(Base::Color orig)
{
// get component colours on [0, 255]
uchar red = orig.r * 255;
@@ -412,11 +412,11 @@ App::Color Preferences::lightenColor(App::Color orig)
double greenF = (double)green / 255.0;
double blueF = (double)blue / 255.0;
return App::Color(redF, greenF, blueF, orig.a);
return Base::Color(redF, greenF, blueF, orig.a);
}
//! color to use for monochrome display
App::Color Preferences::getAccessibleColor(App::Color orig)
Base::Color Preferences::getAccessibleColor(Base::Color orig)
{
if (Preferences::lightOnDark() && Preferences::monochrome()) {
return lightTextColor();