Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-05-28 22:30:05 +02:00
16 changed files with 68 additions and 64 deletions

View File

@@ -103,8 +103,8 @@ int paintButtons( const button_label_ext * const content,
int w_footer = footerwidth;
int h_footer = 0;
int w_space = 10; //minimal space between buttons
int h_space = 4; //minimal space between caption and/or icon and border
int w_space = OFFSET_INNER_MID; //minimal space between buttons
int h_space = OFFSET_INNER_SMALL; //minimal space between caption and/or icon and border
int x_icon = x_footer + w_space;
int x_caption = 0;
@@ -312,8 +312,8 @@ int paintButtons( const int &x,
int w_footer = footerwidth;
int h_footer = 0;
int w_space = 10; //minimal space between buttons
int h_space = 4; //minimal space between caption and/or icon and border
int w_space = OFFSET_INNER_MID; //minimal space between buttons
int h_space = OFFSET_INNER_SMALL; //minimal space between caption and/or icon and border
int x_icon = x_footer + w_space;
int x_caption = 0;