gtk-wimp-cvs Mailing List for GTK-Wimp

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gtk-wimp/gtk-wimp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31377/src

Modified Files:
	msw_style.c 
Log Message:
gnome bug 322780

Index: msw_style.c
===================================================================
RCS file: /cvsroot/gtk-wimp/gtk-wimp/src/msw_style.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** msw_style.c	25 Nov 2005 21:23:30 -0000	1.40
--- msw_style.c	27 Jan 2006 16:36:04 -0000	1.41
***************
*** 923,926 ****
--- 923,1011 ----
  }
  
+ static gboolean
+ is_combo_box_child (GtkWidget* w)
+ {
+     GtkWidget* tmp;
+     
+     if (w == NULL)
+ 	return FALSE;
+ 
+     for (tmp = w->parent; tmp; tmp = tmp->parent)
+ 	{
+ 	    if (GTK_IS_COMBO_BOX(tmp))
+ 		return TRUE;
+ 	}
+ 
+     return FALSE;
+ }
+ 
+ static gboolean
+ combo_box_draw_arrow (GtkStyle * style,
+ 	    GdkWindow * window,
+ 	    GtkStateType state,
+ 	    GdkRectangle * area,
+ 	    GtkWidget * widget)
+ {
+     if (xp_theme_draw (window, XP_THEME_ELEMENT_COMBOBUTTON,
+ 		       style, widget->allocation.x, widget->allocation.y, 
+ 		       widget->allocation.width, widget->allocation.height,
+ 		       state, area))
+ 	{
+ 	    return TRUE;
+ 	}
+ 
+     return FALSE;
+ }
+ 
+ /* This is ugly because no box drawing function is invoked for the combo
+    box as a whole, so we draw part of the entire box in every subwidget.
+    We do this by finding the allocation of the combo box in the given
+    window's coordinates and drawing.  The xp drawing routines take care
+    of the clipping. */
+ static gboolean
+ combo_box_draw_box (GtkStyle * style,
+ 	  GdkWindow * window,
+ 	  GtkStateType state_type,
+ 	  GtkShadowType shadow_type,
+ 	  GdkRectangle * area,
+ 	  GtkWidget * widget,
+ 	  const gchar * detail, gint x, gint y, gint width, gint height)
+ {
+     GtkWidget* combo_box;
+     GdkRectangle combo_alloc;
+     
+     if (!widget)
+ 	return FALSE;
+     for (combo_box = widget->parent; combo_box; combo_box = combo_box->parent)
+ 	{
+ 	    if (GTK_IS_COMBO_BOX(combo_box))
+ 		break;
+ 	}
+     if (!combo_box)
+ 	return FALSE;
+ 
+     combo_alloc = combo_box->allocation;
+     if (window != combo_box->window) 
+ 	{
+ 	    GtkWidget* tmp;
+ 	    for (tmp = widget; tmp && tmp != combo_box; tmp = widget->parent) 
+ 		{
+ 		    if (tmp->parent && tmp->window != tmp->parent->window)
+ 			{
+ 			    combo_alloc.x -= tmp->allocation.x;
+ 			    combo_alloc.y -= tmp->allocation.y;
+ 			}
+ 		}
+ 	}
+ 	
+     if (xp_theme_draw (window, XP_THEME_ELEMENT_EDIT_TEXT,
+ 		       style, combo_alloc.x, combo_alloc.y,
+                        combo_alloc.width, combo_alloc.height, 
+ 		       state_type, area))
+ 	return TRUE;
+ 
+     return FALSE;
+ }
+ 
  static void
  draw_part (GdkDrawable * drawable,
***************
*** 1295,1298 ****
--- 1380,1391 ----
      sanitize_size (window, &width, &height);
  
+     if (GTK_IS_ARROW(widget) && is_combo_box_child(widget))
+         {
+ 	    if (combo_box_draw_arrow (style, window, state, area, widget))
+ 		{
+ 		    return;
+ 		}
+         }
+ 
      if (detail && strcmp (detail, "spinbutton") == 0)
  	{
***************
*** 1492,1496 ****
  	  const gchar * detail, gint x, gint y, gint width, gint height)
  {
!     if (detail &&
  	(!strcmp (detail, "button") || !strcmp (detail, "buttondefault")))
  	{
--- 1585,1595 ----
  	  const gchar * detail, gint x, gint y, gint width, gint height)
  {
!     if (is_combo_box_child (widget) 
! 	&& combo_box_draw_box (style, window, state_type, shadow_type,
! 	                       area, widget, detail, x, y, width, height))
! 	{
! 	    return;
! 	}
!     else if (detail &&
  	(!strcmp (detail, "button") || !strcmp (detail, "buttondefault")))
  	{
***************
*** 1737,1741 ****
  		    return;
  		}
! 	}
      else if (detail
  	     && (strcmp (detail, "vscrollbar") == 0
--- 1836,1840 ----
  		    return;
  		}
! 	}	
      else if (detail
  	     && (strcmp (detail, "vscrollbar") == 0
***************
*** 2065,2068 ****
--- 2164,2173 ----
      gboolean is_handlebox_grippie = (detail && !strcmp (detail, "handlebox"));
  
+     if (is_combo_box_child (widget) 
+ 	&& combo_box_draw_box (style, window, state_type, shadow_type,
+ 	                       area, widget, detail, x, y, width, height))
+         {
+ 	    return;
+ 	}
      if (detail && !strcmp (detail, "entry"))
  	{

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (14)	Sep (36)	Oct (55)	Nov (17)	Dec (6)
2004	Jan (2)	Feb (2)	Mar (5)	Apr	May (14)	Jun (5)	Jul (10)	Aug (8)	Sep	Oct	Nov	Dec (4)
2005	Jan	Feb	Mar	Apr	May (3)	Jun (17)	Jul (2)	Aug (1)	Sep (1)	Oct (2)	Nov (9)	Dec
2006	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

gtk-wimp-cvs Mailing List for GTK-Wimp

gtk-wimp-cvs — CVS commit list