From d1e1f5d79b0dab8b827bc057312cdeb2562af7ff Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Thu, 8 Mar 2007 13:24:51 +0000 Subject: [PATCH] Use proper border style when drawing shadow of scrolled windows on Windows 2007-03-08 Mathias Hasselmann * modules/engines/ms-windows/msw_style.c: Use proper border style when drawing shadow of scrolled windows on Windows XP (#168326) * modules/engines/ms-windows/xp_theme.c: Explicitly set size of element_part_map array to ensure it always is large enough. svn path=/trunk/; revision=17429 --- ChangeLog | 7 +++++++ modules/engines/ms-windows/msw_style.c | 9 ++++++--- modules/engines/ms-windows/xp_theme.c | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b672a6088..7a8a6179fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-03-08 Mathias Hasselmann + * modules/engines/ms-windows/msw_style.c: Use proper border style + when drawing shadow of scrolled windows on Windows XP (#168326) + * modules/engines/ms-windows/xp_theme.c: Explicitly set size of + element_part_map array to ensure it always is large enough. + +2007-03-08 Mathias Hasselmann + * gtk/gtkcombobox.c: Add shadow-type style property, set shadow-type property of GtkEntry accordingly, unify size-allocation of toggle button (#411123, patch from Mathias Hasselmann). diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index 07a53ce89d..49ab0fb801 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -2692,10 +2692,13 @@ draw_shadow (GtkStyle * style, return; } - if( detail && !strcmp( detail, "spinbutton" ) ) - { + if (detail && !strcmp (detail, "scrolled_window") && + xp_theme_draw (window, XP_THEME_ELEMENT_EDIT_TEXT, style, + x, y, width, height, state_type, area)) + return; + + if (detail && !strcmp (detail, "spinbutton")) return; - } if (detail && !strcmp (detail, "menu")) { diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c index b96467b6af..187069d0d9 100755 --- a/modules/engines/ms-windows/xp_theme.c +++ b/modules/engines/ms-windows/xp_theme.c @@ -96,7 +96,7 @@ static const LPCWSTR class_descriptors[] = { L"Trackbar" /* XP_THEME_CLASS_TRACKBAR */ }; -static const short element_part_map[] = { +static const short element_part_map[XP_THEME_ELEMENT__SIZEOF] = { BP_CHECKBOX, BP_CHECKBOX, BP_PUSHBUTTON,