From 6d30d66efb028fbafb58712aa5b71cadfeef2e32 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 20 Sep 2007 15:30:18 -0400 Subject: Adding RrButton to libobrender, ref counted appearances. --- obrender/button.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 obrender/button.h (limited to 'obrender/button.h') diff --git a/obrender/button.h b/obrender/button.h new file mode 100644 index 00000000..75459642 --- /dev/null +++ b/obrender/button.h @@ -0,0 +1,59 @@ +#ifndef __button_h +#define __button_h + +#include "render.h" + +#include +#include +#include + +struct _RrButton { + const RrInstance *inst; + + /* reference count */ + gint ref; + + /* colors */ + RrColor *focused_unpressed_color; + RrColor *unfocused_unpressed_color; + RrColor *focused_pressed_color; + RrColor *unfocused_pressed_color; + RrColor *disabled_focused_color; + RrColor *disabled_unfocused_color; + RrColor *hover_focused_color; + RrColor *hover_unfocused_color; + RrColor *toggled_hover_focused_color; + RrColor *toggled_hover_unfocused_color; + RrColor *toggled_focused_pressed_color; + RrColor *toggled_unfocused_pressed_color; + RrColor *toggled_focused_unpressed_color; + RrColor *toggled_unfocused_unpressed_color; + + /* masks */ + RrPixmapMask *mask; + RrPixmapMask *pressed_mask; + RrPixmapMask *disabled_mask; + RrPixmapMask *hover_mask; + RrPixmapMask *toggled_mask; + RrPixmapMask *toggled_hover_mask; + RrPixmapMask *toggled_pressed_mask; + + /* textures */ + RrAppearance *a_focused_unpressed; + RrAppearance *a_unfocused_unpressed; + RrAppearance *a_focused_pressed; + RrAppearance *a_unfocused_pressed; + RrAppearance *a_disabled_focused; + RrAppearance *a_disabled_unfocused; + RrAppearance *a_hover_focused; + RrAppearance *a_hover_unfocused; + RrAppearance *a_toggled_focused_unpressed; + RrAppearance *a_toggled_unfocused_unpressed; + RrAppearance *a_toggled_focused_pressed; + RrAppearance *a_toggled_unfocused_pressed; + RrAppearance *a_toggled_hover_focused; + RrAppearance *a_toggled_hover_unfocused; + +}; + +#endif /* __button_h */ -- cgit v1.2.3 From 0ae3388b6a6cef0f33f26369ccc3cdd5687ea930 Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Thu, 20 Sep 2007 22:36:52 -0400 Subject: Button proper freeing/newing. --- obrender/button.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'obrender/button.h') diff --git a/obrender/button.h b/obrender/button.h index 75459642..59d04f94 100644 --- a/obrender/button.h +++ b/obrender/button.h @@ -10,9 +10,6 @@ struct _RrButton { const RrInstance *inst; - /* reference count */ - gint ref; - /* colors */ RrColor *focused_unpressed_color; RrColor *unfocused_unpressed_color; -- cgit v1.2.3 From 8058df3f7ce153e31cfebaa696a7e892999acb2b Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Wed, 12 Dec 2007 18:02:38 -0500 Subject: Buttons seem to work! --- obrender/button.h | 45 --------------------------------------------- 1 file changed, 45 deletions(-) (limited to 'obrender/button.h') diff --git a/obrender/button.h b/obrender/button.h index 59d04f94..659c3ea9 100644 --- a/obrender/button.h +++ b/obrender/button.h @@ -7,50 +7,5 @@ #include #include -struct _RrButton { - const RrInstance *inst; - - /* colors */ - RrColor *focused_unpressed_color; - RrColor *unfocused_unpressed_color; - RrColor *focused_pressed_color; - RrColor *unfocused_pressed_color; - RrColor *disabled_focused_color; - RrColor *disabled_unfocused_color; - RrColor *hover_focused_color; - RrColor *hover_unfocused_color; - RrColor *toggled_hover_focused_color; - RrColor *toggled_hover_unfocused_color; - RrColor *toggled_focused_pressed_color; - RrColor *toggled_unfocused_pressed_color; - RrColor *toggled_focused_unpressed_color; - RrColor *toggled_unfocused_unpressed_color; - - /* masks */ - RrPixmapMask *mask; - RrPixmapMask *pressed_mask; - RrPixmapMask *disabled_mask; - RrPixmapMask *hover_mask; - RrPixmapMask *toggled_mask; - RrPixmapMask *toggled_hover_mask; - RrPixmapMask *toggled_pressed_mask; - - /* textures */ - RrAppearance *a_focused_unpressed; - RrAppearance *a_unfocused_unpressed; - RrAppearance *a_focused_pressed; - RrAppearance *a_unfocused_pressed; - RrAppearance *a_disabled_focused; - RrAppearance *a_disabled_unfocused; - RrAppearance *a_hover_focused; - RrAppearance *a_hover_unfocused; - RrAppearance *a_toggled_focused_unpressed; - RrAppearance *a_toggled_unfocused_unpressed; - RrAppearance *a_toggled_focused_pressed; - RrAppearance *a_toggled_unfocused_pressed; - RrAppearance *a_toggled_hover_focused; - RrAppearance *a_toggled_hover_unfocused; - -}; #endif /* __button_h */ -- cgit v1.2.3