diff --git a/src/driver/screen_max.cpp b/src/driver/screen_max.cpp index c318c3061..fd31e1721 100644 --- a/src/driver/screen_max.cpp +++ b/src/driver/screen_max.cpp @@ -9,13 +9,9 @@ * */ - - - #include #include - // -- this is a simple odd class provided for 'static' usage // -- to calculate max. usage of a preferred menue size (x,y) // -- this is due to 16:9 TV zoom functions, which are cutting menues. @@ -29,8 +25,7 @@ // // 2004-03-17 rasc - -int w_max (int w_size, int w_add) +int w_max(int w_size, int w_add) { int dw; int ret; @@ -38,13 +33,13 @@ int w_max (int w_size, int w_add) dw = (g_settings.screen_EndX - g_settings.screen_StartX); ret = w_size; - if (dw <= (w_size + w_add) ) ret = dw - w_add; + if (dw <= (w_size + w_add)) + ret = dw - w_add; return ret; } - -int h_max (int h_size, int h_add) +int h_max(int h_size, int h_add) { int dh; int ret; @@ -52,25 +47,23 @@ int h_max (int h_size, int h_add) dh = (g_settings.screen_EndY - g_settings.screen_StartY); ret = h_size; - if (dh <= (h_size + h_add) ) ret = dh - h_add; + if (dh <= (h_size + h_add)) + ret = dh - h_add; return ret; } -//some helpers to get x and y screen values vor menus and windows -int getScreenStartX (int width) +// some helpers to get x and y screen values vor menus and windows +int getScreenStartX(int width) { int w = width; - int r = (((g_settings.screen_EndX- g_settings.screen_StartX)-w) / 2) + g_settings.screen_StartX; + int r = (((g_settings.screen_EndX - g_settings.screen_StartX) - w) / 2) + g_settings.screen_StartX; return r < 0 ? 0 : r; } -int getScreenStartY (int height) +int getScreenStartY(int height) { int y = height; - int r = (((g_settings.screen_EndY- g_settings.screen_StartY)-y) / 2) + g_settings.screen_StartY; + int r = (((g_settings.screen_EndY - g_settings.screen_StartY) - y) / 2) + g_settings.screen_StartY; return r < 0 ? 0 : r; } - - - diff --git a/src/driver/screen_max.h b/src/driver/screen_max.h index 50c9e7944..e94876293 100644 --- a/src/driver/screen_max.h +++ b/src/driver/screen_max.h @@ -19,16 +19,13 @@ */ -#ifndef __SCREEN_MAX__ -#define __SCREEN_MAX__ +#ifndef __SCREEN_MAX__ +#define __SCREEN_MAX__ +int w_max(int w_size, int w_add); +int h_max(int h_size, int h_add); -int w_max (int w_size, int w_add); -int h_max (int h_size, int h_add); int getScreenStartX(int width); int getScreenStartY(int height); - #endif - -