Draw radio buttons more symmetric. Draw shadow out bevels slightly

Wed Sep 11 12:33:34 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
	out bevels slightly different. Fix drawing of top right corner of
	etched in shadows.
This commit is contained in:
Soeren Sandmann 2002-09-11 10:40:57 +00:00 committed by Søren Sandmann Pedersen
parent 2589ff07b3
commit 429409d40f
9 changed files with 52 additions and 15 deletions

View File

@ -1,3 +1,9 @@
Wed Sep 11 12:33:34 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
out bevels slightly different. Fix drawing of top right corner of
etched in shadows.
Tue Sep 10 09:47:52 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c

View File

@ -1,3 +1,9 @@
Wed Sep 11 12:33:34 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
out bevels slightly different. Fix drawing of top right corner of
etched in shadows.
Tue Sep 10 09:47:52 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c

View File

@ -1,3 +1,9 @@
Wed Sep 11 12:33:34 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
out bevels slightly different. Fix drawing of top right corner of
etched in shadows.
Tue Sep 10 09:47:52 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c

View File

@ -1,3 +1,9 @@
Wed Sep 11 12:33:34 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
out bevels slightly different. Fix drawing of top right corner of
etched in shadows.
Tue Sep 10 09:47:52 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c

View File

@ -1,3 +1,9 @@
Wed Sep 11 12:33:34 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
out bevels slightly different. Fix drawing of top right corner of
etched in shadows.
Tue Sep 10 09:47:52 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c

View File

@ -1,3 +1,9 @@
Wed Sep 11 12:33:34 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow
out bevels slightly different. Fix drawing of top right corner of
etched in shadows.
Tue Sep 10 09:47:52 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c

View File

@ -378,20 +378,20 @@ static guchar check_inconsistent_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
/*
* Extracted from radio-13-ssp.png, width=13, height=13
* Extracted from radio-13.png, width=13, height=13
*/
static guchar radio_black_bits[] = {
0x00,0x00,0xf0,0x01,0x0c,0x02,0x04,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x08};
static guchar radio_dark_bits[] = {
0xf0,0x00,0x0c,0x02,0x02,0x04,0x02,0x04,0x01,0x08,0x01,0x08,0x01,0x08,0x01,
0x08,0x00,0x04,0x02,0x04,0x0c,0x03,0xf0,0x00,0x00,0x00,0x00,0x00};
0x08,0x00,0x08,0x02,0x04,0x0c,0x06,0xf0,0x01,0x00,0x00,0x00,0x00};
static guchar radio_mid_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static guchar radio_light_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x03,0xf0,0x00,0x00,0x00};
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x06,0xe0,0x01,0x00,0x00};
static guchar radio_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0xf0,0x01,0xf0,0x01,0xf0,
0x01,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@ -400,9 +400,10 @@ static guchar radio_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static guchar radio_base_bits[] = {
0x00,0x00,0x00,0x00,0xf0,0x01,0xf8,0x03,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
0x07,0xfc,0x03,0xf8,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
0x07,0xfc,0x07,0xf8,0x03,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0x00};
/*
* Extracted from radio-13-inconsistent-ssp.png, width=13, height=13
* Extracted from radio-13.png, width=13, height=13
*/
static guchar radio_inconsistent_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,
@ -2240,9 +2241,9 @@ draw_thin_shadow (GtkStyle *style,
x + width - 1, y, x + width - 1, y + height - 1);
gdk_draw_line (window, gc2,
x, y, x + width - 1, y);
x, y, x + width - 2, y);
gdk_draw_line (window, gc2,
x, y, x, y + height - 1);
x, y, x, y + height - 2);
if (area)
{
@ -2541,17 +2542,17 @@ gtk_default_draw_shadow (GtkStyle *style,
if (style->ythickness > 0)
gdk_draw_line (window, gc2,
x, y, x + width - 1, y);
x, y, x + width - 2, y);
if (style->xthickness > 0)
gdk_draw_line (window, gc2,
x, y, x, y + height - 1);
x, y, x, y + height - 2);
if (style->ythickness > 1)
gdk_draw_line (window, style->bg_gc[state_type],
x + 1, y + 1, x + width - 2, y + 1);
x + 1, y + 1, x + width - 3, y + 1);
if (style->xthickness > 1)
gdk_draw_line (window, style->bg_gc[state_type],
x + 1, y + 1, x + 1, y + height - 2);
x + 1, y + 1, x + 1, y + height - 3);
break;
case GTK_SHADOW_ETCHED_IN:
@ -2629,7 +2630,7 @@ gtk_default_draw_shadow (GtkStyle *style,
gdk_draw_line (window, gc1,
x + thickness_dark + i,
y + thickness_dark + i,
x + width - thickness_dark - i - 1,
x + width - thickness_dark - i - 2,
y + thickness_dark + i);
gdk_draw_line (window, gc2,
@ -3326,7 +3327,7 @@ get_darkened_gc (GdkWindow *window,
src = shaded;
--darken_count;
}
gdk_gc_set_rgb_fg_color (gc, &shaded);
return gc;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 317 B