mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
[actor] use an epsilon whens sanity checking sizes
Clutter was complaining about netural width smaller than minimum widths (differences around 0.0005) by using an epsilon value of 1e-4 for these floating point comparisons, these warnings have now been silenced.
This commit is contained in:
parent
7d8da0e830
commit
e94e5ad65b
@ -3552,6 +3552,8 @@ clutter_actor_get_preferred_size (ClutterActor *self,
|
||||
*natural_height_p = natural_height;
|
||||
}
|
||||
|
||||
#define FLOAT_EPSILON (1e-4) /* 1/1000 pixel is the precision used */
|
||||
|
||||
/**
|
||||
* clutter_actor_get_preferred_width:
|
||||
* @self: A #ClutterActor
|
||||
@ -3597,7 +3599,7 @@ clutter_actor_get_preferred_width (ClutterActor *self,
|
||||
&min_width,
|
||||
&natural_width);
|
||||
|
||||
if (natural_width < min_width)
|
||||
if (natural_width < min_width - FLOAT_EPSILON)
|
||||
{
|
||||
g_warning ("Actor of type %s reported a natural width "
|
||||
"of %" CLUTTER_UNITS_FORMAT " (%d px) lower "
|
||||
@ -3668,7 +3670,7 @@ clutter_actor_get_preferred_height (ClutterActor *self,
|
||||
&min_height,
|
||||
&natural_height);
|
||||
|
||||
if (natural_height < min_height)
|
||||
if (natural_height < min_height - FLOAT_EPSILON)
|
||||
{
|
||||
g_warning ("Actor of type %s reported a natural height "
|
||||
"of %" CLUTTER_UNITS_FORMAT " (%d px) lower than "
|
||||
|
Loading…
Reference in New Issue
Block a user