From 429409d40f2072be84d41088f1828840480d92c4 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Wed, 11 Sep 2002 10:40:57 +0000 Subject: [PATCH] Draw radio buttons more symmetric. Draw shadow out bevels slightly Wed Sep 11 12:33:34 2002 Soeren Sandmann * gtk/gtkstyle.c: Draw radio buttons more symmetric. Draw shadow out bevels slightly different. Fix drawing of top right corner of etched in shadows. --- ChangeLog | 6 +++++ ChangeLog.pre-2-10 | 6 +++++ ChangeLog.pre-2-2 | 6 +++++ ChangeLog.pre-2-4 | 6 +++++ ChangeLog.pre-2-6 | 6 +++++ ChangeLog.pre-2-8 | 6 +++++ gtk/gtkstyle.c | 31 ++++++++++++----------- gtk/theme-bits/radio-13-inconsistent.png | Bin 326 -> 335 bytes gtk/theme-bits/radio-13.png | Bin 287 -> 317 bytes 9 files changed, 52 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8df433ee8..0b0587810b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 11 12:33:34 2002 Soeren Sandmann + + * 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 * modules/input/gtkimcontextxim.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a8df433ee8..0b0587810b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Sep 11 12:33:34 2002 Soeren Sandmann + + * 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 * modules/input/gtkimcontextxim.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a8df433ee8..0b0587810b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Sep 11 12:33:34 2002 Soeren Sandmann + + * 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 * modules/input/gtkimcontextxim.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a8df433ee8..0b0587810b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Sep 11 12:33:34 2002 Soeren Sandmann + + * 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 * modules/input/gtkimcontextxim.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a8df433ee8..0b0587810b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Sep 11 12:33:34 2002 Soeren Sandmann + + * 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 * modules/input/gtkimcontextxim.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a8df433ee8..0b0587810b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Sep 11 12:33:34 2002 Soeren Sandmann + + * 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 * modules/input/gtkimcontextxim.c diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index a0847c63db..0902f37586 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -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; diff --git a/gtk/theme-bits/radio-13-inconsistent.png b/gtk/theme-bits/radio-13-inconsistent.png index b049432b5119faf2c9c210fda4cbd3f79c61cebe..f8fa57edc7af3b4d8fb0dbba2a1e7f3188f1cbe2 100644 GIT binary patch delta 302 zcmV+}0nz@(0?z`FDu0{+nE;gN6{So7000SaNLh0L01FQQ01FQRlKBIr00007bV*G` z2hs=-76=B)TKgpc007)cL_t(|oOO{g4uU`sMgJlPFviBlP}10#pjqi?DXmECP2BDA z2++@R1ur16Akq;_T1zjWSI}a01;Jm<{C$}}lVt!%5%>7qn}2T@6A5@+t+y%KV#o8{ zG`H)))Q%f9IlD8v)Wp{F4QM6fxGb8~~NoVkh$QVF7U5 zh!m-;?n0*i`zLPz#7+Rn%SY=DJvaz>% delta 293 zcmV+=0owl00>%Q6Du4d~{{a7>y{D4^000SaNLh0L01FTR01FTSts}j400007bV*G` z2hsu)6b~Zend%Y%007fTL_t(|oMU8QV3;y>ilwQgk*QG(BV%?4gJt>A;Pg%gRKU1p z?^`(M!Hwl`wt_|^vN{%I6*<{CNK!ddrcQyYW`QVzsQCZ?D1VAwjMh`8LJekui=rt) z6JfS8m&?h{!BhkRW~P$6x9^S)vuA+|9q+WpRA*U!6vZD53=C5%u$X6A&Va5iy92Au zP{6ol?^_>dVO;K;I_-RRR`%9?@0b`E7^X~}!pMllap>kTz`{8@%MjTl1_lO*VGMZU rEjuflfq?;{2p+{Ba5)HotAGFis034jo*SnT00000NkvXXu0mjfb4Ph~ diff --git a/gtk/theme-bits/radio-13.png b/gtk/theme-bits/radio-13.png index 710f87e16b055a054662ace125a238ea6da4e951..6b6de161a45551dcf25f0e2c0c9cca6a92acaaf1 100644 GIT binary patch delta 290 zcmV+-0p0$e0=)u|B!32COGiWioB){sl;{$Qp z00(qQO+^RN2oM$qHgW*w2LJ#7%1J~)RCt_?kv$HBFbsvCBTm2x7+H(NfY?|WJ0Y=G zBJ90FyE~i!sTXL+vN5xE>;=jd=-?_!BDJcO!G8YapO^r!;eR48vOH^v^a;gr-XG5J zjjs2X4W5sS^^>%5xyU7Y-8-qC4O==ANQiBlyMt2h)yI0V?IW6|aIvd8mrHhh1v+;}eaL>+3Es#)0R zR3Rl|>_)w)WEl!47M(!T2n%aSZ40PbgoR^_i7&9D@~1!QJFmYvzo*uHTzzT!P=)LL zo$4q=rB2s=O|2U4p?eP1$`aD_0JIop?iQ*5Kq1)Od`@MA>H|5^W4Yp;mZSgx002ov JPDHLkV1hYIZhQa$