callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssstyleproperty: Replace symbolic colors with GtkCssColorValue

Browse Source
This commit is contained in:
Benjamin Otte 2012-11-08 17:22:56 +01:00
parent e3f407a71d
commit bd31bd6d63
2 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -27,6 +27,7 @@
#include "gtkcssarrayvalueprivate.h" #include "gtkcssarrayvalueprivate.h"
#include "gtkcssbgsizevalueprivate.h" #include "gtkcssbgsizevalueprivate.h"
#include "gtkcssbordervalueprivate.h" #include "gtkcssbordervalueprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkcsscornervalueprivate.h" #include "gtkcsscornervalueprivate.h"
#include "gtkcsseasevalueprivate.h" #include "gtkcsseasevalueprivate.h"
#include "gtkcssenumvalueprivate.h" #include "gtkcssenumvalueprivate.h"
@ -39,7 +40,6 @@
#include "gtkcssstylefuncsprivate.h" #include "gtkcssstylefuncsprivate.h"
#include "gtkcssvalueprivate.h" #include "gtkcssvalueprivate.h"
#include "gtkstylepropertiesprivate.h" #include "gtkstylepropertiesprivate.h"
#include "gtksymboliccolorprivate.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
/* this is in case round() is not provided by the compiler, /* this is in case round() is not provided by the compiler,
@ -217,7 +217,7 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
values[i] = _gtk_css_symbolic_value_new (parser); values[i] = _gtk_css_color_value_parse (parser);
if (values[i] == NULL) if (values[i] == NULL)
return FALSE; return FALSE;
@ -349,7 +349,7 @@ parse_border_side (GtkCssShorthandProperty *shorthand,
} }
else if (values[2] == NULL) else if (values[2] == NULL)
{ {
values[2] = _gtk_css_symbolic_value_new (parser); values[2] = _gtk_css_color_value_parse (parser);
if (values[2] == NULL) if (values[2] == NULL)
return FALSE; return FALSE;
} }
@ -388,7 +388,7 @@ parse_border (GtkCssShorthandProperty *shorthand,
} }
else if (!G_IS_VALUE (&values[8])) else if (!G_IS_VALUE (&values[8]))
{ {
values[8] = _gtk_css_symbolic_value_new (parser); values[8] = _gtk_css_color_value_parse (parser);
if (values[8] == NULL) if (values[8] == NULL)
return FALSE; return FALSE;
@ -516,7 +516,7 @@ parse_one_background (GtkCssShorthandProperty *shorthand,
} }
else if (values[6] == NULL) else if (values[6] == NULL)
{ {
value = _gtk_css_symbolic_value_new (parser); value = _gtk_css_color_value_parse (parser);
if (value == NULL) if (value == NULL)
values[6] = _gtk_css_value_ref (_gtk_css_style_property_get_initial_value values[6] = _gtk_css_value_ref (_gtk_css_style_property_get_initial_value
(_gtk_css_shorthand_property_get_subproperty (shorthand, 6))); (_gtk_css_shorthand_property_get_subproperty (shorthand, 6)));

41
gtk/gtkcssstylepropertyimpl.c
View File

@ -42,6 +42,7 @@
#include "gtkcssarrayvalueprivate.h" #include "gtkcssarrayvalueprivate.h"
#include "gtkcssbgsizevalueprivate.h" #include "gtkcssbgsizevalueprivate.h"
#include "gtkcssbordervalueprivate.h" #include "gtkcssbordervalueprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkcsscornervalueprivate.h" #include "gtkcsscornervalueprivate.h"
#include "gtkcsseasevalueprivate.h" #include "gtkcsseasevalueprivate.h"
#include "gtkcssenginevalueprivate.h" #include "gtkcssenginevalueprivate.h"
@ -55,7 +56,6 @@
#include "gtkcssrgbavalueprivate.h" #include "gtkcssrgbavalueprivate.h"
#include "gtkcssshadowsvalueprivate.h" #include "gtkcssshadowsvalueprivate.h"
#include "gtkcssstringvalueprivate.h" #include "gtkcssstringvalueprivate.h"
#include "gtksymboliccolorprivate.h"
#include "gtkthemingengine.h" #include "gtkthemingengine.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkwin32themeprivate.h" #include "gtkwin32themeprivate.h"
@ -171,7 +171,7 @@ static GtkCssValue *
color_parse (GtkCssStyleProperty *property, color_parse (GtkCssStyleProperty *property,
GtkCssParser *parser) GtkCssParser *parser)
{ {
return _gtk_css_symbolic_value_new (parser); return _gtk_css_color_value_parse (parser);
} }
static void static void
@ -853,17 +853,6 @@ background_position_parse (GtkCssStyleProperty *property,
/*** REGISTRATION ***/ /*** REGISTRATION ***/
static GtkSymbolicColor *
gtk_symbolic_color_new_rgba (double red,
double green,
double blue,
double alpha)
{
GdkRGBA rgba = { red, green, blue, alpha };
return gtk_symbolic_color_new_literal (&rgba);
}
void void
_gtk_css_style_property_init_properties (void) _gtk_css_style_property_init_properties (void)
{ {
@ -878,8 +867,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_rgba (1, 1, 1, 1));
gtk_symbolic_color_new_rgba (1, 1, 1, 1)));
gtk_css_style_property_register ("font-size", gtk_css_style_property_register ("font-size",
GTK_CSS_PROPERTY_FONT_SIZE, GTK_CSS_PROPERTY_FONT_SIZE,
G_TYPE_DOUBLE, G_TYPE_DOUBLE,
@ -899,8 +887,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_rgba (0, 0, 0, 0));
gtk_symbolic_color_new_rgba (0, 0, 0, 0)));
gtk_css_style_property_register ("font-family", gtk_css_style_property_register ("font-family",
GTK_CSS_PROPERTY_FONT_FAMILY, GTK_CSS_PROPERTY_FONT_FAMILY,
@ -1197,9 +1184,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_current_color ());
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
gtk_css_style_property_register ("border-right-color", gtk_css_style_property_register ("border-right-color",
GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR,
GDK_TYPE_RGBA, GDK_TYPE_RGBA,
@ -1207,9 +1192,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_current_color ());
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
gtk_css_style_property_register ("border-bottom-color", gtk_css_style_property_register ("border-bottom-color",
GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR,
GDK_TYPE_RGBA, GDK_TYPE_RGBA,
@ -1217,9 +1200,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_current_color ());
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
gtk_css_style_property_register ("border-left-color", gtk_css_style_property_register ("border-left-color",
GTK_CSS_PROPERTY_BORDER_LEFT_COLOR, GTK_CSS_PROPERTY_BORDER_LEFT_COLOR,
GDK_TYPE_RGBA, GDK_TYPE_RGBA,
@ -1227,9 +1208,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_current_color ());
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
gtk_css_style_property_register ("outline-color", gtk_css_style_property_register ("outline-color",
GTK_CSS_PROPERTY_OUTLINE_COLOR, GTK_CSS_PROPERTY_OUTLINE_COLOR,
GDK_TYPE_RGBA, GDK_TYPE_RGBA,
@ -1237,9 +1216,7 @@ _gtk_css_style_property_init_properties (void)
color_parse, color_parse,
color_query, color_query,
color_assign, color_assign,
_gtk_css_symbolic_value_new_take_symbolic_color ( _gtk_css_color_value_new_current_color ());
gtk_symbolic_color_ref (
_gtk_symbolic_color_get_current_color ())));
gtk_css_style_property_register ("background-repeat", gtk_css_style_property_register ("background-repeat",
GTK_CSS_PROPERTY_BACKGROUND_REPEAT, GTK_CSS_PROPERTY_BACKGROUND_REPEAT,