forked from AuroraMiddleware/gtk
1f2f2777e1
Most corners are square, so x == y. In that case, just accept either of them. This makes the corner value unnecessary. In fact none of the corner values in the widget-factory are needed, so this spares us around 500 corner value allocations. css value stats before: GtkCssBgSizeValue: 23 GtkCssIdentValue: 25 GtkCssPositionValue: 81 GtkCssCornerValue: 556 GtkCssArrayValue: 143 GtkCssStringValue: 33 GtkCssPaletteValue: 29 GtkCssImageValue: 2765 GtkCssColorValue: 1452 GtkCssFilterValue: 3 GtkCssRgbaValue: 1092 GtkCssShadowValue: 708 GtkCssEaseValue: 33 GtkCssBorderValue: 2 GtkCssTransformValue: 11 GtkCssDimensionValue: 882 GtkCssShadowsValue: 584 SUM: 8428 and after: GtkCssColorValue: 1452 GtkCssFilterValue: 3 GtkCssRgbaValue: 1092 GtkCssShadowValue: 708 GtkCssEaseValue: 33 GtkCssBorderValue: 2 GtkCssTransformValue: 11 GtkCssDimensionValue: 882 GtkCssShadowsValue: 584 GtkCssBgSizeValue: 23 GtkCssIdentValue: 25 GtkCssPositionValue: 81 GtkCssArrayValue: 143 GtkCssStringValue: 33 GtkCssPaletteValue: 29 GtkCssImageValue: 2765 SUM: 7872 8428 to 7872 is a 556 reduction (6.5%) asdf
187 lines
5.1 KiB
C
187 lines
5.1 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 2011 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 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/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "gtkcsscornervalueprivate.h"
|
|
|
|
#include "gtkcssnumbervalueprivate.h"
|
|
|
|
struct _GtkCssValue {
|
|
GTK_CSS_VALUE_BASE
|
|
GtkCssValue *x;
|
|
GtkCssValue *y;
|
|
};
|
|
|
|
static void
|
|
gtk_css_value_corner_free (GtkCssValue *value)
|
|
{
|
|
_gtk_css_value_unref (value->x);
|
|
_gtk_css_value_unref (value->y);
|
|
|
|
g_slice_free (GtkCssValue, value);
|
|
}
|
|
|
|
static GtkCssValue *
|
|
gtk_css_value_corner_compute (GtkCssValue *corner,
|
|
guint property_id,
|
|
GtkStyleProvider *provider,
|
|
GtkCssStyle *style,
|
|
GtkCssStyle *parent_style)
|
|
{
|
|
GtkCssValue *x, *y;
|
|
|
|
x = _gtk_css_value_compute (corner->x, property_id, provider, style, parent_style);
|
|
y = _gtk_css_value_compute (corner->y, property_id, provider, style, parent_style);
|
|
if (x == corner->x && y == corner->y)
|
|
{
|
|
_gtk_css_value_unref (x);
|
|
_gtk_css_value_unref (y);
|
|
return _gtk_css_value_ref (corner);
|
|
}
|
|
|
|
return _gtk_css_corner_value_new (x, y);
|
|
}
|
|
|
|
static gboolean
|
|
gtk_css_value_corner_equal (const GtkCssValue *corner1,
|
|
const GtkCssValue *corner2)
|
|
{
|
|
return _gtk_css_value_equal (corner1->x, corner2->x)
|
|
&& _gtk_css_value_equal (corner1->y, corner2->y);
|
|
}
|
|
|
|
static GtkCssValue *
|
|
gtk_css_value_corner_transition (GtkCssValue *start,
|
|
GtkCssValue *end,
|
|
guint property_id,
|
|
double progress)
|
|
{
|
|
GtkCssValue *x, *y;
|
|
|
|
x = _gtk_css_value_transition (start->x, end->x, property_id, progress);
|
|
if (x == NULL)
|
|
return NULL;
|
|
y = _gtk_css_value_transition (start->y, end->y, property_id, progress);
|
|
if (y == NULL)
|
|
{
|
|
_gtk_css_value_unref (x);
|
|
return NULL;
|
|
}
|
|
|
|
return _gtk_css_corner_value_new (x, y);
|
|
}
|
|
|
|
static void
|
|
gtk_css_value_corner_print (const GtkCssValue *corner,
|
|
GString *string)
|
|
{
|
|
_gtk_css_value_print (corner->x, string);
|
|
if (!_gtk_css_value_equal (corner->x, corner->y))
|
|
{
|
|
g_string_append_c (string, ' ');
|
|
_gtk_css_value_print (corner->y, string);
|
|
}
|
|
}
|
|
|
|
static const GtkCssValueClass GTK_CSS_VALUE_CORNER = {
|
|
"GtkCssCornerValue",
|
|
gtk_css_value_corner_free,
|
|
gtk_css_value_corner_compute,
|
|
gtk_css_value_corner_equal,
|
|
gtk_css_value_corner_transition,
|
|
NULL,
|
|
NULL,
|
|
gtk_css_value_corner_print
|
|
};
|
|
|
|
GtkCssValue *
|
|
_gtk_css_corner_value_new (GtkCssValue *x,
|
|
GtkCssValue *y)
|
|
{
|
|
GtkCssValue *result;
|
|
|
|
if (_gtk_css_value_equal (x, y))
|
|
{
|
|
_gtk_css_value_unref (y);
|
|
return x;
|
|
}
|
|
|
|
result = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_CORNER);
|
|
result->x = x;
|
|
result->y = y;
|
|
|
|
return result;
|
|
}
|
|
|
|
GtkCssValue *
|
|
_gtk_css_corner_value_parse (GtkCssParser *parser)
|
|
{
|
|
GtkCssValue *x, *y;
|
|
|
|
x = _gtk_css_number_value_parse (parser,
|
|
GTK_CSS_POSITIVE_ONLY
|
|
| GTK_CSS_PARSE_PERCENT
|
|
| GTK_CSS_PARSE_LENGTH);
|
|
if (x == NULL)
|
|
return NULL;
|
|
|
|
if (!gtk_css_number_value_can_parse (parser))
|
|
y = _gtk_css_value_ref (x);
|
|
else
|
|
{
|
|
y = _gtk_css_number_value_parse (parser,
|
|
GTK_CSS_POSITIVE_ONLY
|
|
| GTK_CSS_PARSE_PERCENT
|
|
| GTK_CSS_PARSE_LENGTH);
|
|
if (y == NULL)
|
|
{
|
|
_gtk_css_value_unref (x);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
return _gtk_css_corner_value_new (x, y);
|
|
}
|
|
|
|
double
|
|
_gtk_css_corner_value_get_x (const GtkCssValue *corner,
|
|
double one_hundred_percent)
|
|
{
|
|
if (corner->class != >K_CSS_VALUE_CORNER)
|
|
return _gtk_css_number_value_get (corner, one_hundred_percent);
|
|
|
|
g_return_val_if_fail (corner != NULL, 0.0);
|
|
g_return_val_if_fail (corner->class == >K_CSS_VALUE_CORNER, 0.0);
|
|
|
|
return _gtk_css_number_value_get (corner->x, one_hundred_percent);
|
|
}
|
|
|
|
double
|
|
_gtk_css_corner_value_get_y (const GtkCssValue *corner,
|
|
double one_hundred_percent)
|
|
{
|
|
if (corner->class != >K_CSS_VALUE_CORNER)
|
|
return _gtk_css_number_value_get (corner, one_hundred_percent);
|
|
|
|
g_return_val_if_fail (corner != NULL, 0.0);
|
|
g_return_val_if_fail (corner->class == >K_CSS_VALUE_CORNER, 0.0);
|
|
|
|
return _gtk_css_number_value_get (corner->y, one_hundred_percent);
|
|
}
|
|
|