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.
66 lines
3.8 KiB
C
66 lines
3.8 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
|
|
*
|
|
* 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 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/>.
|
|
*/
|
|
|
|
#ifndef __GTK_STYLE_CONTEXT_PRIVATE_H__
|
|
#define __GTK_STYLE_CONTEXT_PRIVATE_H__
|
|
|
|
#include "gtkstylecontext.h"
|
|
#include "gtkstyleproviderprivate.h"
|
|
#include "gtksymboliccolor.h"
|
|
#include "gtkbitmaskprivate.h"
|
|
#include "gtkcssvalueprivate.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
void _gtk_style_context_set_widget (GtkStyleContext *context,
|
|
GtkWidget *widget);
|
|
GtkCssValue * _gtk_style_context_peek_property (GtkStyleContext *context,
|
|
guint property_id);
|
|
double _gtk_style_context_get_number (GtkStyleContext *context,
|
|
guint property_id,
|
|
double one_hundred_percent);
|
|
const GValue * _gtk_style_context_peek_style_property (GtkStyleContext *context,
|
|
GType widget_type,
|
|
GtkStateFlags state,
|
|
GParamSpec *pspec);
|
|
void _gtk_style_context_validate (GtkStyleContext *context,
|
|
gint64 timestamp,
|
|
GtkCssChange change,
|
|
const GtkBitmask*parent_changes);
|
|
void _gtk_style_context_queue_invalidate (GtkStyleContext *context,
|
|
GtkCssChange change);
|
|
gboolean _gtk_style_context_check_region_name (const gchar *str);
|
|
|
|
gboolean _gtk_style_context_resolve_color (GtkStyleContext *context,
|
|
GtkSymbolicColor *color,
|
|
GdkRGBA *result,
|
|
GtkCssDependencies *dependencies);
|
|
GtkCssValue * _gtk_style_context_resolve_color_value (GtkStyleContext *context,
|
|
GtkCssValue *current,
|
|
GtkCssDependencies current_deps,
|
|
GtkCssValue *color,
|
|
GtkCssDependencies *dependencies);
|
|
void _gtk_style_context_get_cursor_color (GtkStyleContext *context,
|
|
GdkRGBA *primary_color,
|
|
GdkRGBA *secondary_color);
|
|
|
|
void _gtk_style_context_update_animating (GtkStyleContext *context);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GTK_STYLE_CONTEXT_PRIVATE_H__ */
|