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

64
ApplicationCode/Application/RiaFontCache.cpp
View File

@@ -18,6 +18,52 @@
#include "RiaFontCache.h"
#include "cafAppEnum.h"
#include "cafFixedAtlasFont.h"
namespace caf
{
template<>
void RiaFontCache::FontSizeType::setUp()
{
addItem(RiaFontCache::FONT_SIZE_8, "8", "8");
addItem(RiaFontCache::FONT_SIZE_10, "10", "10");
addItem(RiaFontCache::FONT_SIZE_12, "12", "12");
addItem(RiaFontCache::FONT_SIZE_14, "14", "14");
addItem(RiaFontCache::FONT_SIZE_16, "16", "16");
addItem(RiaFontCache::FONT_SIZE_24, "24", "24");
addItem(RiaFontCache::FONT_SIZE_32, "32", "32");
setDefault(RiaFontCache::FONT_SIZE_8);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::FixedAtlasFont::FontSize mapToAtlasFontSize(RiaFontCache::FontSize fontSize)
{
switch (fontSize)
{
case RiaFontCache::FONT_SIZE_8:
return caf::FixedAtlasFont::POINT_SIZE_8;
case RiaFontCache::FONT_SIZE_10:
return caf::FixedAtlasFont::POINT_SIZE_10;
case RiaFontCache::FONT_SIZE_12:
return caf::FixedAtlasFont::POINT_SIZE_12;
case RiaFontCache::FONT_SIZE_14:
return caf::FixedAtlasFont::POINT_SIZE_14;
case RiaFontCache::FONT_SIZE_16:
return caf::FixedAtlasFont::POINT_SIZE_16;
case RiaFontCache::FONT_SIZE_24:
return caf::FixedAtlasFont::POINT_SIZE_24;
case RiaFontCache::FONT_SIZE_32:
return caf::FixedAtlasFont::POINT_SIZE_32;
default:
return caf::FixedAtlasFont::POINT_SIZE_16;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -35,21 +81,3 @@ cvf::ref<caf::FixedAtlasFont> RiaFontCache::getFont(FontSize size)
}
return ms_fonts[size];
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::FixedAtlasFont::FontSize RiaFontCache::mapToAtlasFontSize(FontSize fontSize)
{
switch (fontSize)
{
case FONT_SIZE_8: return caf::FixedAtlasFont::POINT_SIZE_8;
case FONT_SIZE_10: return caf::FixedAtlasFont::POINT_SIZE_10;
case FONT_SIZE_12: return caf::FixedAtlasFont::POINT_SIZE_12;
case FONT_SIZE_14: return caf::FixedAtlasFont::POINT_SIZE_14;
case FONT_SIZE_16: return caf::FixedAtlasFont::POINT_SIZE_16;
case FONT_SIZE_24: return caf::FixedAtlasFont::POINT_SIZE_24;
case FONT_SIZE_32: return caf::FixedAtlasFont::POINT_SIZE_32;
default: return caf::FixedAtlasFont::POINT_SIZE_16;
}
}