change default shape color

maxwxyz · chennes · commit 2a264241dcd4 · 2024-02-18T14:12:22.000-06:00
diff --git a/src/Gui/PreferencePackTemplates/Window_Colors.cfg b/src/Gui/PreferencePackTemplates/Window_Colors.cfg
@@ -12,7 +12,7 @@
           <FCUInt Name="BacklightColor" Value="4294967295"/>
           <FCInt Name="BacklightIntensity" Value="100"/>
           <FCUInt Name="BoundingBoxColor" Value="4294967295"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
           <FCInt Name="DefaultShapeTransparency" Value="0"/>
           <FCBool Name="EnableBacklight" Value="0"/>
           <FCBool Name="Gradient" Value="1"/>
diff --git a/src/Gui/PreferencePacks/Classic/Classic.cfg b/src/Gui/PreferencePacks/Classic/Classic.cfg
@@ -128,7 +128,7 @@
           <FCUInt Name="BackgroundColor4" Value="1869583359"/>
           <FCUInt Name="HighlightColor" Value="3789624575"/>
           <FCUInt Name="SelectionColor" Value="481107199"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="4294902015"/>
diff --git a/src/Gui/PreferencePacks/Dark behave/Dark behave.cfg b/src/Gui/PreferencePacks/Dark behave/Dark behave.cfg
@@ -89,7 +89,7 @@
           <FCUInt Name="BackgroundColor4" Value="2088533247"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="1434171135"/>
diff --git a/src/Gui/PreferencePacks/Dark contrast/Dark contrast.cfg b/src/Gui/PreferencePacks/Dark contrast/Dark contrast.cfg
@@ -89,7 +89,7 @@
           <FCUInt Name="BackgroundColor4" Value="2088533247"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="1434171135"/>
diff --git a/src/Gui/PreferencePacks/Dark modern/Dark modern.cfg b/src/Gui/PreferencePacks/Dark modern/Dark modern.cfg
@@ -89,7 +89,7 @@
           <FCUInt Name="BackgroundColor4" Value="2088533247"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="1434171135"/>
diff --git a/src/Gui/PreferencePacks/Dark/Dark.cfg b/src/Gui/PreferencePacks/Dark/Dark.cfg
@@ -89,7 +89,7 @@
           <FCUInt Name="BackgroundColor4" Value="2088533247"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="1434171135"/>
diff --git a/src/Gui/PreferencePacks/Darker/Darker.cfg b/src/Gui/PreferencePacks/Darker/Darker.cfg
@@ -89,7 +89,7 @@
           <FCUInt Name="BackgroundColor4" Value="2088533247"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="1434171135"/>
diff --git a/src/Gui/PreferencePacks/Light modern/Light modern.cfg b/src/Gui/PreferencePacks/Light modern/Light modern.cfg
@@ -52,7 +52,7 @@
           <FCUInt Name="BackgroundColor4" Value="3284386815"/>
           <FCUInt Name="BacklightColor" Value="4294967295"/>
           <FCUInt Name="BoundingBoxColor" Value="4294967295"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
         </FCParamGroup>
diff --git a/src/Gui/PreferencePacks/Light/Light.cfg b/src/Gui/PreferencePacks/Light/Light.cfg
@@ -52,7 +52,7 @@
           <FCUInt Name="BackgroundColor4" Value="3284386815"/>
           <FCUInt Name="BacklightColor" Value="4294967295"/>
           <FCUInt Name="BoundingBoxColor" Value="4294967295"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
         </FCParamGroup>
diff --git a/src/Gui/PreferencePacks/ProDark/ProDark.cfg b/src/Gui/PreferencePacks/ProDark/ProDark.cfg
@@ -89,7 +89,7 @@
           <FCUInt Name="BackgroundColor4" Value="2088533247"/>
           <FCUInt Name="HighlightColor" Value="327679"/>
           <FCUInt Name="SelectionColor" Value="16711935"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435973887"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
         </FCParamGroup>
         <FCParamGroup Name="TreeView">
           <FCUInt Name="TreeEditColor" Value="1434171135"/>
diff --git a/src/Gui/ViewProviderGeometryObject.cpp b/src/Gui/ViewProviderGeometryObject.cpp
@@ -68,13 +68,13 @@ ViewProviderGeometryObject::ViewProviderGeometryObject()
         b = (float)rand() / fMax;
     }
     else {
-        unsigned long shcol = hGrp->GetUnsigned("DefaultShapeColor", 3435973887UL); // light gray (204,204,204)
+        unsigned long shcol = hGrp->GetUnsigned("DefaultShapeColor", 3435980543UL);
         r = ((shcol >> 24) & 0xff) / 255.0;
         g = ((shcol >> 16) & 0xff) / 255.0;
         b = ((shcol >> 8) & 0xff) / 255.0;
     }
 
-    int initialTransparency = hGrp->GetInt("DefaultShapeTransparency", 0); 
+    int initialTransparency = hGrp->GetInt("DefaultShapeTransparency", 0);
 
     static const char *dogroup = "Display Options";
     static const char *sgroup = "Selection";

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,13 @@ ViewProviderGeometryObject::ViewProviderGeometryObject()`
`68`	`68`	`b = (float)rand() / fMax;`
`69`	`69`	`}`
`70`	`70`	`else {`
`71`		`- unsigned long shcol = hGrp->GetUnsigned("DefaultShapeColor", 3435973887UL); // light gray (204,204,204)`
	`71`	`+ unsigned long shcol = hGrp->GetUnsigned("DefaultShapeColor", 3435980543UL);`
`72`	`72`	`r = ((shcol >> 24) & 0xff) / 255.0;`
`73`	`73`	`g = ((shcol >> 16) & 0xff) / 255.0;`
`74`	`74`	`b = ((shcol >> 8) & 0xff) / 255.0;`
`75`	`75`	`}`
`76`	`76`
`77`		`- int initialTransparency = hGrp->GetInt("DefaultShapeTransparency", 0);`
	`77`	`+ int initialTransparency = hGrp->GetInt("DefaultShapeTransparency", 0);`
`78`	`78`
`79`	`79`	`static const char *dogroup = "Display Options";`
`80`	`80`	`static const char *sgroup = "Selection";`