[TD]resolve merge conflicts re Preference retrieval #2
This commit is contained in:
committed by
WandererFan
parent
ef5fc4f237
commit
411122dbb6
@@ -351,7 +351,6 @@ double QGITile::getSymbolHeight() const
|
||||
//make symbols larger or smaller than standard
|
||||
double QGITile::getSymbolFactor() const
|
||||
{
|
||||
// return 1.25;
|
||||
return Preferences::getPreferenceGroup("Decorations")->GetFloat("SymbolFactor", 1.25);
|
||||
}
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ ViewProviderDimension::ViewProviderDimension()
|
||||
ADD_PROPERTY_TYPE(Font, (Preferences::labelFont().c_str()),
|
||||
group, App::Prop_None, "The name of the font to use");
|
||||
ADD_PROPERTY_TYPE(Fontsize, (Preferences::dimFontSizeMM()),
|
||||
group, (App::PropertyType)(App::Prop_None),
|
||||
group, (App::PropertyType)(App::Prop_None),
|
||||
"Dimension text size in units");
|
||||
ADD_PROPERTY_TYPE(LineWidth, (prefWeight()), group, (App::PropertyType)(App::Prop_None),
|
||||
"Dimension line width");
|
||||
|
||||
Reference in New Issue
Block a user