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

render: Extend builtin images to account for states

Browse Source 
We add to the enum to account for the images generated for different
states.
This commit is contained in:
Benjamin Otte
2015-01-19 04:27:31 +01:00
parent 1c3dd5d46b
commit e6b228f12a
3 changed files with 126 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
gtk/gtkcssimagebuiltin.c
View File

@ -37,7 +37,8 @@ gtk_css_image_builtin_draw_check (GtkCssImage *image,
cairo_t *cr, cairo_t *cr,
double width, double width,
double height, double height,
GtkStateFlags state, gboolean checked,
gboolean inconsistent,
const GdkRGBA * fg_color, const GdkRGBA * fg_color,
const GdkRGBA * bg_color, const GdkRGBA * bg_color,
const GdkRGBA * border_color, const GdkRGBA * border_color,
@ -78,7 +79,7 @@ gtk_css_image_builtin_draw_check (GtkCssImage *image,
gdk_cairo_set_source_rgba (cr, fg_color); gdk_cairo_set_source_rgba (cr, fg_color);
if (state & GTK_STATE_FLAG_INCONSISTENT) if (inconsistent)
{ {
int line_thickness = MAX (1, (3 + interior_size * 2) / 7); int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
@ -91,7 +92,7 @@ gtk_css_image_builtin_draw_check (GtkCssImage *image,
} }
else else
{ {
if (state & GTK_STATE_FLAG_CHECKED) if (checked)
{ {
cairo_translate (cr, cairo_translate (cr,
x + pad, y + pad); x + pad, y + pad);
@ -130,7 +131,8 @@ gtk_css_image_builtin_draw_option (GtkCssImage *image,
cairo_t *cr, cairo_t *cr,
double width, double width,
double height, double height,
GtkStateFlags state, gboolean checked,
gboolean inconsistent,
const GdkRGBA * fg_color, const GdkRGBA * fg_color,
const GdkRGBA * bg_color, const GdkRGBA * bg_color,
const GdkRGBA * border_color, const GdkRGBA * border_color,
@ -169,7 +171,7 @@ gtk_css_image_builtin_draw_option (GtkCssImage *image,
/* FIXME: thickness */ /* FIXME: thickness */
thickness = 1; thickness = 1;
if (state & GTK_STATE_FLAG_INCONSISTENT) if (inconsistent)
{ {
gint line_thickness; gint line_thickness;
@ -191,7 +193,7 @@ gtk_css_image_builtin_draw_option (GtkCssImage *image,
line_thickness); line_thickness);
cairo_fill (cr); cairo_fill (cr);
} }
if (state & GTK_STATE_FLAG_CHECKED) if (checked)
{ {
pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9); pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
interior_size = MAX (1, exterior_size - 2 * pad); interior_size = MAX (1, exterior_size - 2 * pad);
@ -248,8 +250,9 @@ gtk_css_image_builtin_draw_expander (GtkCssImage *image,
cairo_t *cr, cairo_t *cr,
double width, double width,
double height, double height,
GtkStateFlags state, gboolean horizontal,
GtkCssImageBuiltinType image_type, gboolean is_rtl,
gboolean expanded,
const GdkRGBA * fg_color, const GdkRGBA * fg_color,
const GdkRGBA * border_color) const GdkRGBA * border_color)
{ {
@ -262,14 +265,12 @@ gtk_css_image_builtin_draw_expander (GtkCssImage *image,
double x_double, y_double; double x_double, y_double;
gdouble angle; gdouble angle;
gint line_width; gint line_width;
gboolean is_rtl;
gdouble progress; gdouble progress;
is_rtl = (state & GTK_STATE_FLAG_DIR_RTL);
line_width = 1; line_width = 1;
progress = (state & GTK_STATE_FLAG_CHECKED) ? 1 : 0; progress = expanded ? 1 : 0;
if (image_type != GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL) if (!horizontal)
{ {
if (is_rtl) if (is_rtl)
angle = (G_PI) - ((G_PI / 2) * progress); angle = (G_PI) - ((G_PI / 2) * progress);
@ -844,7 +845,6 @@ gtk_css_image_builtin_draw (GtkCssImage *image,
double width, double width,
double height, double height,
GtkCssImageBuiltinType image_type, GtkCssImageBuiltinType image_type,
GtkStateFlags state,
GtkJunctionSides sides, GtkJunctionSides sides,
const GdkRGBA * fg_color, const GdkRGBA * fg_color,
const GdkRGBA * bg_color, const GdkRGBA * bg_color,
@ -859,16 +859,22 @@ gtk_css_image_builtin_draw (GtkCssImage *image,
case GTK_CSS_IMAGE_BUILTIN_NONE: case GTK_CSS_IMAGE_BUILTIN_NONE:
break; break;
case GTK_CSS_IMAGE_BUILTIN_CHECK: case GTK_CSS_IMAGE_BUILTIN_CHECK:
case GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED:
case GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT:
gtk_css_image_builtin_draw_check (image, cr, gtk_css_image_builtin_draw_check (image, cr,
width, height, width, height,
state, image_type == GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
image_type == GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
fg_color, bg_color, fg_color, bg_color,
border_color, border_width); border_color, border_width);
break; break;
case GTK_CSS_IMAGE_BUILTIN_OPTION: case GTK_CSS_IMAGE_BUILTIN_OPTION:
case GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED:
case GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT:
gtk_css_image_builtin_draw_option (image, cr, gtk_css_image_builtin_draw_option (image, cr,
width, height, width, height,
state, image_type == GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
image_type == GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
fg_color, bg_color, fg_color, bg_color,
border_color, border_width); border_color, border_width);
break; break;
@ -877,12 +883,52 @@ gtk_css_image_builtin_draw (GtkCssImage *image,
width, height, width, height,
fg_color); fg_color);
break; break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL: case GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT:
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL:
gtk_css_image_builtin_draw_expander (image, cr, gtk_css_image_builtin_draw_expander (image, cr,
width, height, width, height,
state, TRUE, FALSE, FALSE,
image_type, fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
FALSE, FALSE, FALSE,
fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
TRUE, TRUE, FALSE,
fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
FALSE, TRUE, FALSE,
fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
TRUE, FALSE, TRUE,
fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
FALSE, FALSE, TRUE,
fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
TRUE, TRUE, TRUE,
fg_color, border_color);
break;
case GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED:
gtk_css_image_builtin_draw_expander (image, cr,
width, height,
FALSE, TRUE, TRUE,
fg_color, border_color); fg_color, border_color);
break; break;
case GTK_CSS_IMAGE_BUILTIN_GRIP: case GTK_CSS_IMAGE_BUILTIN_GRIP:

15
gtk/gtkcssimagebuiltinprivate.h
View File

@ -28,10 +28,20 @@ G_BEGIN_DECLS
typedef enum { typedef enum {
GTK_CSS_IMAGE_BUILTIN_NONE, GTK_CSS_IMAGE_BUILTIN_NONE,
GTK_CSS_IMAGE_BUILTIN_CHECK, GTK_CSS_IMAGE_BUILTIN_CHECK,
GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
GTK_CSS_IMAGE_BUILTIN_OPTION, GTK_CSS_IMAGE_BUILTIN_OPTION,
GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
GTK_CSS_IMAGE_BUILTIN_ARROW, GTK_CSS_IMAGE_BUILTIN_ARROW,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL, GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL, GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED,
GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED,
GTK_CSS_IMAGE_BUILTIN_GRIP, GTK_CSS_IMAGE_BUILTIN_GRIP,
GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR, GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR,
GTK_CSS_IMAGE_BUILTIN_HANDLE, GTK_CSS_IMAGE_BUILTIN_HANDLE,
@ -67,7 +77,6 @@ void gtk_css_image_builtin_draw (GtkCssImage
double width, double width,
double height, double height,
GtkCssImageBuiltinType image_type, GtkCssImageBuiltinType image_type,
GtkStateFlags state,
GtkJunctionSides sides, GtkJunctionSides sides,
const GdkRGBA *fg_color, const GdkRGBA *fg_color,
const GdkRGBA *bg_color, const GdkRGBA *bg_color,

60
gtk/gtkrender.c
View File

@ -95,8 +95,18 @@ gtk_do_render_check (GtkStyleContext *context,
gdouble height) gdouble height)
{ {
GtkBorderStyle border_style; GtkBorderStyle border_style;
GtkStateFlags state;
GtkCssImageBuiltinType image_type;
gint border_width; gint border_width;
state = gtk_style_context_get_state (context);
if (state & GTK_STATE_FLAG_INCONSISTENT)
image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT;
else if (state & GTK_STATE_FLAG_CHECKED)
image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED;
else
image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
if (render_icon_image (context, cr, x, y, width, height)) if (render_icon_image (context, cr, x, y, width, height))
return; return;
@ -123,8 +133,7 @@ gtk_do_render_check (GtkStyleContext *context,
gtk_css_image_builtin_draw (_gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)), gtk_css_image_builtin_draw (_gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)),
cr, cr,
width, height, width, height,
GTK_CSS_IMAGE_BUILTIN_OPTION, image_type,
gtk_style_context_get_state (context),
gtk_style_context_get_junction_sides (context), gtk_style_context_get_junction_sides (context),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)),
@ -184,8 +193,18 @@ gtk_do_render_option (GtkStyleContext *context,
gdouble height) gdouble height)
{ {
GtkBorderStyle border_style; GtkBorderStyle border_style;
GtkStateFlags state;
GtkCssImageBuiltinType image_type;
gint border_width; gint border_width;
state = gtk_style_context_get_state (context);
if (state & GTK_STATE_FLAG_INCONSISTENT)
image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT;
else if (state & GTK_STATE_FLAG_CHECKED)
image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED;
else
image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
if (render_icon_image (context, cr, x, y, width, height)) if (render_icon_image (context, cr, x, y, width, height))
return; return;
@ -212,8 +231,7 @@ gtk_do_render_option (GtkStyleContext *context,
gtk_css_image_builtin_draw (_gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)), gtk_css_image_builtin_draw (_gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)),
cr, cr,
width, height, width, height,
GTK_CSS_IMAGE_BUILTIN_CHECK, image_type,
gtk_style_context_get_state (context),
gtk_style_context_get_junction_sides (context), gtk_style_context_get_junction_sides (context),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)),
@ -302,7 +320,6 @@ gtk_do_render_arrow (GtkStyleContext *context,
cr, cr,
size, size, size, size,
GTK_CSS_IMAGE_BUILTIN_ARROW, GTK_CSS_IMAGE_BUILTIN_ARROW,
gtk_style_context_get_state (context),
gtk_style_context_get_junction_sides (context), gtk_style_context_get_junction_sides (context),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)),
@ -449,8 +466,34 @@ gtk_do_render_expander (GtkStyleContext *context,
gdouble height) gdouble height)
{ {
GtkBorderStyle border_style; GtkBorderStyle border_style;
GtkCssImageBuiltinType image_type;
GtkStateFlags state;
gint border_width; gint border_width;
state = gtk_style_context_get_state (context);
if (gtk_style_context_has_class (context, "horizontal"))
{
if (state & GTK_STATE_FLAG_DIR_RTL)
image_type = (state & GTK_STATE_FLAG_CHECKED)
? GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED
: GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT;
else
image_type = (state & GTK_STATE_FLAG_CHECKED)
? GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED
: GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT;
}
else
{
if (state & GTK_STATE_FLAG_DIR_RTL)
image_type = (state & GTK_STATE_FLAG_CHECKED)
? GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED
: GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT;
else
image_type = (state & GTK_STATE_FLAG_CHECKED)
? GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED
: GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT;
}
if (render_icon_image (context, cr, x, y, width, height)) if (render_icon_image (context, cr, x, y, width, height))
return; return;
@ -477,10 +520,7 @@ gtk_do_render_expander (GtkStyleContext *context,
gtk_css_image_builtin_draw (_gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)), gtk_css_image_builtin_draw (_gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE)),
cr, cr,
width, height, width, height,
gtk_style_context_has_class (context, "horizontal") image_type,
? GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL
: GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL,
gtk_style_context_get_state (context),
gtk_style_context_get_junction_sides (context), gtk_style_context_get_junction_sides (context),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)),
@ -1075,7 +1115,6 @@ gtk_do_render_handle (GtkStyleContext *context,
cr, cr,
width, height, width, height,
type, type,
gtk_style_context_get_state (context),
gtk_style_context_get_junction_sides (context), gtk_style_context_get_junction_sides (context),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)),
@ -1212,7 +1251,6 @@ gtk_do_render_activity (GtkStyleContext *context,
cr, cr,
width, height, width, height,
GTK_CSS_IMAGE_BUILTIN_SPINNER, GTK_CSS_IMAGE_BUILTIN_SPINNER,
gtk_style_context_get_state (context),
gtk_style_context_get_junction_sides (context), gtk_style_context_get_junction_sides (context),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR)),
_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)), _gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)),