Commit 0ca5c752 authored by Soeren Sandmann's avatar Soeren Sandmann Committed by Søren Sandmann Pedersen

new radio buttons. handle inconsistent state for check- and radiobuttons.

Wed Feb 20 23:00:08 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
	check- and radiobuttons.

	* gtk/theme-bits/check-13-inconsistent.png,
	gtk/theme-bits/radio-13-inconsistent.png: new files

	* gtk/theme-bits/radio-13.png: new radio buttons

	* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
	-inconsistent.png files
parent 6fd8f4aa
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
Wed Feb 20 23:00:08 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstyle.c: new radio buttons. handle inconsistent state for
check- and radiobuttons.
* gtk/theme-bits/check-13-inconsistent.png,
gtk/theme-bits/radio-13-inconsistent.png: new files
* gtk/theme-bits/radio-13.png: new radio buttons
* gtk/theme-bits/Makefile.am (EXTRA_DIST): add new
-inconsistent.png files
Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com> Wed Feb 20 16:19:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for * gdk/x11/gdkevents-x11.c: Add a XSETTING mapping for
......
...@@ -330,53 +330,86 @@ typedef enum { ...@@ -330,53 +330,86 @@ typedef enum {
CHECK_LIGHT, CHECK_LIGHT,
CHECK_MID, CHECK_MID,
CHECK_TEXT, CHECK_TEXT,
CHECK_INCONSISTENT_AA,
CHECK_INCONSISTENT_TEXT,
RADIO_BASE, RADIO_BASE,
RADIO_BLACK, RADIO_BLACK,
RADIO_DARK, RADIO_DARK,
RADIO_LIGHT, RADIO_LIGHT,
RADIO_MID, RADIO_MID,
RADIO_TEXT RADIO_TEXT,
RADIO_INCONSISTENT_AA,
RADIO_INCONSISTENT_TEXT
} IndicatorPart; } IndicatorPart;
static char check_aa_bits[] = { /*
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x58,0x00,0xa0, * Extracted from check-13.png, width=13, height=13
0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; */
static char check_base_bits[] = {
0x00,0x00,0x00,0x00,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0x00,0x00,0x00,0x00};
static char check_black_bits[] = { static char check_black_bits[] = {
0x00,0x00,0xfe,0x0f,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, 0x00,0x00,0xfe,0x0f,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00}; 0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00};
static char check_dark_bits[] = { static char check_dark_bits[] = {
0xff,0x1f,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01, 0xff,0x1f,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00}; 0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00};
static char check_light_bits[] = {
0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0xfe,0x1f};
static char check_mid_bits[] = { static char check_mid_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00, 0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
0x08,0x00,0x08,0x00,0x08,0x00,0x08,0xfc,0x0f,0x00,0x00}; 0x08,0x00,0x08,0x00,0x08,0x00,0x08,0xfc,0x0f,0x00,0x00,0x00,0x00};
static char check_light_bits[] = {
0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0xfe,0x1f,0x00,0x00};
static char check_text_bits[] = { static char check_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x03,0x80,0x01,0x80,0x00,0xd8, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x03,0x80,0x01,0x80,0x00,0x58,
0x00,0x60,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; 0x00,0x60,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char radio_base_bits[] = { static char check_aa_bits[] = {
0x00,0x00,0x00,0x00,0xf0,0x01,0xf8,0x03,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x58,0x00,0xa0,
0x07,0xfc,0x07,0xf8,0x03,0xf0,0x01,0x00,0x00,0x00,0x00}; 0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char check_base_bits[] = {
0x00,0x00,0x00,0x00,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0x00,0x00,0x00,0x00,0x00,0x00};
/*
* Extracted from check-13-inconsistent-ssp.png, width=13, height=13
*/
static char check_inconsistent_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0xf8,
0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char check_inconsistent_aa_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};
/*
* Extracted from radio-13-ssp.png, width=13, height=13
*/
static char radio_black_bits[] = { static char radio_black_bits[] = {
0x00,0x00,0xf0,0x01,0x08,0x02,0x04,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, 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,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char radio_dark_bits[] = { static char radio_dark_bits[] = {
0xf0,0x01,0x08,0x02,0x04,0x04,0x02,0x04,0x01,0x00,0x01,0x00,0x01,0x00,0x01, 0xf0,0x00,0x0c,0x02,0x02,0x04,0x02,0x04,0x01,0x08,0x01,0x08,0x01,0x08,0x01,
0x00,0x01,0x00,0x02,0x00,0x0c,0x00,0x00,0x00,0x00,0x00}; 0x08,0x00,0x04,0x02,0x04,0x0c,0x03,0xf0,0x00,0x00,0x00,0x00,0x00};
static char radio_light_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
0x10,0x00,0x10,0x00,0x08,0x00,0x04,0x08,0x02,0xf0,0x01};
static char radio_mid_bits[] = { static char radio_mid_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x08,0x00,0x08,0x00,0x04,0x00,0x02,0xf0,0x01,0x00,0x00}; 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char 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};
static char radio_text_bits[] = { static char radio_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0xf0,0x01,0xf0,0x01,0xf0, 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}; 0x01,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char radio_aa_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 char 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};
/*
* Extracted from radio-13-inconsistent-ssp.png, width=13, height=13
*/
static char radio_inconsistent_text_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static char radio_inconsistent_aa_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0xf8,
0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
static struct { static struct {
char *bits; char *bits;
...@@ -389,12 +422,16 @@ static struct { ...@@ -389,12 +422,16 @@ static struct {
{ check_light_bits, NULL }, { check_light_bits, NULL },
{ check_mid_bits, NULL }, { check_mid_bits, NULL },
{ check_text_bits, NULL }, { check_text_bits, NULL },
{ check_inconsistent_aa_bits, NULL },
{ check_inconsistent_text_bits, NULL },
{ radio_base_bits, NULL }, { radio_base_bits, NULL },
{ radio_black_bits, NULL }, { radio_black_bits, NULL },
{ radio_dark_bits, NULL }, { radio_dark_bits, NULL },
{ radio_light_bits, NULL }, { radio_light_bits, NULL },
{ radio_mid_bits, NULL }, { radio_mid_bits, NULL },
{ radio_text_bits, NULL } { radio_text_bits, NULL },
{ radio_inconsistent_aa_bits, NULL },
{ radio_inconsistent_text_bits, NULL },
}; };
/* --- variables --- */ /* --- variables --- */
...@@ -3301,20 +3338,35 @@ gtk_default_draw_check (GtkStyle *style, ...@@ -3301,20 +3338,35 @@ gtk_default_draw_check (GtkStyle *style,
draw_part (window, style->black_gc, area, x, y, CHECK_TEXT); draw_part (window, style->black_gc, area, x, y, CHECK_TEXT);
draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_AA); draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_AA);
} }
else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
{
draw_part (window, style->black_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
}
} }
else else
{ {
GdkGC *base_gc = style->base_gc[state_type];
if (state_type == GTK_STATE_ACTIVE)
base_gc = style->bg_gc[state_type];
draw_part (window, base_gc, area, x, y, CHECK_BASE);
draw_part (window, style->black_gc, area, x, y, CHECK_BLACK); draw_part (window, style->black_gc, area, x, y, CHECK_BLACK);
draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_DARK); draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_DARK);
draw_part (window, style->mid_gc[state_type], area, x, y, CHECK_MID); draw_part (window, style->mid_gc[state_type], area, x, y, CHECK_MID);
draw_part (window, style->light_gc[state_type], area, x, y, CHECK_LIGHT); draw_part (window, style->light_gc[state_type], area, x, y, CHECK_LIGHT);
draw_part (window, style->base_gc[state_type], area, x, y, CHECK_BASE);
if (shadow_type == GTK_SHADOW_IN) if (shadow_type == GTK_SHADOW_IN)
{ {
draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT); draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT);
draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA); draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA);
} }
else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
{
draw_part (window, style->text_gc[state_type], area, x, y, CHECK_INCONSISTENT_TEXT);
draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
}
} }
} }
...@@ -3363,19 +3415,38 @@ gtk_default_draw_option (GtkStyle *style, ...@@ -3363,19 +3415,38 @@ gtk_default_draw_option (GtkStyle *style,
if (strcmp (detail, "option") == 0) /* Menu item */ if (strcmp (detail, "option") == 0) /* Menu item */
{ {
if (shadow_type == GTK_SHADOW_IN) if (shadow_type == GTK_SHADOW_IN)
{
draw_part (window, style->fg_gc[state_type], area, x, y, RADIO_TEXT); draw_part (window, style->fg_gc[state_type], area, x, y, RADIO_TEXT);
} }
else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
{
draw_part (window, style->black_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
}
}
else else
{ {
GdkGC *base_gc = style->base_gc[state_type];
if (state_type == GTK_STATE_ACTIVE)
base_gc = style->bg_gc[state_type];
draw_part (window, base_gc, area, x, y, RADIO_BASE);
draw_part (window, style->black_gc, area, x, y, RADIO_BLACK); draw_part (window, style->black_gc, area, x, y, RADIO_BLACK);
draw_part (window, style->dark_gc[state_type], area, x, y, RADIO_DARK); draw_part (window, style->dark_gc[state_type], area, x, y, RADIO_DARK);
draw_part (window, style->mid_gc[state_type], area, x, y, RADIO_MID); draw_part (window, style->mid_gc[state_type], area, x, y, RADIO_MID);
draw_part (window, style->light_gc[state_type], area, x, y, RADIO_LIGHT); draw_part (window, style->light_gc[state_type], area, x, y, RADIO_LIGHT);
draw_part (window, style->base_gc[state_type], area, x, y, RADIO_BASE);
if (shadow_type == GTK_SHADOW_IN) if (shadow_type == GTK_SHADOW_IN)
{
draw_part (window, style->text_gc[state_type], area, x, y, RADIO_TEXT); draw_part (window, style->text_gc[state_type], area, x, y, RADIO_TEXT);
} }
else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
{
draw_part (window, style->text_aa_gc[state_type], area, x, y, RADIO_INCONSISTENT_AA);
draw_part (window, style->text_gc[state_type], area, x, y, RADIO_INCONSISTENT_TEXT);
}
}
} }
} }
......
...@@ -8,4 +8,4 @@ noinst_PROGRAMS = decompose-bits ...@@ -8,4 +8,4 @@ noinst_PROGRAMS = decompose-bits
decompose_bits_SOURCES = decompose-bits.c decompose_bits_SOURCES = decompose-bits.c
decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la
EXTRA_DIST = check-13.png radio-13.png EXTRA_DIST = check-13.png check-13-inconsistent radio-13.png radio-13-inconsistent
gtk/theme-bits/radio-13.png

306 Bytes | W: | H:

gtk/theme-bits/radio-13.png

287 Bytes | W: | H:

gtk/theme-bits/radio-13.png
gtk/theme-bits/radio-13.png
gtk/theme-bits/radio-13.png
gtk/theme-bits/radio-13.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment