Merge branch 'master' into pu/mp

This commit is contained in:
M. Liebmann
2017-06-29 15:06:39 +02:00
10 changed files with 103 additions and 65 deletions

View File

@@ -940,6 +940,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define SCROLLBAR_WIDTH (OFFSET_INNER_MID + 2*OFFSET_INNER_MIN)
#define FRAME_MIN_WIDTH CFrameBuffer::getInstance()->scale2Res(2)
#define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)
#define BIGFONT_FACTOR 1.5