summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-26
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkstyle.c31
-rw-r--r--gtk/theme-bits/radio-13-inconsistent.pngbin326 -> 335 bytes
-rw-r--r--gtk/theme-bits/radio-13.pngbin287 -> 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 <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
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 <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
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 <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
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 <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
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 <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
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 <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
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 b049432b51..f8fa57edc7 100644
--- a/gtk/theme-bits/radio-13-inconsistent.png
+++ b/gtk/theme-bits/radio-13-inconsistent.png
Binary files differ
diff --git a/gtk/theme-bits/radio-13.png b/gtk/theme-bits/radio-13.png
index 710f87e16b..6b6de161a4 100644
--- a/gtk/theme-bits/radio-13.png
+++ b/gtk/theme-bits/radio-13.png
Binary files differ