draw box does more intelligent separation for the xp theming engine and

2008-03-16  Alberto Ruiz <aruiz@gnome.org>

	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc:
	* modules/engines/ms-windows/msw_style.c (draw_box) (draw_arrow)
	(combo_box_draw_arrow) (setup_msw_rc_style): draw box does more intelligent
	separation for the xp theming engine and the classic theme while drawing the
	GtkComboBox button.
	combobox_draw_arrow is not used anymore, commented.
	The style has been updated to fix border/thickness glitches in the combobox
	according to the fixes commited regarding bug #521442. (bug #461805)

svn path=/trunk/; revision=19887

diff --git a/ChangeLog b/ChangeLog
index e0d6b34850e2a486b6f0ce156697f8534a40f794..f4a9457c54939db255fd0c28b5bcb079b08ce290 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
-2008-16-03  Alberto Ruiz <aruiz@gnome.org>
+2008-03-16  Alberto Ruiz <aruiz@gnome.org>
 
-       * gtl/gtkcombobox.c: (gtk_combo_box_size_allocate) The child is now aware of
+       * modules/engines/ms-windows/Theme/gtk-2.0/gtkrc:
+       * modules/engines/ms-windows/msw_style.c (draw_box) (draw_arrow)
+       (combo_box_draw_arrow) (setup_msw_rc_style): draw box does more intelligent
+       separation for the xp theming engine and the classic theme while drawing the
+       GtkComboBox button.
+       combobox_draw_arrow is not used anymore, commented.
+       The style has been updated to fix border/thickness glitches in the combobox
+       according to the fixes commited regarding bug #521442. (bug #461805)
+
+2008-03-16  Alberto Ruiz <aruiz@gnome.org>
+
+       * gtk/gtkcombobox.c: (gtk_combo_box_size_allocate) The child is now aware of
        both the combobox and frame (if has-frame is set) thickness and border. (bug #521442)
 
 2008-03-15  Andre Klapper  <a9016009@gmx.de>

diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 7e8bc6452c4dd5f9c7fcaebdf9aee0e2aee9978f..07fa1a37293477c76ad11d094eb2c2a0fa090a97 100755 (executable)
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -55,3 +55,15 @@ binding "ms-windows-tree-view"
 }
 
 class "GtkTreeView" binding "ms-windows-tree-view"
+
+style "cosa" = "msw-default"
+{
+  xthickness = 0 
+  ythickness = 0
+} widget_class "*TreeView*ComboBox*" style "cosa"
+
+style "cosa" = "msw-default"
+{
+  xthickness = 0 
+  ythickness = 0
+} widget_class "*ComboBox*GtkFrame*" style "cosa"

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 3f4dcb377a2c3c5a6c04eceeee8bad251c872aca..c74e543942f240b216854981d339fdad7f4d94c2 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -902,24 +902,25 @@ setup_msw_rc_style (void)
              "ythickness = %d\n"
              "}\n"
              "class \"GtkComboBox\" style \"msw-combobox\"\n",
-             GetSystemMetrics (SM_CXEDGE), GetSystemMetrics (SM_CYEDGE));
+        xp_theme_is_active()? 1 : GetSystemMetrics (SM_CXEDGE),
+        xp_theme_is_active()? 1 : GetSystemMetrics (SM_CYEDGE));
   gtk_rc_parse_string (buf);
 
   /* size of tree view header */
   g_snprintf (buf, sizeof (buf),
              "style \"msw-header-button\" = \"msw-default\"\n"
              "{\n"
-             "xthickness = 4\n"
-             "ythickness = %d\n"
-             "GtkButton::default-border = { 0, 0, 0, 0 }\n"
+             "xthickness = 0\n"
+             "ythickness = 0\n"
+             "GtkWidget::draw-border = {0, 0, 0, 0}\n"
+        "GtkButton::default-border = { 0, 0, 0, 0 }\n"
              "GtkButton::default-outside-border = { 0, 0, 0, 0 }\n"
-             "GtkButton::child-displacement-x = 1\n"
-             "GtkButton::child-displacement-y = 1\n"
+             "GtkButton::child-displacement-x = 0\n"
+             "GtkButton::child-displacement-y = 0\n"
              "GtkWidget::focus-padding = 0\n"
              "GtkWidget::focus-line-width = 0\n"
              "}\n"
-             "widget_class \"*TreeView*Button*\" style \"msw-header-button\"\n",
-             xp_theme_is_active ()? 2 : 0);
+             "widget_class \"*TreeView*Button*\" style \"msw-header-button\"\n");
   gtk_rc_parse_string (buf);
 
   /* FIXME: This should be enabled once gtk+ support GtkNotebok::prelight-tab */
@@ -1078,7 +1079,8 @@ is_combo_box_child (GtkWidget *w)
   return FALSE;
 }
 
-static gboolean
+/* This function is not needed anymore */
+/* static gboolean
 combo_box_draw_arrow (GtkStyle *style,
                      GdkWindow *window,
                      GtkStateType state,
@@ -1107,7 +1109,7 @@ combo_box_draw_arrow (GtkStyle *style,
     }
 
   return FALSE;
-}
+}*/
 
 static void
 draw_part (GdkDrawable *drawable,
@@ -1494,13 +1496,8 @@ draw_arrow (GtkStyle *style,
 
   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 (GTK_IS_ARROW (widget) && is_combo_box_child (widget) && xp_theme_is_active ())
+    return;
 
   if (detail && strcmp (detail, "spinbutton") == 0)
     {
@@ -1973,22 +1970,29 @@ draw_box (GtkStyle *style,
   if (is_combo_box_child (widget) && detail && !strcmp (detail, "button"))
     {
       RECT rect;
+      DWORD border;
       HDC dc;
       int cx;
 
-      dc = get_window_dc (style, window, state_type, x, y, width - cx, height, &rect);
-      FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW));
-      release_window_dc (style, window, state_type);
+      border = (GTK_TOGGLE_BUTTON (widget)->active ? DFCS_PUSHED | DFCS_FLAT : 0);
 
-      cx = GetSystemMetrics(SM_CXVSCROLL);
-      x += width - cx;
-      width = cx;
+      dc = get_window_dc (style, window, state_type, x, y, width, height, &rect);
+      DrawFrameControl (dc, &rect, DFC_SCROLL, DFCS_SCROLLDOWN | border);
+      release_window_dc (style, window, state_type);
 
       if (xp_theme_is_active ()
          && xp_theme_draw (window, XP_THEME_ELEMENT_COMBOBUTTON, style, x, y,
                            width, height, state_type, area))
        {
-         return;
+      cx = GetSystemMetrics(SM_CXVSCROLL);
+      x += width - cx;
+      width = cx;
+
+
+      dc = get_window_dc (style, window, state_type, x, y, width - cx, height, &rect);
+      FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW));
+      release_window_dc (style, window, state_type);
+      return;
        }
     }
 
@@ -1996,8 +2000,8 @@ draw_box (GtkStyle *style,
       (!strcmp (detail, "button") || !strcmp (detail, "buttondefault")))
     {
       if (GTK_IS_TREE_VIEW (widget->parent) || GTK_IS_CLIST (widget->parent))
-       {
-         if (xp_theme_draw
+      {
+        if (xp_theme_draw
              (window, XP_THEME_ELEMENT_LIST_HEADER, style, x, y,
               width, height, state_type, area))
            {
@@ -2950,12 +2954,14 @@ draw_shadow (GtkStyle *style,
       HDC dc;
       RECT rect;
 
-      if (is_combo_box_child (widget))
-        return; 
 
-      dc = get_window_dc (style, window, state_type, x, y, width, height, &rect);
 
-      if (is_popup_window_child (widget))
+      dc = get_window_dc (style, window, state_type, x, y, width, height, &rect);
+      if (is_combo_box_child (widget))
+        {
+          FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW));
+        }
+      else if (is_popup_window_child (widget))
        {
          FrameRect (dc, &rect, GetSysColorBrush (COLOR_WINDOWFRAME));
        }