1454ba15ba
Here's the shortest description of the bug I can come up with:
When computing values, we have 3 kinds of dependencies:
(1) other properties ("currentColor" or em values)
(2) inherited properties ("inherit")
(3) generic things from the theme (@keyframes or @define-color)
Previously, we passed the GtkStyleContext as an argument, because it
provided these 3 things using:
(1) _gtk_style_context_peek_property()
(2) _gtk_style_context_peek_property(gtk_style_context_get_parent())
(3) context->priv->cascade
However, this makes it impossible to lookup values other than the ones
accessible via _gtk_style_context_peek_property(). And this is exactly
what we are doing in gtk_style_context_update_cache(). So when the cache
updates encountered case (1), they were looking up the values from the
wrong style data.
So this large patch essentially does nothing but replace the
context argument in all compute functions with new arguments for the 3
cases above:
(1) values
(2) parent_values
(3) provider
We apparently have a lot of computing code.
90 lines
4.8 KiB
C
90 lines
4.8 KiB
C
/*
|
|
* 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: Alexander Larsson <alexl@gnome.org>
|
|
*/
|
|
|
|
#ifndef __GTK_CSS_VALUE_PRIVATE_H__
|
|
#define __GTK_CSS_VALUE_PRIVATE_H__
|
|
|
|
#include <glib-object.h>
|
|
#include "gtkcsstypesprivate.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define GTK_TYPE_CSS_VALUE (_gtk_css_value_get_type ())
|
|
|
|
/* A GtkCssValue is a refcounted immutable value type */
|
|
|
|
typedef struct _GtkCssValue GtkCssValue;
|
|
typedef struct _GtkCssValueClass GtkCssValueClass;
|
|
|
|
/* using define instead of struct here so compilers get the packing right */
|
|
#define GTK_CSS_VALUE_BASE \
|
|
const GtkCssValueClass *class; \
|
|
volatile gint ref_count;
|
|
|
|
struct _GtkCssValueClass {
|
|
void (* free) (GtkCssValue *value);
|
|
|
|
GtkCssValue * (* compute) (GtkCssValue *value,
|
|
guint property_id,
|
|
GtkStyleProviderPrivate *provider,
|
|
GtkCssComputedValues *values,
|
|
GtkCssComputedValues *parent_values,
|
|
GtkCssDependencies *dependencies);
|
|
gboolean (* equal) (const GtkCssValue *value1,
|
|
const GtkCssValue *value2);
|
|
GtkCssValue * (* transition) (GtkCssValue *start,
|
|
GtkCssValue *end,
|
|
guint property_id,
|
|
double progress);
|
|
void (* print) (const GtkCssValue *value,
|
|
GString *string);
|
|
};
|
|
|
|
GType _gtk_css_value_get_type (void) G_GNUC_CONST;
|
|
|
|
GtkCssValue *_gtk_css_value_alloc (const GtkCssValueClass *klass,
|
|
gsize size);
|
|
#define _gtk_css_value_new(_name, _klass) ((_name *) _gtk_css_value_alloc ((_klass), sizeof (_name)))
|
|
|
|
GtkCssValue *_gtk_css_value_ref (GtkCssValue *value);
|
|
void _gtk_css_value_unref (GtkCssValue *value);
|
|
|
|
GtkCssValue *_gtk_css_value_compute (GtkCssValue *value,
|
|
guint property_id,
|
|
GtkStyleProviderPrivate *provider,
|
|
GtkCssComputedValues *values,
|
|
GtkCssComputedValues *parent_values,
|
|
GtkCssDependencies *dependencies);
|
|
gboolean _gtk_css_value_equal (const GtkCssValue *value1,
|
|
const GtkCssValue *value2);
|
|
gboolean _gtk_css_value_equal0 (const GtkCssValue *value1,
|
|
const GtkCssValue *value2);
|
|
GtkCssValue *_gtk_css_value_transition (GtkCssValue *start,
|
|
GtkCssValue *end,
|
|
guint property_id,
|
|
double progress);
|
|
|
|
char * _gtk_css_value_to_string (const GtkCssValue *value);
|
|
void _gtk_css_value_print (const GtkCssValue *value,
|
|
GString *string);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GTK_CSS_VALUE_PRIVATE_H__ */
|