isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 14:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

layout, bin: Use ceilf() instead of casting to int

Browse Source 
Casting a float to int to truncate it before assigning the value
to a float again is wrong. We should use ceilf() instead which
does what we want to achieve (rounding up the size to avoid
sub-pixel positioning of children).
This commit is contained in:
Emmanuele Bassi 2009-10-15 14:12:37 +01:00
parent 308c930f37
commit 852abbb138
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clutter/clutter-bin-layout.c
View File

@ -81,6 +81,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include <math.h>
#include "clutter-actor.h" #include "clutter-actor.h"
#include "clutter-animatable.h" #include "clutter-animatable.h"
#include "clutter-bin-layout.h" #include "clutter-bin-layout.h"
@ -427,14 +429,14 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FILL) if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FILL)
{ {
child_alloc.x1 = (int) 0; child_alloc.x1 = 0;
child_alloc.x2 = (int) available_w; child_alloc.x2 = ceilf (available_w);
} }
if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FILL) if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FILL)
{ {
child_alloc.y1 = (int) 0; child_alloc.y1 = 0;
child_alloc.y2 = (int) available_h; child_alloc.y2 = ceilf (available_h);
} }
/* if we are filling horizontally and vertically then we /* if we are filling horizontally and vertically then we
@ -481,8 +483,8 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FIXED) if (layer->x_align == CLUTTER_BIN_ALIGNMENT_FIXED)
{ {
child_alloc.x1 = (int) clutter_actor_get_x (child); child_alloc.x1 = ceilf (clutter_actor_get_x (child));
child_alloc.x2 = (int) child_alloc.x1 + child_width; child_alloc.x2 = ceilf (child_alloc.x1 + child_width);
} }
else else
{ {
@ -490,15 +492,15 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
if (layer->x_align != CLUTTER_BIN_ALIGNMENT_FILL) if (layer->x_align != CLUTTER_BIN_ALIGNMENT_FILL)
{ {
child_alloc.x1 = (int) ((available_w - child_width) * x_align); child_alloc.x1 = ceilf ((available_w - child_width) * x_align);
child_alloc.x2 = (int) child_alloc.x1 + child_width; child_alloc.x2 = ceilf (child_alloc.x1 + child_width);
} }
} }
if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FIXED) if (layer->y_align == CLUTTER_BIN_ALIGNMENT_FIXED)
{ {
child_alloc.y1 = (int) clutter_actor_get_y (child); child_alloc.y1 = ceilf (clutter_actor_get_y (child));
child_alloc.y2 = (int) child_alloc.y1 + child_height; child_alloc.y2 = ceilf (child_alloc.y1 + child_height);
} }
else else
{ {
@ -506,8 +508,8 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
if (layer->y_align != CLUTTER_BIN_ALIGNMENT_FILL) if (layer->y_align != CLUTTER_BIN_ALIGNMENT_FILL)
{ {
child_alloc.y1 = (int) ((available_h - child_height) * y_align); child_alloc.y1 = ceilf ((available_h - child_height) * y_align);
child_alloc.y2 = (int) child_alloc.y1 + child_height; child_alloc.y2 = ceilf (child_alloc.y1 + child_height);
} }
} }