From 411122dbb657a76cdf65203f7bb8cc46776a1fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Sun, 9 Apr 2023 16:18:55 +0200 Subject: [PATCH] [TD]resolve merge conflicts re Preference retrieval #2 --- src/Mod/TechDraw/Gui/QGITile.cpp | 1 - src/Mod/TechDraw/Gui/ViewProviderDimension.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGITile.cpp b/src/Mod/TechDraw/Gui/QGITile.cpp index f4129084bf..f62919135e 100644 --- a/src/Mod/TechDraw/Gui/QGITile.cpp +++ b/src/Mod/TechDraw/Gui/QGITile.cpp @@ -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); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index 5ca6461add..63a50ae4cc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -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");