AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

styleproperty: Remove equal_func vfunc

Browse Source 
Equality tests are done with _gtk_css_value_equal(). There is no need to
do it per-property, equal values will still be equal.

This essentially reverts 24f5d54329e028347bd76af42e86ed190c1229a2 and
92c7a7171e1240b6d961ee5b6f9ab6b596e98904.
This commit is contained in:
Benjamin Otte 2012-04-07 10:39:51 +02:00
parent 40283e7c27
commit 2fec112422
3 changed files with 0 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkcssstyleproperty.c
View File

@ -244,21 +244,12 @@ gtk_css_style_property_real_compute_value (GtkCssStyleProperty *property,
return _gtk_css_value_ref (specified);
}
static gboolean
gtk_css_style_property_real_equal (GtkCssStyleProperty *property,
GtkCssValue *value1,
GtkCssValue *value2)
{
return _gtk_css_value_equal (value1, value2);
}
static void
_gtk_css_style_property_init (GtkCssStyleProperty *property)
{
property->parse_value = gtk_css_style_property_real_parse_value;
property->print_value = gtk_css_style_property_real_print_value;
property->compute_value = gtk_css_style_property_real_compute_value;
property->equal_func = gtk_css_style_property_real_equal;
}
/**
@ -431,26 +422,3 @@ _gtk_css_style_property_print_value (GtkCssStyleProperty *property,
else
property->print_value (property, value, string);
}
/**
* _gtk_css_style_property_is_equal:
* @property: the property
* @value1: the first value to compare
* @value2: the second value to compare
*
* Compares @value1 and @value2 for equality. Both values must be the
* result of a call _gtk_css_style_property_compute_value().
*
* Returns: %TRUE if @value1 and @value2 are equal
**/
gboolean
_gtk_css_style_property_is_equal (GtkCssStyleProperty *property,
GtkCssValue *value1,
GtkCssValue *value2)
{
g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), FALSE);
g_return_val_if_fail (value1 != NULL, FALSE);
g_return_val_if_fail (value2 != NULL, FALSE);
return property->equal_func (property, value1, value2);
}

57
gtk/gtkcssstylepropertyimpl.c
View File

@ -77,7 +77,6 @@ gtk_css_style_property_register (const char * name,
GtkCssStylePropertyComputeFunc compute_value,
GtkCssStylePropertyQueryFunc query_value,
GtkCssStylePropertyAssignFunc assign_value,
GtkCssStylePropertyEqualFunc equal_func,
GtkCssValue * initial_value)
{
GtkCssStyleProperty *node;
@ -102,8 +101,6 @@ gtk_css_style_property_register (const char * name,
node->compute_value = compute_value;
node->query_value = query_value;
node->assign_value = assign_value;
if (equal_func)
node->equal_func = equal_func;
_gtk_css_value_unref (initial_value);
@ -931,7 +928,6 @@ _gtk_css_style_property_init_properties (void)
color_property_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_new_rgba (1, 1, 1, 1)));
gtk_css_style_property_register ("font-size",
@ -943,7 +939,6 @@ _gtk_css_style_property_init_properties (void)
font_size_compute,
query_length_as_double,
assign_length_from_double,
NULL,
/* XXX: This should be 'normal' */
_gtk_css_number_value_new (10.0, GTK_CSS_PX));
@ -958,7 +953,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_new_rgba (0, 0, 0, 0)));
@ -971,7 +965,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
font_family_query,
font_family_assign,
NULL,
_gtk_css_array_value_new (_gtk_css_string_value_new ("Sans")));
gtk_css_style_property_register ("font-style",
GTK_CSS_PROPERTY_FONT_STYLE,
@ -982,7 +975,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_pango_style,
assign_pango_style,
NULL,
_gtk_css_font_style_value_new (PANGO_STYLE_NORMAL));
gtk_css_style_property_register ("font-variant",
GTK_CSS_PROPERTY_FONT_VARIANT,
@ -993,7 +985,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_pango_variant,
assign_pango_variant,
NULL,
_gtk_css_font_variant_value_new (PANGO_VARIANT_NORMAL));
gtk_css_style_property_register ("font-weight",
GTK_CSS_PROPERTY_FONT_WEIGHT,
@ -1004,7 +995,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_pango_weight,
assign_pango_weight,
NULL,
_gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL));
gtk_css_style_property_register ("text-shadow",
@ -1016,7 +1006,6 @@ _gtk_css_style_property_init_properties (void)
shadow_value_compute,
NULL,
NULL,
NULL,
_gtk_css_shadows_value_new_none ());
gtk_css_style_property_register ("icon-shadow",
@ -1028,7 +1017,6 @@ _gtk_css_style_property_init_properties (void)
shadow_value_compute,
NULL,
NULL,
NULL,
_gtk_css_shadows_value_new_none ());
gtk_css_style_property_register ("box-shadow",
@ -1040,7 +1028,6 @@ _gtk_css_style_property_init_properties (void)
shadow_value_compute,
NULL,
NULL,
NULL,
_gtk_css_shadows_value_new_none ());
gtk_css_style_property_register ("margin-top",
@ -1052,7 +1039,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-left",
GTK_CSS_PROPERTY_MARGIN_LEFT,
@ -1063,7 +1049,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-bottom",
GTK_CSS_PROPERTY_MARGIN_BOTTOM,
@ -1074,7 +1059,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("margin-right",
GTK_CSS_PROPERTY_MARGIN_RIGHT,
@ -1085,7 +1069,6 @@ _gtk_css_style_property_init_properties (void)
compute_margin,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-top",
GTK_CSS_PROPERTY_PADDING_TOP,
@ -1096,7 +1079,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-left",
GTK_CSS_PROPERTY_PADDING_LEFT,
@ -1107,7 +1089,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-bottom",
GTK_CSS_PROPERTY_PADDING_BOTTOM,
@ -1118,7 +1099,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("padding-right",
GTK_CSS_PROPERTY_PADDING_RIGHT,
@ -1129,7 +1109,6 @@ _gtk_css_style_property_init_properties (void)
compute_padding,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
/* IMPORTANT: compute_border_width() requires that the border-width
* properties be immeditaly followed by the border-style properties
@ -1143,7 +1122,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-top-width",
GTK_CSS_PROPERTY_BORDER_TOP_WIDTH,
@ -1154,7 +1132,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-left-style",
GTK_CSS_PROPERTY_BORDER_LEFT_STYLE,
@ -1165,7 +1142,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-left-width",
GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH,
@ -1176,7 +1152,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-bottom-style",
GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE,
@ -1187,7 +1162,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-bottom-width",
GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
@ -1198,7 +1172,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-right-style",
GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE,
@ -1209,7 +1182,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("border-right-width",
GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH,
@ -1220,7 +1192,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("border-top-left-radius",
@ -1232,7 +1203,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
gtk_css_style_property_register ("border-top-right-radius",
@ -1244,7 +1214,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
gtk_css_style_property_register ("border-bottom-right-radius",
@ -1256,7 +1225,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
gtk_css_style_property_register ("border-bottom-left-radius",
@ -1268,7 +1236,6 @@ _gtk_css_style_property_init_properties (void)
border_corner_radius_value_compute,
NULL,
NULL,
NULL,
_gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
_gtk_css_number_value_new (0, GTK_CSS_PX)));
@ -1281,7 +1248,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
query_border_style,
assign_border_style,
NULL,
_gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE));
gtk_css_style_property_register ("outline-width",
GTK_CSS_PROPERTY_OUTLINE_WIDTH,
@ -1292,7 +1258,6 @@ _gtk_css_style_property_init_properties (void)
compute_border_width,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("outline-offset",
GTK_CSS_PROPERTY_OUTLINE_OFFSET,
@ -1303,7 +1268,6 @@ _gtk_css_style_property_init_properties (void)
outline_compute,
query_length_as_int,
assign_length_from_int,
NULL,
_gtk_css_number_value_new (0.0, GTK_CSS_PX));
gtk_css_style_property_register ("background-clip",
@ -1315,7 +1279,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX));
gtk_css_style_property_register ("background-origin",
GTK_CSS_PROPERTY_BACKGROUND_ORIGIN,
@ -1326,7 +1289,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX));
gtk_css_style_property_register ("background-size",
GTK_CSS_PROPERTY_BACKGROUND_SIZE,
@ -1337,7 +1299,6 @@ _gtk_css_style_property_init_properties (void)
background_size_compute,
NULL,
NULL,
NULL,
_gtk_css_bg_size_value_new (NULL, NULL));
gtk_css_style_property_register ("background-position",
GTK_CSS_PROPERTY_BACKGROUND_POSITION,
@ -1348,7 +1309,6 @@ _gtk_css_style_property_init_properties (void)
background_position_compute,
NULL,
NULL,
NULL,
_gtk_css_position_value_new (_gtk_css_number_value_new (0, GTK_CSS_PERCENT),
_gtk_css_number_value_new (0, GTK_CSS_PERCENT)));
@ -1361,7 +1321,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@ -1374,7 +1333,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@ -1387,7 +1345,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@ -1400,7 +1357,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@ -1413,7 +1369,6 @@ _gtk_css_style_property_init_properties (void)
color_compute,
color_query,
color_assign,
NULL,
_gtk_css_symbolic_value_new_take_symbolic_color (
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
@ -1427,7 +1382,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_background_repeat_value_new (GTK_CSS_REPEAT_STYLE_REPEAT,
GTK_CSS_REPEAT_STYLE_REPEAT));
gtk_css_style_property_register ("background-image",
@ -1439,7 +1393,6 @@ _gtk_css_style_property_init_properties (void)
css_image_value_compute,
css_image_value_query,
css_image_value_assign,
NULL,
_gtk_css_image_value_new (NULL));
gtk_css_style_property_register ("border-image-source",
@ -1451,7 +1404,6 @@ _gtk_css_style_property_init_properties (void)
css_image_value_compute,
css_image_value_query,
css_image_value_assign,
NULL,
_gtk_css_image_value_new (NULL));
gtk_css_style_property_register ("border-image-repeat",
GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT,
@ -1462,7 +1414,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_border_repeat_value_new (GTK_CSS_REPEAT_STYLE_STRETCH,
GTK_CSS_REPEAT_STYLE_STRETCH));
@ -1475,7 +1426,6 @@ _gtk_css_style_property_init_properties (void)
compute_border,
query_border,
assign_border,
NULL,
_gtk_css_border_value_new (_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
@ -1489,7 +1439,6 @@ _gtk_css_style_property_init_properties (void)
compute_border,
query_border,
assign_border,
NULL,
_gtk_css_border_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
@ -1504,7 +1453,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_array_value_new (_gtk_css_ident_value_new ("all")));
gtk_css_style_property_register ("transition-duration",
GTK_CSS_PROPERTY_TRANSITION_DURATION,
@ -1515,7 +1463,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
gtk_css_style_property_register ("transition-timing-function",
GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION,
@ -1526,7 +1473,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_array_value_new (
_gtk_css_ease_value_new_cubic_bezier (0.25, 0.1, 0.25, 1.0)));
gtk_css_style_property_register ("transition-delay",
@ -1538,7 +1484,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
NULL,
_gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S)));
gtk_css_style_property_register ("engine",
@ -1550,7 +1495,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
engine_query,
engine_assign,
NULL,
_gtk_css_engine_value_new (gtk_theming_engine_load (NULL)));
/* Private property holding the binding sets */
@ -1563,7 +1507,6 @@ _gtk_css_style_property_init_properties (void)
NULL,
bindings_value_query,
bindings_value_assign,
NULL,
_gtk_css_array_value_new (NULL));
}

7
gtk/gtkcssstylepropertyprivate.h
View File

@ -48,9 +48,6 @@ typedef void (* GtkCssStylePropertyQueryFunc) (GtkCssStyleProperty
GValue *value);
typedef GtkCssValue * (* GtkCssStylePropertyAssignFunc) (GtkCssStyleProperty *property,
const GValue *value);
typedef gboolean (* GtkCssStylePropertyEqualFunc) (GtkCssStyleProperty *property,
GtkCssValue *value1,
GtkCssValue *value2);
struct _GtkCssStyleProperty
{
GtkStyleProperty parent;
@ -65,7 +62,6 @@ struct _GtkCssStyleProperty
GtkCssStylePropertyComputeFunc compute_value;
GtkCssStylePropertyQueryFunc query_value;
GtkCssStylePropertyAssignFunc assign_value;
GtkCssStylePropertyEqualFunc equal_func;
};
struct _GtkCssStylePropertyClass
@ -95,9 +91,6 @@ GtkCssValue * _gtk_css_style_property_compute_value (GtkCssStyleProp
void _gtk_css_style_property_print_value (GtkCssStyleProperty *property,
GtkCssValue *value,
GString *string);
gboolean _gtk_css_style_property_is_equal (GtkCssStyleProperty *property,
GtkCssValue *value1,
GtkCssValue *value2);
G_END_DECLS