Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Remove deprecated number-as-pixels compatibility

Browse Source 
Previously, for compatibility with GTK 3.0, we allowed specifying
numbers without units and interpreted them as pixels, even when the CSS
specification didn't.

Remove that now that we can break API.
This commit is contained in:
Benjamin Otte
2017-01-18 04:12:15 +01:00
parent bd24ca5b18
commit fb47a8d714
8 changed files with 13 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcsscalcvalue.c
View File

@@ -460,8 +460,6 @@ gtk_css_calc_value_parse (GtkCssParser *parser,
{
GtkCssValue *value;
/* This confuses '*' and '/' so we disallow backwards compat. */
flags &= ~GTK_CSS_NUMBER_AS_PIXELS;
/* This can only be handled at compute time, we allow '-' after all */
flags &= ~GTK_CSS_POSITIVE_ONLY;

2
gtk/gtkcsscornervalue.c
View File

@@ -127,7 +127,6 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
x = _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_PARSE_PERCENT
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
if (x == NULL)
return NULL;
@@ -139,7 +138,6 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
y = _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_PARSE_PERCENT
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
if (y == NULL)
{

7
gtk/gtkcssnumbervalueprivate.h
View File

@@ -30,10 +30,9 @@ typedef enum /*< skip >*/ {
GTK_CSS_POSITIVE_ONLY = (1 << 0),
GTK_CSS_PARSE_PERCENT = (1 << 1),
GTK_CSS_PARSE_NUMBER = (1 << 2),
GTK_CSS_NUMBER_AS_PIXELS = (1 << 3),
GTK_CSS_PARSE_LENGTH = (1 << 4),
GTK_CSS_PARSE_ANGLE = (1 << 5),
GTK_CSS_PARSE_TIME = (1 << 6)
GTK_CSS_PARSE_LENGTH = (1 << 3),
GTK_CSS_PARSE_ANGLE = (1 << 4),
GTK_CSS_PARSE_TIME = (1 << 5)
} GtkCssNumberParseFlags;
typedef struct _GtkCssNumberValueClass GtkCssNumberValueClass;

7
gtk/gtkcssparser.c
View File

@@ -707,13 +707,6 @@ gtk_css_dimension_value_parse (GtkCssParser *parser,
else
unit = GTK_CSS_PERCENT;
}
else if (flags & GTK_CSS_NUMBER_AS_PIXELS)
{
_gtk_css_parser_error_full (parser,
GTK_CSS_PROVIDER_ERROR_DEPRECATED,
"Not using units is deprecated. Assuming 'px'.");
unit = GTK_CSS_PX;
}
else if (flags & GTK_CSS_PARSE_NUMBER)
{
unit = GTK_CSS_NUMBER;

12
gtk/gtkcssshadowvalue.c
View File

@@ -235,14 +235,12 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
gtk_css_number_value_can_parse (parser))
{
values[HOFFSET] = _gtk_css_number_value_parse (parser,
GTK_CSS_PARSE_LENGTH
| GTK_CSS_NUMBER_AS_PIXELS);
GTK_CSS_PARSE_LENGTH);
if (values[HOFFSET] == NULL)
goto fail;
values[VOFFSET] = _gtk_css_number_value_parse (parser,
GTK_CSS_PARSE_LENGTH
| GTK_CSS_NUMBER_AS_PIXELS);
GTK_CSS_PARSE_LENGTH);
if (values[VOFFSET] == NULL)
goto fail;
@@ -250,8 +248,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
{
values[RADIUS] = _gtk_css_number_value_parse (parser,
GTK_CSS_PARSE_LENGTH
| GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS);
| GTK_CSS_POSITIVE_ONLY);
if (values[RADIUS] == NULL)
goto fail;
}
@@ -261,8 +258,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
if (box_shadow_mode && gtk_css_number_value_can_parse (parser))
{
values[SPREAD] = _gtk_css_number_value_parse (parser,
GTK_CSS_PARSE_LENGTH
| GTK_CSS_NUMBER_AS_PIXELS);
GTK_CSS_PARSE_LENGTH);
if (values[SPREAD] == NULL)
goto fail;
}

9
gtk/gtkcssshorthandpropertyimpl.c
View File

@@ -97,8 +97,7 @@ parse_margin (GtkCssShorthandProperty *shorthand,
return parse_four_numbers (shorthand,
values,
parser,
GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
GTK_CSS_PARSE_LENGTH);
}
static gboolean
@@ -110,7 +109,6 @@ parse_padding (GtkCssShorthandProperty *shorthand,
values,
parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
}
@@ -123,7 +121,6 @@ parse_border_width (GtkCssShorthandProperty *shorthand,
values,
parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
}
@@ -142,7 +139,6 @@ parse_border_radius (GtkCssShorthandProperty *shorthand,
x[i] = _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_PARSE_PERCENT
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
if (x[i] == NULL)
goto fail;
@@ -169,7 +165,6 @@ parse_border_radius (GtkCssShorthandProperty *shorthand,
y[i] = _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_PARSE_PERCENT
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
if (y[i] == NULL)
goto fail;
@@ -338,7 +333,6 @@ parse_border_side (GtkCssShorthandProperty *shorthand,
{
values[0] = _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
if (values[0] == NULL)
return FALSE;
@@ -380,7 +374,6 @@ parse_border (GtkCssShorthandProperty *shorthand,
{
values[0] = _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
if (values[0] == NULL)
return FALSE;

4
gtk/gtkcssstylefuncs.c
View File

@@ -203,7 +203,7 @@ int_value_parse (GtkCssParser *parser,
if (_gtk_css_parser_has_prefix (parser, "-gtk"))
{
GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_NUMBER_AS_PIXELS);
GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER);
if (cssvalue)
{
@@ -333,7 +333,7 @@ border_value_parse (GtkCssParser *parser,
{
if (_gtk_css_parser_has_prefix (parser, "-gtk"))
{
GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_NUMBER_AS_PIXELS);
GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER);
if (cssvalue)
{

11
gtk/gtkcssstylepropertyimpl.c
View File

@@ -667,8 +667,7 @@ gtk_css_font_size_value_parse (GtkCssParser *parser)
return _gtk_css_number_value_parse (parser,
GTK_CSS_PARSE_LENGTH
| GTK_CSS_PARSE_PERCENT
| GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS);
| GTK_CSS_POSITIVE_ONLY);
}
static GtkCssValue *
@@ -683,8 +682,7 @@ outline_parse (GtkCssStyleProperty *property,
GtkCssParser *parser)
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
GTK_CSS_PARSE_LENGTH);
}
static GtkCssValue *
@@ -800,8 +798,7 @@ parse_margin (GtkCssStyleProperty *property,
GtkCssParser *parser)
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
GTK_CSS_PARSE_LENGTH);
}
static GtkCssValue *
@@ -810,7 +807,6 @@ parse_padding (GtkCssStyleProperty *property,
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
}
@@ -820,7 +816,6 @@ parse_border_width (GtkCssStyleProperty *property,
{
return _gtk_css_number_value_parse (parser,
GTK_CSS_POSITIVE_ONLY
| GTK_CSS_NUMBER_AS_PIXELS
| GTK_CSS_PARSE_LENGTH);
}