gui: don't truncate values to 0 after scaling

Avoids invisible lines (e.g. input cursor) when scaling down.

Change-Id: I595e8bdb2fa468c30f104867ad77be2423ec287f
This commit is contained in:
that
2015-02-14 21:20:10 +01:00
committed by Dees Troy
parent 72b90ab0d7
commit ba75a0e73b
3 changed files with 8 additions and 4 deletions
+8 -2
View File
@@ -990,7 +990,10 @@ extern "C" void set_scale_values(float w, float h)
extern "C" int scale_theme_x(int initial_x)
{
if (scale_theme_w != 1) {
return (int) ((float)initial_x * scale_theme_w);
int scaled = (float)initial_x * scale_theme_w;
if (scaled == 0 && initial_x > 0)
return 1;
return scaled;
}
return initial_x;
}
@@ -998,7 +1001,10 @@ extern "C" int scale_theme_x(int initial_x)
extern "C" int scale_theme_y(int initial_y)
{
if (scale_theme_h != 1) {
return (int) ((float)initial_y * scale_theme_h);
int scaled = (float)initial_y * scale_theme_h;
if (scaled == 0 && initial_y > 0)
return 1;
return scaled;
}
return initial_y;
}
-1
View File
@@ -37,7 +37,6 @@ int scale_theme_y(int initial_y);
int scale_theme_min(int initial_value);
float get_scale_w();
float get_scale_h();
float get_scale_h();
#endif // _GUI_HEADER
-1
View File
@@ -893,7 +893,6 @@ protected:
class GUIInput : public GUIObject, public RenderObject, public ActionObject, public InputObject
{
public:
// w and h may be ignored, in which case, no bounding box is applied
GUIInput(xml_node<>* node);
virtual ~GUIInput();