OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3997 Use AppEnum for font size in preferences as well so it is more easily shared.

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-04 14:23:16 +01:00
parent 5bbde43dad
commit f15d6dd385
10 changed files with 76 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp
View File

@@ -27,24 +27,6 @@
CAF_PDM_SOURCE_INIT(RimAnnotationTextAppearance, "RimAnnotationTextAppearance");
namespace caf
{
template<>
void RimAnnotationTextAppearance::FontSize::setUp()
{
addItem(RiaFontCache::FONT_SIZE_8, "FONT_SIZE_8", "8");
addItem(RiaFontCache::FONT_SIZE_10, "FONT_SIZE_10", "10");
addItem(RiaFontCache::FONT_SIZE_12, "FONT_SIZE_12", "12");
addItem(RiaFontCache::FONT_SIZE_14, "FONT_SIZE_14", "14");
addItem(RiaFontCache::FONT_SIZE_16, "FONT_SIZE_16", "16");
addItem(RiaFontCache::FONT_SIZE_24, "FONT_SIZE_24", "24");
addItem(RiaFontCache::FONT_SIZE_32, "FONT_SIZE_32", "32");
setDefault(RiaFontCache::FONT_SIZE_8);
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -55,7 +37,9 @@ RimAnnotationTextAppearance::RimAnnotationTextAppearance()
auto prefs = RiaApplication::instance()->preferences();
auto defaultBackgroundColor = prefs->defaultViewerBackgroundColor();
CAF_PDM_InitField(&m_fontSize, "FontSize", FontSize(), "Font Size", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_fontSize, "FontSize", "Font Size", "", "", "");
m_fontSize = prefs->fontSizeInScene();
CAF_PDM_InitField(&m_fontColor, "FontColor", cvf::Color3f(cvf::Color3f::BLACK), "Font Color", "", "", "");
CAF_PDM_InitField(&m_backgroundColor, "BackgroundColor", defaultBackgroundColor , "Background Color", "", "", "");
CAF_PDM_InitField(&m_anchorLineColor, "AnchorLineColor", cvf::Color3f(cvf::Color3f::BLACK), "Anchor Line Color", "", "", "");