AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Try to handle the situation that the borders are larger than the area we

Browse Source 
2005-06-12  Matthias Clasen  <mclasen@redhat.com>

	* pixbuf-render.c (theme_pixbuf_render): Try to
	handle the situation that the borders are larger
	than the area we are rendering.  (#169731,
	Benjamin Otte)
This commit is contained in:
Matthias Clasen 2005-06-12 06:04:40 +00:00 committed by Matthias Clasen
parent 411241fb26
commit 3febaff1e4
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/engines/pixbuf/ChangeLog
View File

@ -1,3 +1,10 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com>
* pixbuf-render.c (theme_pixbuf_render): Try to
handle the situation that the borders are larger
than the area we are rendering. (#169731,
Benjamin Otte)
2005-01-08 Matthias Clasen <mclasen@redhat.com> 2005-01-08 Matthias Clasen <mclasen@redhat.com>
* === Released 2.6.1 === * === Released 2.6.1 ===

18
modules/engines/pixbuf/pixbuf-render.c
View File

@ -696,6 +696,9 @@ theme_pixbuf_render (ThemePixbuf *theme_pb,
if (theme_pb->stretch) if (theme_pb->stretch)
{ {
if (component_mask & COMPONENT_ALL)
component_mask = (COMPONENT_ALL - 1) & ~component_mask;
src_x[0] = 0; src_x[0] = 0;
src_x[1] = theme_pb->border_left; src_x[1] = theme_pb->border_left;
src_x[2] = pixbuf_width - theme_pb->border_right; src_x[2] = pixbuf_width - theme_pb->border_right;
@ -711,13 +714,24 @@ theme_pixbuf_render (ThemePixbuf *theme_pb,
dest_x[2] = x + width - theme_pb->border_right; dest_x[2] = x + width - theme_pb->border_right;
dest_x[3] = x + width; dest_x[3] = x + width;
if (dest_x[1] > dest_x[2])
{
component_mask &= ~(COMPONENT_NORTH | COMPONENT_SOUTH | COMPONENT_CENTER);
dest_x[1] = dest_x[2] = (dest_x[1] + dest_x[2]) / 2;
}
dest_y[0] = y; dest_y[0] = y;
dest_y[1] = y + theme_pb->border_top; dest_y[1] = y + theme_pb->border_top;
dest_y[2] = y + height - theme_pb->border_bottom; dest_y[2] = y + height - theme_pb->border_bottom;
dest_y[3] = y + height; dest_y[3] = y + height;
if (component_mask & COMPONENT_ALL) if (dest_y[1] > dest_y[2])
component_mask = (COMPONENT_ALL - 1) & ~component_mask; {
component_mask &= ~(COMPONENT_EAST | COMPONENT_WEST | COMPONENT_CENTER);
dest_y[1] = dest_y[2] = (dest_y[1] + dest_y[2]) / 2;
}
#define RENDER_COMPONENT(X1,X2,Y1,Y2) \ #define RENDER_COMPONENT(X1,X2,Y1,Y2) \
pixbuf_render (pixbuf, theme_pb->hints[Y1][X1], window, mask, clip_rect, \ pixbuf_render (pixbuf, theme_pb->hints[Y1][X1], window, mask, clip_rect, \