Merge branch 'master' into pu/fb-setmode

This commit is contained in:
M. Liebmann
2017-04-16 19:42:14 +02:00
16 changed files with 153 additions and 95 deletions

View File

@@ -929,7 +929,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define OFFSET_INNER_MIN CFrameBuffer::getInstance()->scale2Res(2)
#define OFFSET_INNER_NONE 0
#define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN
#define SCROLLBAR_WIDTH (OFFSET_INNER_MID + 2*OFFSET_INNER_MIN)
#define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)