mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-06-07 16:20:47 +02:00
parent b3e71120b4 45f915dd39
commit ca83324763
80 changed files with 1972 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/system/settings.h
View File

@@ -618,14 +618,23 @@ struct SNeutrinoSettings
int screen_StartY;
int screen_EndX;
int screen_EndY;
int screen_StartX_crt;
int screen_StartY_crt;
int screen_EndX_crt;
int screen_EndY_crt;
int screen_StartX_lcd;
int screen_StartY_lcd;
int screen_EndX_lcd;
int screen_EndY_lcd;
int screen_StartX_crt_0;
int screen_StartY_crt_0;
int screen_EndX_crt_0;
int screen_EndY_crt_0;
int screen_StartX_lcd_0;
int screen_StartY_lcd_0;
int screen_EndX_lcd_0;
int screen_EndY_lcd_0;
int screen_StartX_crt_1;
int screen_StartY_crt_1;
int screen_EndX_crt_1;
int screen_EndY_crt_1;
int screen_StartX_lcd_1;
int screen_StartY_lcd_1;
int screen_EndX_lcd_1;
int screen_EndY_lcd_1;
int osd_resolution;
int screen_preset;
int screen_width;
int screen_height;
@@ -908,10 +917,10 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define DEFAULT_LCD_AUTODIMM 0x00
#define DEFAULT_LCD_SHOW_VOLUME 0x01
#define CORNER_RADIUS_LARGE 11
#define CORNER_RADIUS_MID 7
#define CORNER_RADIUS_SMALL 5
#define CORNER_RADIUS_MIN 3
#define CORNER_RADIUS_LARGE CFrameBuffer::getInstance()->scale2Res(11)
#define CORNER_RADIUS_MID CFrameBuffer::getInstance()->scale2Res(7)
#define CORNER_RADIUS_SMALL CFrameBuffer::getInstance()->scale2Res(5)
#define CORNER_RADIUS_MIN CFrameBuffer::getInstance()->scale2Res(3)
#define CORNER_RADIUS_NONE 0
#define RADIUS_LARGE (g_settings.rounded_corners ? CORNER_RADIUS_LARGE : 0)
@@ -921,17 +930,17 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define RADIUS_NONE 0
// offsets
#define OFFSET_SHADOW 6
#define OFFSET_INTER 6
#define OFFSET_INNER_LARGE 20
#define OFFSET_INNER_MID 10
#define OFFSET_INNER_SMALL 5
#define OFFSET_INNER_MIN 2
#define OFFSET_SHADOW CFrameBuffer::getInstance()->scale2Res(6)
#define OFFSET_INTER CFrameBuffer::getInstance()->scale2Res(6)
#define OFFSET_INNER_LARGE CFrameBuffer::getInstance()->scale2Res(20)
#define OFFSET_INNER_MID CFrameBuffer::getInstance()->scale2Res(10)
#define OFFSET_INNER_SMALL CFrameBuffer::getInstance()->scale2Res(5)
#define OFFSET_INNER_MIN CFrameBuffer::getInstance()->scale2Res(2)
#define OFFSET_INNER_NONE 0
#define SCROLLBAR_WIDTH (OFFSET_INNER_MID + 2*OFFSET_INNER_MIN)
#define DETAILSLINE_WIDTH 16 // TODO: scale2Res() ?
#define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)
#define BIGFONT_FACTOR 1.5