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

cssimagebuiltin: Remove unused variables

Browse Source
This commit is contained in:
Benjamin Otte 2016-05-02 19:51:41 +02:00
parent 2c2c60827e
commit b049b3de25
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkcssimagebuiltin.c
View File

@ -778,27 +778,11 @@ gtk_css_image_builtin_compute (GtkCssImage *image,
GtkCssStyle *parent_style) GtkCssStyle *parent_style)
{ {
GtkCssImageBuiltin *result; GtkCssImageBuiltin *result;
GtkBorderStyle border_style;
result = g_object_new (GTK_TYPE_CSS_IMAGE_BUILTIN, NULL); result = g_object_new (GTK_TYPE_CSS_IMAGE_BUILTIN, NULL);
border_style = _gtk_css_border_style_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
if (border_style == GTK_BORDER_STYLE_SOLID)
{
GtkBorder border;
border.top = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
border.right = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
border.bottom = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
border.left = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
result->border_width = MIN (MIN (border.top, border.bottom),
MIN (border.left, border.right));
}
result->fg_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR)); result->fg_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR));
result->bg_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BACKGROUND_COLOR)); result->bg_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BACKGROUND_COLOR));
result->border_color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_COLOR));
return GTK_CSS_IMAGE (result); return GTK_CSS_IMAGE (result);
} }
@ -811,9 +795,7 @@ gtk_css_image_builtin_equal (GtkCssImage *image1,
GtkCssImageBuiltin *builtin2 = GTK_CSS_IMAGE_BUILTIN (image2); GtkCssImageBuiltin *builtin2 = GTK_CSS_IMAGE_BUILTIN (image2);
return gdk_rgba_equal (&builtin1->fg_color, &builtin2->fg_color) return gdk_rgba_equal (&builtin1->fg_color, &builtin2->fg_color)
&& gdk_rgba_equal (&builtin1->bg_color, &builtin2->bg_color) && gdk_rgba_equal (&builtin1->bg_color, &builtin2->bg_color);
&& gdk_rgba_equal (&builtin1->border_color, &builtin2->border_color)
&& builtin1->border_width == builtin2->border_width;
} }
static void static void

2
gtk/gtkcssimagebuiltinprivate.h
View File

@ -41,8 +41,6 @@ struct _GtkCssImageBuiltin
GdkRGBA fg_color; GdkRGBA fg_color;
GdkRGBA bg_color; GdkRGBA bg_color;
GdkRGBA border_color;
int border_width;
}; };
struct _GtkCssImageBuiltinClass struct _GtkCssImageBuiltinClass