themingengine: Draw fradctional border sizes

This commit is contained in:
Benjamin Otte 2012-10-27 03:16:35 +02:00
parent 1e08fe8646
commit fd73c1f8d9
3 changed files with 80 additions and 100 deletions

View File

@ -62,8 +62,8 @@ static void
gtk_border_image_compute_border_size (GtkBorderImageSliceSize sizes[3],
double offset,
double area_size,
int start_border_width,
int end_border_width,
double start_border_width,
double end_border_width,
const GtkCssValue *start_border,
const GtkCssValue *end_border)
{
@ -235,7 +235,7 @@ gtk_border_image_compute_slice_size (GtkBorderImageSliceSize sizes[3],
void
_gtk_border_image_render (GtkBorderImage *image,
GtkBorder *border_width,
const double border_width[4],
cairo_t *cr,
gdouble x,
gdouble y,
@ -270,15 +270,15 @@ _gtk_border_image_render (GtkBorderImage *image,
gtk_border_image_compute_border_size (horizontal_border,
x,
width,
border_width->left,
border_width->right,
border_width[GTK_CSS_LEFT],
border_width[GTK_CSS_RIGHT],
_gtk_css_border_value_get_left (image->width),
_gtk_css_border_value_get_right (image->width));
gtk_border_image_compute_border_size (vertical_border,
y,
height,
border_width->top,
border_width->bottom,
border_width[GTK_CSS_TOP],
border_width[GTK_CSS_BOTTOM],
_gtk_css_border_value_get_top (image->width),
_gtk_css_border_value_get_bottom(image->width));

View File

@ -43,7 +43,7 @@ gboolean _gtk_border_image_init (GtkBorderImage *imag
GtkThemingEngine *engine);
void _gtk_border_image_render (GtkBorderImage *image,
GtkBorder *border_width,
const double border_width[4],
cairo_t *cr,
gdouble x,
gdouble y,

View File

@ -1368,23 +1368,25 @@ gtk_theming_engine_render_background (GtkThemingEngine *engine,
}
static void
gtk_theming_engine_hide_border_sides (GtkBorder *border,
guint hidden_side)
gtk_theming_engine_hide_border_sides (double border[4],
GtkBorderStyle border_style[4],
guint hidden_side)
{
if (hidden_side & (1 << GTK_CSS_TOP))
border->top = 0;
if (hidden_side & (1 << GTK_CSS_RIGHT))
border->right = 0;
if (hidden_side & (1 << GTK_CSS_BOTTOM))
border->bottom = 0;
if (hidden_side & (1 << GTK_CSS_LEFT))
border->left = 0;
guint i;
for (i = 0; i < 4; i++)
{
if (hidden_side & (1 << i) ||
border_style[i] == GTK_BORDER_STYLE_NONE ||
border_style[i] == GTK_BORDER_STYLE_HIDDEN)
border[i] = 0;
}
}
static void
render_frame_fill (cairo_t *cr,
GtkRoundedBox *border_box,
GtkBorder *border,
const double border_width[4],
GdkRGBA colors[4],
guint hidden_side)
{
@ -1392,7 +1394,11 @@ render_frame_fill (cairo_t *cr,
guint i, j;
padding_box = *border_box;
_gtk_rounded_box_shrink (&padding_box, border->top, border->right, border->bottom, border->left);
_gtk_rounded_box_shrink (&padding_box,
border_width[GTK_CSS_TOP],
border_width[GTK_CSS_RIGHT],
border_width[GTK_CSS_BOTTOM],
border_width[GTK_CSS_LEFT]);
if (hidden_side == 0 &&
gdk_rgba_equal (&colors[0], &colors[1]) &&
@ -1492,30 +1498,10 @@ set_stroke_style (cairo_t *cr,
}
}
static int
get_border_side (GtkBorder *border,
GtkCssSide side)
{
switch (side)
{
case GTK_CSS_TOP:
return border->top;
case GTK_CSS_RIGHT:
return border->right;
case GTK_CSS_BOTTOM:
return border->bottom;
case GTK_CSS_LEFT:
return border->left;
default:
g_assert_not_reached ();
return 0;
}
}
static void
render_frame_stroke (cairo_t *cr,
GtkRoundedBox *border_box,
GtkBorder *border,
const double border_width[4],
GdkRGBA colors[4],
guint hidden_side,
GtkBorderStyle stroke_style)
@ -1527,16 +1513,16 @@ render_frame_stroke (cairo_t *cr,
different_colors = !gdk_rgba_equal (&colors[0], &colors[1]) ||
!gdk_rgba_equal (&colors[0], &colors[2]) ||
!gdk_rgba_equal (&colors[0], &colors[3]);
different_borders = border->top != border->right ||
border->top != border->bottom ||
border->top != border->left;
different_borders = border_width[0] != border_width[1] ||
border_width[0] != border_width[2] ||
border_width[0] != border_width[3] ;
stroke_box = *border_box;
_gtk_rounded_box_shrink (&stroke_box,
border->top / 2.0,
border->right / 2.0,
border->bottom / 2.0,
border->left / 2.0);
border_width[GTK_CSS_TOP] / 2.0,
border_width[GTK_CSS_RIGHT] / 2.0,
border_width[GTK_CSS_BOTTOM] / 2.0,
border_width[GTK_CSS_LEFT] / 2.0);
if (!different_colors && !different_borders && hidden_side == 0)
{
@ -1551,7 +1537,7 @@ render_frame_stroke (cairo_t *cr,
}
gdk_cairo_set_source_rgba (cr, &colors[0]);
set_stroke_style (cr, border->top, stroke_style, length);
set_stroke_style (cr, border_width[0], stroke_style, length);
cairo_stroke (cr);
}
else
@ -1561,10 +1547,10 @@ render_frame_stroke (cairo_t *cr,
padding_box = *border_box;
_gtk_rounded_box_path (&padding_box, cr);
_gtk_rounded_box_shrink (&padding_box,
border->top,
border->right,
border->bottom,
border->left);
border_width[GTK_CSS_TOP],
border_width[GTK_CSS_RIGHT],
border_width[GTK_CSS_BOTTOM],
border_width[GTK_CSS_LEFT]);
for (i = 0; i < 4; i++)
{
@ -1587,7 +1573,7 @@ render_frame_stroke (cairo_t *cr,
gdk_cairo_set_source_rgba (cr, &colors[i]);
set_stroke_style (cr,
get_border_side (border, i),
border_width[i],
stroke_style,
_gtk_rounded_box_guess_length (&stroke_box, i));
cairo_stroke (cr);
@ -1600,7 +1586,7 @@ render_frame_stroke (cairo_t *cr,
static void
render_border (cairo_t *cr,
GtkRoundedBox *border_box,
GtkBorder *border,
const double border_width[4],
guint hidden_side,
GdkRGBA colors[4],
GtkBorderStyle border_style[4])
@ -1643,13 +1629,13 @@ render_border (cairo_t *cr,
dont_draw |= (1 << j);
}
render_frame_stroke (cr, border_box, border, colors, dont_draw, border_style[i]);
render_frame_stroke (cr, border_box, border_width, colors, dont_draw, border_style[i]);
}
break;
case GTK_BORDER_STYLE_DOUBLE:
{
GtkRoundedBox other_box;
GtkBorder other_border;
double other_border[4];
guint dont_draw = hidden_side;
for (j = 0; j < 4; j++)
@ -1658,21 +1644,19 @@ render_border (cairo_t *cr,
hidden_side |= (1 << j);
else
dont_draw |= (1 << j);
other_border[i] = border_width[i] / 3;
}
other_border.top = (border->top + 2) / 3;
other_border.right = (border->right + 2) / 3;
other_border.bottom = (border->bottom + 2) / 3;
other_border.left = (border->left + 2) / 3;
render_frame_fill (cr, border_box, &other_border, colors, dont_draw);
render_frame_fill (cr, border_box, other_border, colors, dont_draw);
other_box = *border_box;
_gtk_rounded_box_shrink (&other_box,
border->top - other_border.top,
border->right - other_border.right,
border->bottom - other_border.bottom,
border->left - other_border.left);
render_frame_fill (cr, &other_box, &other_border, colors, dont_draw);
2 * other_border[GTK_CSS_TOP],
2 * other_border[GTK_CSS_RIGHT],
2 * other_border[GTK_CSS_BOTTOM],
2 * other_border[GTK_CSS_LEFT]);
render_frame_fill (cr, &other_box, other_border, colors, dont_draw);
}
case GTK_BORDER_STYLE_GROOVE:
case GTK_BORDER_STYLE_RIDGE:
@ -1680,7 +1664,7 @@ render_border (cairo_t *cr,
GtkRoundedBox other_box;
GdkRGBA other_colors[4];
guint dont_draw = hidden_side;
GtkBorder other_border;
double other_border[4];
for (j = 0; j < 4; j++)
{
@ -1694,23 +1678,18 @@ render_border (cairo_t *cr,
hidden_side |= (1 << j);
else
dont_draw |= (1 << j);
other_border[i] = border_width[i] / 2;
}
other_border.top = border->top / 2;
other_border.right = border->right / 2;
other_border.bottom = border->bottom / 2;
other_border.left = border->left / 2;
render_frame_fill (cr, border_box, &other_border, colors, dont_draw);
render_frame_fill (cr, border_box, other_border, colors, dont_draw);
other_box = *border_box;
_gtk_rounded_box_shrink (&other_box,
other_border.top, other_border.right,
other_border.bottom, other_border.left);
other_border.top = border->top - other_border.top;
other_border.right = border->right - other_border.right;
other_border.bottom = border->bottom - other_border.bottom;
other_border.left = border->left - other_border.left;
render_frame_fill (cr, &other_box, &other_border, other_colors, dont_draw);
other_border[GTK_CSS_TOP],
other_border[GTK_CSS_RIGHT],
other_border[GTK_CSS_BOTTOM],
other_border[GTK_CSS_LEFT]);
render_frame_fill (cr, &other_box, other_border, other_colors, dont_draw);
}
break;
default:
@ -1719,7 +1698,7 @@ render_border (cairo_t *cr,
}
}
render_frame_fill (cr, border_box, border, colors, hidden_side);
render_frame_fill (cr, border_box, border_width, colors, hidden_side);
cairo_restore (cr);
}
@ -1735,26 +1714,27 @@ render_frame_internal (GtkThemingEngine *engine,
GtkJunctionSides junction)
{
GtkBorderImage border_image;
GtkStateFlags state;
GtkBorderStyle border_style[4];
GtkRoundedBox border_box;
GtkBorder border;
double border_width[4];
GdkRGBA colors[4];
state = gtk_theming_engine_get_state (engine);
border_width[0] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
border_width[1] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
border_width[2] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
border_width[3] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
gtk_theming_engine_get_border (engine, state, &border);
gtk_theming_engine_hide_border_sides (&border, hidden_side);
border_style[0] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
border_style[1] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE));
border_style[2] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE));
border_style[3] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_LEFT_STYLE));
gtk_theming_engine_hide_border_sides (border_width, border_style, hidden_side);
if (_gtk_border_image_init (&border_image, engine))
_gtk_border_image_render (&border_image, &border, cr, x, y, width, height);
_gtk_border_image_render (&border_image, border_width, cr, x, y, width, height);
else
{
border_style[0] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
border_style[1] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE));
border_style[2] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE));
border_style[3] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_LEFT_STYLE));
colors[0] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_COLOR));
colors[1] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR));
colors[2] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR));
@ -1763,7 +1743,7 @@ render_frame_internal (GtkThemingEngine *engine,
_gtk_rounded_box_init_rect (&border_box, x, y, width, height);
_gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, junction);
render_border (cr, &border_box, &border, hidden_side, colors, border_style);
render_border (cr, &border_box, border_width, hidden_side, colors, border_style);
}
border_style[0] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_STYLE));
@ -1772,8 +1752,8 @@ render_frame_internal (GtkThemingEngine *engine,
int offset;
border_style[1] = border_style[2] = border_style[3] = border_style[0];
border.top = round (_gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_WIDTH), 100));
border.left = border.right = border.bottom = border.top;
border_width[0] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_WIDTH), 100);
border_width[3] = border_width[2] = border_width[1] = border_width[0];
colors[0] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_COLOR));
colors[3] = colors[2] = colors[1] = colors[0];
offset = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_OFFSET), 100);
@ -1781,12 +1761,12 @@ render_frame_internal (GtkThemingEngine *engine,
/* reinit box here - outlines don't have a border radius */
_gtk_rounded_box_init_rect (&border_box, x, y, width, height);
_gtk_rounded_box_shrink (&border_box,
- border.top - offset,
- border.right - offset,
- border.left - offset,
- border.bottom - offset);
- border_width[GTK_CSS_TOP] - offset,
- border_width[GTK_CSS_RIGHT] - offset,
- border_width[GTK_CSS_LEFT] - offset,
- border_width[GTK_CSS_BOTTOM] - offset);
render_border (cr, &border_box, &border, hidden_side, colors, border_style);
render_border (cr, &border_box, border_width, hidden_side, colors, border_style);
}
}