AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 20:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-css-filter-transitions' into 'master'

Browse Source 
css: Allow transitioning between different units again

See merge request GNOME/gtk!1719
This commit is contained in:
Matthias Clasen 2020-04-19 02:00:26 +00:00
commit 2cd152c2ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkcssdimensionvalue.c
View File

@ -248,10 +248,10 @@ gtk_css_value_dimension_transition (GtkCssValue *start,
guint property_id,
double progress)
{
if (start->unit != end->unit)
return NULL;
if (start->unit == end->unit)
return gtk_css_dimension_value_new (start->value + (end->value - start->value) * progress, start->unit);
return gtk_css_dimension_value_new (start->value + (end->value - start->value) * progress, start->unit);
return gtk_css_number_value_transition (start, end, property_id, progress);
}
static const GtkCssNumberValueClass GTK_CSS_VALUE_DIMENSION = {