AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
8670034c86
gtk2/gtk/gtkcssanimatedstyle.c

979 lines
36 KiB
C
Raw Normal View History

cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
/*
* Copyright © 2012 Red Hat Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Benjamin Otte <otte@gnome.org>
*/
#include "config.h"
#include "gtkcssanimatedstyleprivate.h"
#include "gtkcssanimationprivate.h"
#include "gtkcssarrayvalueprivate.h"
css: Implement support for dynamic values This adds a new GtkStyleAnimation called GtkCssDynamic (for lack of a better name) that is spawned whenever at least one dynamic value is part of the GtkCssStyle.
2018-02-13 07:22:34 +00:00
#include "gtkcssdynamicprivate.h"
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
#include "gtkcssenumvalueprivate.h"
#include "gtkcssinheritvalueprivate.h"
#include "gtkcssinitialvalueprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkcssshorthandpropertyprivate.h"
cssstyle: Add GtkCssStaticStyle For now, this is only an implementation detail of the animated style. The idea is to use GtkCssStaticStyle as the result of CSS queries and then put a GtkCssAnimatedStyle on top that manages the animations. The neat thing about this is that you can cache the static values.
2014-10-26 04:07:06 +00:00
#include "gtkcssstaticstyleprivate.h"
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
#include "gtkcssstringvalueprivate.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkcsstransitionprivate.h"
#include "gtkprivate.h"
#include "gtkstyleanimationprivate.h"
#include "gtkstylepropertyprivate.h"
#include "gtkstyleproviderprivate.h"
G_DEFINE_TYPE (GtkCssAnimatedStyle, gtk_css_animated_style, GTK_TYPE_CSS_STYLE)
static GtkCssSection *
gtk_css_animated_style_get_section (GtkCssStyle *style,
guint id)
{
GtkCssAnimatedStyle *animated = GTK_CSS_ANIMATED_STYLE (style);
cssstyle: Add GtkCssStaticStyle For now, this is only an implementation detail of the animated style. The idea is to use GtkCssStaticStyle as the result of CSS queries and then put a GtkCssAnimatedStyle on top that manages the animations. The neat thing about this is that you can cache the static values.
2014-10-26 04:07:06 +00:00
return gtk_css_style_get_section (animated->style, id);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
static gboolean
gtk_css_animated_style_is_static (GtkCssStyle *style)
{
css: Drop a few dynamic type checks We hit these code paths a lot
2020-05-06 09:40:52 +00:00
GtkCssAnimatedStyle *animated = (GtkCssAnimatedStyle *)style;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
guint i;
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
for (i = 0; i < animated->n_animations; i ++)
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (!_gtk_style_animation_is_static (animated->animations[i]))
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
return FALSE;
}
return TRUE;
}
Change the signature of gtk_css_style_get_static_style It is clearer if this function returns a GtkCssStaticStyle.
2020-01-16 18:56:07 +00:00
static GtkCssStaticStyle *
css: Add gtk_css_style_get_static_style This lets us avoid poking directly at the GtkCssAnimatedStyle struct in gtkcssnode.c.
2020-01-13 03:44:58 +00:00
gtk_css_animated_style_get_static_style (GtkCssStyle *style)
{
/* This is called a lot, so we avoid a dynamic type check here */
GtkCssAnimatedStyle *animated = (GtkCssAnimatedStyle *) style;
Change the signature of gtk_css_style_get_static_style It is clearer if this function returns a GtkCssStaticStyle.
2020-01-16 18:56:07 +00:00
return (GtkCssStaticStyle *)animated->style;
css: Add gtk_css_style_get_static_style This lets us avoid poking directly at the GtkCssAnimatedStyle struct in gtkcssnode.c.
2020-01-13 03:44:58 +00:00
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
static void
gtk_css_animated_style_dispose (GObject *object)
{
GtkCssAnimatedStyle *style = GTK_CSS_ANIMATED_STYLE (object);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
guint i;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
for (i = 0; i < style->n_animations; i ++)
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
gtk_style_animation_unref (style->animations[i]);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
style->n_animations = 0;
g_free (style->animations);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
style->animations = NULL;
G_OBJECT_CLASS (gtk_css_animated_style_parent_class)->dispose (object);
}
static void
gtk_css_animated_style_finalize (GObject *object)
{
GtkCssAnimatedStyle *style = GTK_CSS_ANIMATED_STYLE (object);
cssstyle: Add GtkCssStaticStyle For now, this is only an implementation detail of the animated style. The idea is to use GtkCssStaticStyle as the result of CSS queries and then put a GtkCssAnimatedStyle on top that manages the animations. The neat thing about this is that you can cache the static values.
2014-10-26 04:07:06 +00:00
g_object_unref (style->style);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
G_OBJECT_CLASS (gtk_css_animated_style_parent_class)->finalize (object);
}
static void
gtk_css_animated_style_class_init (GtkCssAnimatedStyleClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkCssStyleClass *style_class = GTK_CSS_STYLE_CLASS (klass);
object_class->dispose = gtk_css_animated_style_dispose;
object_class->finalize = gtk_css_animated_style_finalize;
style_class->get_section = gtk_css_animated_style_get_section;
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
style_class->is_static = gtk_css_animated_style_is_static;
css: Add gtk_css_style_get_static_style This lets us avoid poking directly at the GtkCssAnimatedStyle struct in gtkcssnode.c.
2020-01-13 03:44:58 +00:00
style_class->get_static_style = gtk_css_animated_style_get_static_style;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
static void
gtk_css_animated_style_init (GtkCssAnimatedStyle *style)
{
}
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
#define DEFINE_UNSHARE(TYPE, NAME) \
static inline void \
unshare_ ## NAME (GtkCssAnimatedStyle *animated) \
{ \
GtkCssStyle *style = (GtkCssStyle *)animated; \
if (style->NAME == animated->style->NAME) \
{ \
gtk_css_values_unref ((GtkCssValues *)style->NAME); \
style->NAME = (TYPE *)gtk_css_values_copy ((GtkCssValues *)animated->style->NAME); \
} \
}
DEFINE_UNSHARE (GtkCssCoreValues, core)
DEFINE_UNSHARE (GtkCssBackgroundValues, background)
DEFINE_UNSHARE (GtkCssBorderValues, border)
DEFINE_UNSHARE (GtkCssIconValues, icon)
DEFINE_UNSHARE (GtkCssOutlineValues, outline)
DEFINE_UNSHARE (GtkCssFontValues, font)
DEFINE_UNSHARE (GtkCssFontVariantValues, font_variant)
DEFINE_UNSHARE (GtkCssAnimationValues, animation)
DEFINE_UNSHARE (GtkCssTransitionValues, transition)
DEFINE_UNSHARE (GtkCssSizeValues, size)
DEFINE_UNSHARE (GtkCssOtherValues, other)
static inline void
gtk_css_take_value (GtkCssValue **variable,
GtkCssValue *value)
{
if (*variable)
gtk_css_value_unref (*variable);
*variable = value;
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
void
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
gtk_css_animated_style_set_animated_value (GtkCssAnimatedStyle *animated,
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
guint id,
GtkCssValue *value)
{
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
GtkCssStyle *style = (GtkCssStyle *)animated;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
gtk_internal_return_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style));
gtk_internal_return_if_fail (value != NULL);
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
switch (id)
{
case GTK_CSS_PROPERTY_COLOR:
unshare_core (animated);
gtk_css_take_value (&style->core->color, value);
break;
case GTK_CSS_PROPERTY_DPI:
unshare_core (animated);
gtk_css_take_value (&style->core->dpi, value);
break;
case GTK_CSS_PROPERTY_FONT_SIZE:
unshare_core (animated);
gtk_css_take_value (&style->core->font_size, value);
break;
case GTK_CSS_PROPERTY_ICON_PALETTE:
unshare_core (animated);
gtk_css_take_value (&style->core->icon_palette, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_COLOR:
unshare_background (animated);
gtk_css_take_value (&style->background->background_color, value);
break;
case GTK_CSS_PROPERTY_FONT_FAMILY:
unshare_font (animated);
gtk_css_take_value (&style->font->font_family, value);
break;
case GTK_CSS_PROPERTY_FONT_STYLE:
unshare_font (animated);
gtk_css_take_value (&style->font->font_style, value);
break;
case GTK_CSS_PROPERTY_FONT_WEIGHT:
unshare_font (animated);
gtk_css_take_value (&style->font->font_weight, value);
break;
case GTK_CSS_PROPERTY_FONT_STRETCH:
unshare_font (animated);
gtk_css_take_value (&style->font->font_stretch, value);
break;
case GTK_CSS_PROPERTY_LETTER_SPACING:
unshare_font (animated);
gtk_css_take_value (&style->font->letter_spacing, value);
break;
case GTK_CSS_PROPERTY_TEXT_DECORATION_LINE:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->text_decoration_line, value);
break;
case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->text_decoration_color, value);
break;
case GTK_CSS_PROPERTY_TEXT_DECORATION_STYLE:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->text_decoration_style, value);
break;
case GTK_CSS_PROPERTY_FONT_KERNING:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_kerning, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIANT_LIGATURES:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_variant_ligatures, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIANT_POSITION:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_variant_position, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIANT_CAPS:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_variant_caps, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIANT_NUMERIC:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_variant_numeric, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_variant_alternates, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIANT_EAST_ASIAN:
unshare_font_variant (animated);
gtk_css_take_value (&style->font_variant->font_variant_east_asian, value);
break;
case GTK_CSS_PROPERTY_TEXT_SHADOW:
unshare_font (animated);
gtk_css_take_value (&style->font->text_shadow, value);
break;
case GTK_CSS_PROPERTY_BOX_SHADOW:
unshare_background (animated);
gtk_css_take_value (&style->background->box_shadow, value);
break;
case GTK_CSS_PROPERTY_MARGIN_TOP:
unshare_size (animated);
gtk_css_take_value (&style->size->margin_top, value);
break;
case GTK_CSS_PROPERTY_MARGIN_LEFT:
unshare_size (animated);
gtk_css_take_value (&style->size->margin_left, value);
break;
case GTK_CSS_PROPERTY_MARGIN_BOTTOM:
unshare_size (animated);
gtk_css_take_value (&style->size->margin_bottom, value);
break;
case GTK_CSS_PROPERTY_MARGIN_RIGHT:
unshare_size (animated);
gtk_css_take_value (&style->size->margin_right, value);
break;
case GTK_CSS_PROPERTY_PADDING_TOP:
unshare_size (animated);
gtk_css_take_value (&style->size->padding_top, value);
break;
case GTK_CSS_PROPERTY_PADDING_LEFT:
unshare_size (animated);
gtk_css_take_value (&style->size->padding_left, value);
break;
case GTK_CSS_PROPERTY_PADDING_BOTTOM:
unshare_size (animated);
gtk_css_take_value (&style->size->padding_bottom, value);
break;
case GTK_CSS_PROPERTY_PADDING_RIGHT:
unshare_size (animated);
gtk_css_take_value (&style->size->padding_right, value);
break;
case GTK_CSS_PROPERTY_BORDER_TOP_STYLE:
unshare_border (animated);
gtk_css_take_value (&style->border->border_top_style, value);
break;
case GTK_CSS_PROPERTY_BORDER_TOP_WIDTH:
unshare_border (animated);
gtk_css_take_value (&style->border->border_top_width, value);
break;
case GTK_CSS_PROPERTY_BORDER_LEFT_STYLE:
unshare_border (animated);
gtk_css_take_value (&style->border->border_left_style, value);
break;
case GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH:
unshare_border (animated);
gtk_css_take_value (&style->border->border_left_width, value);
break;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE:
unshare_border (animated);
gtk_css_take_value (&style->border->border_bottom_style, value);
break;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH:
unshare_border (animated);
gtk_css_take_value (&style->border->border_bottom_width, value);
break;
case GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE:
unshare_border (animated);
gtk_css_take_value (&style->border->border_right_style, value);
break;
case GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH:
unshare_border (animated);
gtk_css_take_value (&style->border->border_right_width, value);
break;
case GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS:
unshare_border (animated);
gtk_css_take_value (&style->border->border_top_left_radius, value);
break;
case GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS:
unshare_border (animated);
gtk_css_take_value (&style->border->border_top_right_radius, value);
break;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS:
unshare_border (animated);
gtk_css_take_value (&style->border->border_bottom_right_radius, value);
break;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS:
unshare_border (animated);
gtk_css_take_value (&style->border->border_bottom_left_radius, value);
break;
case GTK_CSS_PROPERTY_OUTLINE_STYLE:
unshare_outline (animated);
gtk_css_take_value (&style->outline->outline_style, value);
break;
case GTK_CSS_PROPERTY_OUTLINE_WIDTH:
unshare_outline (animated);
gtk_css_take_value (&style->outline->outline_width, value);
break;
case GTK_CSS_PROPERTY_OUTLINE_OFFSET:
unshare_outline (animated);
gtk_css_take_value (&style->outline->outline_offset, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_CLIP:
unshare_background (animated);
gtk_css_take_value (&style->background->background_clip, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_ORIGIN:
unshare_background (animated);
gtk_css_take_value (&style->background->background_origin, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_SIZE:
unshare_background (animated);
gtk_css_take_value (&style->background->background_size, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_POSITION:
unshare_background (animated);
gtk_css_take_value (&style->background->background_position, value);
break;
case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
unshare_border (animated);
gtk_css_take_value (&style->border->border_top_color, value);
break;
case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
unshare_border (animated);
gtk_css_take_value (&style->border->border_right_color, value);
break;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
unshare_border (animated);
gtk_css_take_value (&style->border->border_bottom_color, value);
break;
case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
unshare_border (animated);
gtk_css_take_value (&style->border->border_left_color, value);
break;
case GTK_CSS_PROPERTY_OUTLINE_COLOR:
unshare_outline (animated);
gtk_css_take_value (&style->outline->outline_color, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_REPEAT:
unshare_background (animated);
gtk_css_take_value (&style->background->background_repeat, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
unshare_background (animated);
gtk_css_take_value (&style->background->background_image, value);
break;
case GTK_CSS_PROPERTY_BACKGROUND_BLEND_MODE:
unshare_background (animated);
gtk_css_take_value (&style->background->background_blend_mode, value);
break;
case GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE:
unshare_border (animated);
gtk_css_take_value (&style->border->border_image_source, value);
break;
case GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT:
unshare_border (animated);
gtk_css_take_value (&style->border->border_image_repeat, value);
break;
case GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE:
unshare_border (animated);
gtk_css_take_value (&style->border->border_image_slice, value);
break;
case GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH:
unshare_border (animated);
gtk_css_take_value (&style->border->border_image_width, value);
break;
case GTK_CSS_PROPERTY_ICON_SOURCE:
unshare_other (animated);
gtk_css_take_value (&style->other->icon_source, value);
break;
case GTK_CSS_PROPERTY_ICON_SIZE:
unshare_icon (animated);
gtk_css_take_value (&style->icon->icon_size, value);
break;
case GTK_CSS_PROPERTY_ICON_SHADOW:
unshare_icon (animated);
gtk_css_take_value (&style->icon->icon_shadow, value);
break;
case GTK_CSS_PROPERTY_ICON_STYLE:
unshare_icon (animated);
gtk_css_take_value (&style->icon->icon_style, value);
break;
case GTK_CSS_PROPERTY_ICON_TRANSFORM:
unshare_other (animated);
gtk_css_take_value (&style->other->icon_transform, value);
break;
case GTK_CSS_PROPERTY_ICON_FILTER:
unshare_other (animated);
gtk_css_take_value (&style->other->icon_filter, value);
break;
case GTK_CSS_PROPERTY_BORDER_SPACING:
unshare_size (animated);
gtk_css_take_value (&style->size->border_spacing, value);
break;
case GTK_CSS_PROPERTY_TRANSFORM:
unshare_other (animated);
gtk_css_take_value (&style->other->transform, value);
break;
css: Implement transform-origin Implement most of transform-origin. We only handle the xy components currently, which lets us reuse the position value implementation that is used for background-position.
2021-01-25 03:46:01 +00:00
case GTK_CSS_PROPERTY_TRANSFORM_ORIGIN:
unshare_other (animated);
gtk_css_take_value (&style->other->transform_origin, value);
break;
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
case GTK_CSS_PROPERTY_MIN_WIDTH:
unshare_size (animated);
gtk_css_take_value (&style->size->min_width, value);
break;
case GTK_CSS_PROPERTY_MIN_HEIGHT:
unshare_size (animated);
gtk_css_take_value (&style->size->min_height, value);
break;
case GTK_CSS_PROPERTY_TRANSITION_PROPERTY:
unshare_transition (animated);
gtk_css_take_value (&style->transition->transition_property, value);
break;
case GTK_CSS_PROPERTY_TRANSITION_DURATION:
unshare_transition (animated);
gtk_css_take_value (&style->transition->transition_duration, value);
break;
case GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION:
unshare_transition (animated);
gtk_css_take_value (&style->transition->transition_timing_function, value);
break;
case GTK_CSS_PROPERTY_TRANSITION_DELAY:
unshare_transition (animated);
gtk_css_take_value (&style->transition->transition_delay, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_NAME:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_name, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_DURATION:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_duration, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_timing_function, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_ITERATION_COUNT:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_iteration_count, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_DIRECTION:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_direction, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_PLAY_STATE:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_play_state, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_DELAY:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_delay, value);
break;
case GTK_CSS_PROPERTY_ANIMATION_FILL_MODE:
unshare_animation (animated);
gtk_css_take_value (&style->animation->animation_fill_mode, value);
break;
case GTK_CSS_PROPERTY_OPACITY:
unshare_other (animated);
gtk_css_take_value (&style->other->opacity, value);
break;
case GTK_CSS_PROPERTY_FILTER:
unshare_other (animated);
gtk_css_take_value (&style->other->filter, value);
break;
case GTK_CSS_PROPERTY_CARET_COLOR:
unshare_font (animated);
gtk_css_take_value (&style->font->caret_color, value);
break;
case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
unshare_font (animated);
gtk_css_take_value (&style->font->secondary_caret_color, value);
break;
case GTK_CSS_PROPERTY_FONT_FEATURE_SETTINGS:
unshare_font (animated);
gtk_css_take_value (&style->font->font_feature_settings, value);
break;
case GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS:
unshare_font (animated);
gtk_css_take_value (&style->font->font_variation_settings, value);
break;
default:
g_assert_not_reached ();
break;
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
GtkCssValue *
gtk_css_animated_style_get_intrinsic_value (GtkCssAnimatedStyle *style,
guint id)
{
cssstyle: Add GtkCssStaticStyle For now, this is only an implementation detail of the animated style. The idea is to use GtkCssStaticStyle as the result of CSS queries and then put a GtkCssAnimatedStyle on top that manages the animations. The neat thing about this is that you can cache the static values.
2014-10-26 04:07:06 +00:00
return gtk_css_style_get_value (style->style, id);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
static GPtrArray *
gtk_css_animated_style_create_dynamic (GPtrArray *animations,
css: Implement support for dynamic values This adds a new GtkStyleAnimation called GtkCssDynamic (for lack of a better name) that is spawned whenever at least one dynamic value is part of the GtkCssStyle.
2018-02-13 07:22:34 +00:00
GtkCssStyle *style,
gint64 timestamp)
{
guint i;
/* XXX: Check animations if they have dynamic values */
for (i = 0; i < GTK_CSS_PROPERTY_N_PROPERTIES; i++)
{
if (gtk_css_value_is_dynamic (gtk_css_style_get_value (style, i)))
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (!animations)
animations = g_ptr_array_new ();
g_ptr_array_insert (animations, 0, gtk_css_dynamic_new (timestamp));
css: Implement support for dynamic values This adds a new GtkStyleAnimation called GtkCssDynamic (for lack of a better name) that is spawned whenever at least one dynamic value is part of the GtkCssStyle.
2018-02-13 07:22:34 +00:00
break;
}
}
return animations;
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
/* TRANSITIONS */
typedef struct _TransitionInfo TransitionInfo;
struct _TransitionInfo {
guint index; /* index into value arrays */
gboolean pending; /* TRUE if we still need to handle it */
};
static void
transition_info_add (TransitionInfo infos[GTK_CSS_PROPERTY_N_PROPERTIES],
GtkStyleProperty *property,
guint index)
{
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
if (GTK_IS_CSS_SHORTHAND_PROPERTY (property))
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Avoid some type checks and unnecessary work
2019-01-19 17:05:13 +00:00
GtkCssShorthandProperty *shorthand = (GtkCssShorthandProperty *) property;
guint len = _gtk_css_shorthand_property_get_n_subproperties (shorthand);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
guint i;
cssanimatedstyle: Avoid some type checks and unnecessary work
2019-01-19 17:05:13 +00:00
for (i = 0; i < len; i++)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
GtkCssStyleProperty *prop = _gtk_css_shorthand_property_get_subproperty (shorthand, i);
cssanimatedstyle: Keep transition_info_add from recursing The slowest part of that fuction is the type check for GtkCssShorthandProperty. Subproperties of shorthand properties never refer to more shorthand properties however, so we don't want to have the type check for those.
2019-08-22 11:14:57 +00:00
guint id;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Keep transition_info_add from recursing The slowest part of that fuction is the type check for GtkCssShorthandProperty. Subproperties of shorthand properties never refer to more shorthand properties however, so we don't want to have the type check for those.
2019-08-22 11:14:57 +00:00
if (!_gtk_css_style_property_is_animated ((GtkCssStyleProperty *) prop))
continue;
id = _gtk_css_style_property_get_id ((GtkCssStyleProperty *) prop);
infos[id].index = index;
infos[id].pending = TRUE;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
}
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
else
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
guint id;
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
cssanimatedstyle: Remove some casts in hot paths gtk_css_animated_style_create_css_transitions down from 16% to 11% when repeatedly clicking on a spinbutton button in the widget factory.
2019-08-17 14:12:57 +00:00
if (!_gtk_css_style_property_is_animated ((GtkCssStyleProperty *) property))
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
return;
cssanimatedstyle: Remove some casts in hot paths gtk_css_animated_style_create_css_transitions down from 16% to 11% when repeatedly clicking on a spinbutton button in the widget factory.
2019-08-17 14:12:57 +00:00
id = _gtk_css_style_property_get_id ((GtkCssStyleProperty *) property);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
g_assert (id < GTK_CSS_PROPERTY_N_PROPERTIES);
infos[id].index = index;
infos[id].pending = TRUE;
}
}
static void
transition_infos_set (TransitionInfo infos[GTK_CSS_PROPERTY_N_PROPERTIES],
GtkCssValue *transitions)
{
guint i;
for (i = 0; i < _gtk_css_array_value_get_n_values (transitions); i++)
{
GtkStyleProperty *property;
GtkCssValue *prop_value;
prop_value = _gtk_css_array_value_get_nth (transitions, i);
if (g_ascii_strcasecmp (_gtk_css_ident_value_get (prop_value), "all") == 0)
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
{
cssanimatedstyle: Avoid some type checks and unnecessary work
2019-01-19 17:05:13 +00:00
const guint len = _gtk_css_style_property_get_n_properties ();
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
guint j;
cssanimatedstyle: Avoid some type checks and unnecessary work
2019-01-19 17:05:13 +00:00
for (j = 0; j < len; j++)
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
{
cssanimatedstyle: Remove some casts in hot paths gtk_css_animated_style_create_css_transitions down from 16% to 11% when repeatedly clicking on a spinbutton button in the widget factory.
2019-08-17 14:12:57 +00:00
property = (GtkStyleProperty *)_gtk_css_style_property_lookup_by_id (j);
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
transition_info_add (infos, property, i);
}
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
else
{
property = _gtk_style_property_lookup (_gtk_css_ident_value_get (prop_value));
Refactor some css transition code slightly Reshuffling things a bit to avoid a bunch of NULL and type checks.
2017-01-10 23:34:50 +00:00
if (property)
transition_info_add (infos, property, i);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
}
}
static GtkStyleAnimation *
gtk_css_animated_style_find_transition (GtkCssAnimatedStyle *style,
guint property_id)
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
guint i;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
for (i = 0; i < style->n_animations; i ++)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GtkStyleAnimation *animation = style->animations[i];
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
if (!_gtk_css_transition_is_transition (animation))
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
continue;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (_gtk_css_transition_get_property ((GtkCssTransition *)animation) == property_id)
return animation;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
return NULL;
}
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
static GPtrArray *
gtk_css_animated_style_create_css_transitions (GPtrArray *animations,
GtkCssStyle *base_style,
gint64 timestamp,
GtkCssStyle *source)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
TransitionInfo transitions[GTK_CSS_PROPERTY_N_PROPERTIES] = { { 0, } };
GtkCssValue *durations, *delays, *timing_functions;
cssanimatedstyle: Avoid type check in loop We can just do the check once as source is not going to change within the loop.
2019-08-19 06:46:27 +00:00
gboolean source_is_animated;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
guint i;
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
durations = base_style->transition->transition_duration;
delays = base_style->transition->transition_delay;
timing_functions = base_style->transition->transition_timing_function;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Avoid unnecessary transition work No need to do all the transition work if the transition duration will be 0 for all of them.
2019-08-19 06:45:07 +00:00
if (_gtk_css_array_value_get_n_values (durations) == 1 &&
_gtk_css_array_value_get_n_values (delays) == 1 &&
_gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, 0), 100) +
_gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, 0), 100) == 0)
return animations;
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
transition_infos_set (transitions, base_style->transition->transition_property);
cssanimatedstyle: Avoid unnecessary transition work No need to do all the transition work if the transition duration will be 0 for all of them.
2019-08-19 06:45:07 +00:00
cssanimatedstyle: Avoid type check in loop We can just do the check once as source is not going to change within the loop.
2019-08-19 06:46:27 +00:00
source_is_animated = GTK_IS_CSS_ANIMATED_STYLE (source);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
for (i = 0; i < GTK_CSS_PROPERTY_N_PROPERTIES; i++)
{
GtkStyleAnimation *animation;
GtkCssValue *start, *end;
double duration, delay;
if (!transitions[i].pending)
continue;
duration = _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, transitions[i].index), 100);
delay = _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, transitions[i].index), 100);
if (duration + delay == 0.0)
continue;
cssanimatedstyle: Avoid type check in loop We can just do the check once as source is not going to change within the loop.
2019-08-19 06:46:27 +00:00
if (source_is_animated)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Avoid type check in loop We can just do the check once as source is not going to change within the loop.
2019-08-19 06:46:27 +00:00
start = gtk_css_animated_style_get_intrinsic_value ((GtkCssAnimatedStyle *)source, i);
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
end = gtk_css_style_get_value (base_style, i);
stylecontext: Make static styles static Instead of keeping an animated style everywhere, we replace it with the static style when nothing gets animated. Apart from making the code cleaner, this gets rid of a bunch of animated style values that do nothing but wrap a static style.
2014-12-14 16:06:27 +00:00
if (_gtk_css_value_equal (start, end))
{
cssanimatedstyle: Avoid type check in loop We can just do the check once as source is not going to change within the loop.
2019-08-19 06:46:27 +00:00
animation = gtk_css_animated_style_find_transition ((GtkCssAnimatedStyle *)source, i);
stylecontext: Make static styles static Instead of keeping an animated style everywhere, we replace it with the static style when nothing gets animated. Apart from making the code cleaner, this gets rid of a bunch of animated style values that do nothing but wrap a static style.
2014-12-14 16:06:27 +00:00
if (animation)
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
{
animation = _gtk_style_animation_advance (animation, timestamp);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (!animations)
animations = g_ptr_array_new ();
g_ptr_array_add (animations, animation);
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
}
stylecontext: Make static styles static Instead of keeping an animated style everywhere, we replace it with the static style when nothing gets animated. Apart from making the code cleaner, this gets rid of a bunch of animated style values that do nothing but wrap a static style.
2014-12-14 16:06:27 +00:00
continue;
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
stylecontext: Make static styles static Instead of keeping an animated style everywhere, we replace it with the static style when nothing gets animated. Apart from making the code cleaner, this gets rid of a bunch of animated style values that do nothing but wrap a static style.
2014-12-14 16:06:27 +00:00
css: Don't start transitions when the value didn't change This stops us from starting a lot of useless transitions. And it's even conformant with the CSS spec!
2016-02-18 22:55:00 +00:00
if (_gtk_css_value_equal (gtk_css_style_get_value (source, i),
gtk_css_style_get_value (base_style, i)))
continue;
stylecontext: Make static styles static Instead of keeping an animated style everywhere, we replace it with the static style when nothing gets animated. Apart from making the code cleaner, this gets rid of a bunch of animated style values that do nothing but wrap a static style.
2014-12-14 16:06:27 +00:00
animation = _gtk_css_transition_new (i,
gtk_css_style_get_value (source, i),
_gtk_css_array_value_get_nth (timing_functions, i),
csstransition: port to progress tracker
2016-03-07 06:45:27 +00:00
timestamp,
duration * G_USEC_PER_SEC,
delay * G_USEC_PER_SEC);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (!animations)
animations = g_ptr_array_new ();
g_ptr_array_add (animations, animation);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
return animations;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
static GtkStyleAnimation *
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
gtk_css_animated_style_find_animation (GtkStyleAnimation **animations,
guint n_animations,
const char *name)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
guint i;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
for (i = 0; i < n_animations; i ++)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GtkStyleAnimation *animation = animations[i];
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
if (!_gtk_css_animation_is_animation (animation))
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
continue;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (g_str_equal (_gtk_css_animation_get_name ((GtkCssAnimation *)animation), name))
return animation;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
return NULL;
}
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
static GPtrArray *
gtk_css_animated_style_create_css_animations (GPtrArray *animations,
css: Merge GtkStyleProviderPrivate into GtkStyleProvider This is just lots of renaming. The interface remains private, so the public API does not change, apart from removing the definition of the Interface object to avoid subclassing.
2017-10-31 03:31:46 +00:00
GtkCssStyle *base_style,
GtkCssStyle *parent_style,
gint64 timestamp,
GtkStyleProvider *provider,
GtkCssStyle *source)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
GtkCssValue *durations, *delays, *timing_functions, *animation_names;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
GtkCssValue *iteration_counts, *directions, *play_states, *fill_modes;
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
gboolean source_is_animated;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
guint i;
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
animation_names = base_style->animation->animation_name;
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
if (_gtk_css_array_value_get_n_values (animation_names) == 1)
{
const char *name = _gtk_css_ident_value_get (_gtk_css_array_value_get_nth (animation_names, 0));
if (g_ascii_strcasecmp (name, "none") == 0)
return animations;
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
durations = base_style->animation->animation_duration;
delays = base_style->animation->animation_delay;
timing_functions = base_style->animation->animation_timing_function;
iteration_counts = base_style->animation->animation_iteration_count;
directions = base_style->animation->animation_direction;
play_states = base_style->animation->animation_play_state;
fill_modes = base_style->animation->animation_fill_mode;
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
source_is_animated = GTK_IS_CSS_ANIMATED_STYLE (source);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
for (i = 0; i < _gtk_css_array_value_get_n_values (animation_names); i++)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GtkStyleAnimation *animation = NULL;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
GtkCssKeyframes *keyframes;
const char *name;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
name = _gtk_css_ident_value_get (_gtk_css_array_value_get_nth (animation_names, i));
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
if (g_ascii_strcasecmp (name, "none") == 0)
continue;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (animations)
animation = gtk_css_animated_style_find_animation ((GtkStyleAnimation **)animations->pdata, animations->len, name);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
if (animation)
continue;
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
if (source_is_animated)
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
animation = gtk_css_animated_style_find_animation ((GtkStyleAnimation **)GTK_CSS_ANIMATED_STYLE (source)->animations,
GTK_CSS_ANIMATED_STYLE (source)->n_animations,
name);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
if (animation)
{
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
animation = _gtk_css_animation_advance_with_play_state ((GtkCssAnimation *)animation,
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
timestamp,
_gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)));
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
else
{
css: Merge GtkStyleProviderPrivate into GtkStyleProvider This is just lots of renaming. The interface remains private, so the public API does not change, apart from removing the definition of the Interface object to avoid subclassing.
2017-10-31 03:31:46 +00:00
keyframes = gtk_style_provider_get_keyframes (provider, name);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
if (keyframes == NULL)
continue;
css: Move scale to GtkStyleProviderPrivate This way, we can remove it as a separate argument from gtk_css_value_compute() and allow computation to only depend on one thing: the style provider.
2015-01-31 10:56:15 +00:00
keyframes = _gtk_css_keyframes_compute (keyframes, provider, base_style, parent_style);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
animation = _gtk_css_animation_new (name,
keyframes,
timestamp,
_gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, i), 100) * G_USEC_PER_SEC,
_gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, i), 100) * G_USEC_PER_SEC,
_gtk_css_array_value_get_nth (timing_functions, i),
_gtk_css_direction_value_get (_gtk_css_array_value_get_nth (directions, i)),
_gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)),
_gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)),
_gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
_gtk_css_keyframes_unref (keyframes);
}
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (!animations)
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
animations = g_ptr_array_sized_new (16);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
g_ptr_array_add (animations, animation);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
return animations;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
/* PUBLIC API */
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
static void
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
gtk_css_animated_style_apply_animations (GtkCssAnimatedStyle *style)
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
guint i;
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
for (i = 0; i < style->n_animations; i ++)
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GtkStyleAnimation *animation = style->animations[i];
_gtk_style_animation_apply_values (animation, style);
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
}
}
cssanimatedstyle: Merge two functions
2014-12-15 00:58:11 +00:00
GtkCssStyle *
css: Merge GtkStyleProviderPrivate into GtkStyleProvider This is just lots of renaming. The interface remains private, so the public API does not change, apart from removing the definition of the Interface object to avoid subclassing.
2017-10-31 03:31:46 +00:00
gtk_css_animated_style_new (GtkCssStyle *base_style,
GtkCssStyle *parent_style,
gint64 timestamp,
GtkStyleProvider *provider,
GtkCssStyle *previous_style)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Merge two functions
2014-12-15 00:58:11 +00:00
GtkCssAnimatedStyle *result;
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
GtkCssStyle *style;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GPtrArray *animations = NULL;
cssanimatedstyle: Merge two functions
2014-12-15 00:58:11 +00:00
gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (base_style), NULL);
gtk_internal_return_val_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style), NULL);
gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
gtk_internal_return_val_if_fail (previous_style == NULL || GTK_IS_CSS_STYLE (previous_style), NULL);
cssstyle: Handle 0 timestamp to mean "don't animate"
2015-02-20 23:15:04 +00:00
if (timestamp == 0)
return g_object_ref (base_style);
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
if (previous_style != NULL)
animations = gtk_css_animated_style_create_css_transitions (animations, base_style, timestamp, previous_style);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
css: Move scale to GtkStyleProviderPrivate This way, we can remove it as a separate argument from gtk_css_value_compute() and allow computation to only depend on one thing: the style provider.
2015-01-31 10:56:15 +00:00
animations = gtk_css_animated_style_create_css_animations (animations, base_style, parent_style, timestamp, provider, previous_style);
css: Implement support for dynamic values This adds a new GtkStyleAnimation called GtkCssDynamic (for lack of a better name) that is spawned whenever at least one dynamic value is part of the GtkCssStyle.
2018-02-13 07:22:34 +00:00
animations = gtk_css_animated_style_create_dynamic (animations, base_style, timestamp);
cssanimatedstyle: Avoid creating animation ... when no animation exists. This makes the function name kinda wrong, but I'm not sure what else to call it.
2014-12-15 03:17:42 +00:00
if (animations == NULL)
return g_object_ref (base_style);
cssanimatedstyle: Merge two functions
2014-12-15 00:58:11 +00:00
result = g_object_new (GTK_TYPE_CSS_ANIMATED_STYLE, NULL);
result->style = g_object_ref (base_style);
cssanimatedstyle: Apply animation values after creation This makes GtkCssAnimatedStyle immutable.
2014-12-16 04:57:36 +00:00
result->current_time = timestamp;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
result->n_animations = animations->len;
result->animations = g_ptr_array_free (animations, FALSE);
cssanimatedstyle: Merge two functions
2014-12-15 00:58:11 +00:00
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
style = (GtkCssStyle *)result;
style->core = (GtkCssCoreValues *)gtk_css_values_ref ((GtkCssValues *)base_style->core);
style->background = (GtkCssBackgroundValues *)gtk_css_values_ref ((GtkCssValues *)base_style->background);
style->border = (GtkCssBorderValues *)gtk_css_values_ref ((GtkCssValues *)base_style->border);
style->icon = (GtkCssIconValues *)gtk_css_values_ref ((GtkCssValues *)base_style->icon);
style->outline = (GtkCssOutlineValues *)gtk_css_values_ref ((GtkCssValues *)base_style->outline);
style->font = (GtkCssFontValues *)gtk_css_values_ref ((GtkCssValues *)base_style->font);
style->font_variant = (GtkCssFontVariantValues *)gtk_css_values_ref ((GtkCssValues *)base_style->font_variant);
style->animation = (GtkCssAnimationValues *)gtk_css_values_ref ((GtkCssValues *)base_style->animation);
style->transition = (GtkCssTransitionValues *)gtk_css_values_ref ((GtkCssValues *)base_style->transition);
style->size = (GtkCssSizeValues *)gtk_css_values_ref ((GtkCssValues *)base_style->size);
style->other = (GtkCssOtherValues *)gtk_css_values_ref ((GtkCssValues *)base_style->other);
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
gtk_css_animated_style_apply_animations (result);
cssanimatedstyle: Apply animation values after creation This makes GtkCssAnimatedStyle immutable.
2014-12-16 04:57:36 +00:00
cssanimatedstyle: Merge two functions
2014-12-15 00:58:11 +00:00
return GTK_CSS_STYLE (result);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
GtkCssStyle *
gtk_css_animated_style_new_advance (GtkCssAnimatedStyle *source,
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
GtkCssStyle *base_style,
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
gint64 timestamp)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
GtkCssAnimatedStyle *result;
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
GtkCssStyle *style;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GPtrArray *animations;
guint i;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
gtk_internal_return_val_if_fail (GTK_IS_CSS_ANIMATED_STYLE (source), NULL);
animatedstyle: Fix the debug build This wasn't caught by our ci.
2020-01-29 13:02:30 +00:00
gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (base_style), NULL);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
animatedstyle: just ref current style if timestamp the same
2016-03-22 08:04:38 +00:00
if (timestamp == 0 || timestamp == source->current_time)
cssstyle: Handle 0 timestamp to mean "don't animate"
2015-02-20 23:15:04 +00:00
return g_object_ref (source->style);
animatedstyle: fail to create new style if timestamp goes backwards With slowdown factor, we will only we be able to handle timestamps that monotonically increase.
2016-03-22 07:54:11 +00:00
gtk_internal_return_val_if_fail (timestamp > source->current_time, NULL);
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
animations = NULL;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
for (i = 0; i < source->n_animations; i ++)
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
{
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
GtkStyleAnimation *animation = source->animations[i];
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
if (_gtk_style_animation_is_finished (animation))
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
continue;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
if (!animations)
css: Make GtkStyleAnimation and subclasses non-objects Making them GObjects is unnecessary. This enables further optimizations down the road. The only place we use them in is gtkcssanimatedstyle.c after all.
2020-05-06 17:17:11 +00:00
animations = g_ptr_array_sized_new (16);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
animation = _gtk_style_animation_advance (animation, timestamp);
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
g_ptr_array_add (animations, animation);
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
}
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
if (animations == NULL)
return g_object_ref (source->style);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
result = g_object_new (GTK_TYPE_CSS_ANIMATED_STYLE, NULL);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
result->style = g_object_ref (base_style);
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
result->current_time = timestamp;
cssanimatedstyle: Save animation in array
2019-08-19 07:42:51 +00:00
result->n_animations = animations->len;
result->animations = g_ptr_array_free (animations, FALSE);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
style = (GtkCssStyle *)result;
style->core = (GtkCssCoreValues *)gtk_css_values_ref ((GtkCssValues *)base_style->core);
style->background = (GtkCssBackgroundValues *)gtk_css_values_ref ((GtkCssValues *)base_style->background);
style->border = (GtkCssBorderValues *)gtk_css_values_ref ((GtkCssValues *)base_style->border);
style->icon = (GtkCssIconValues *)gtk_css_values_ref ((GtkCssValues *)base_style->icon);
style->outline = (GtkCssOutlineValues *)gtk_css_values_ref ((GtkCssValues *)base_style->outline);
style->font = (GtkCssFontValues *)gtk_css_values_ref ((GtkCssValues *)base_style->font);
style->font_variant = (GtkCssFontVariantValues *)gtk_css_values_ref ((GtkCssValues *)base_style->font_variant);
style->animation = (GtkCssAnimationValues *)gtk_css_values_ref ((GtkCssValues *)base_style->animation);
style->transition = (GtkCssTransitionValues *)gtk_css_values_ref ((GtkCssValues *)base_style->transition);
style->size = (GtkCssSizeValues *)gtk_css_values_ref ((GtkCssValues *)base_style->size);
style->other = (GtkCssOtherValues *)gtk_css_values_ref ((GtkCssValues *)base_style->other);
animatedstyle: don't share styleanimations Because of our port of css animation and css transition to progress tracker, we should not think of animated styles as immutable objects that can map any timestamp to css values. Rather, timestamps can correspond to different values depending on the value of GTK_SLOWDOWN over the course of the animation. To keep animated styles and style animations totally immutable, we will not share styleanimations between animatedstyles, and make a new copy of a styleanimation for each timestamp.
2016-03-22 08:10:21 +00:00
gtk_css_animated_style_apply_animations (result);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
cssanimatedstyle: Make advancing the style return a new style This is another step towards making CssStyles immutable.
2014-12-16 03:15:25 +00:00
return GTK_CSS_STYLE (result);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
}
Reference in New Issue Copy Permalink