callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove UXTHEME_HAS_LINES, fix menu coloration

Browse Source
This commit is contained in:
cinamod
2004-01-20 21:46:59 +00:00
parent d7bfabebdb
commit 30e463b6b4
4 changed files with 20 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/engines/ms-windows/ChangeLog.old
View File

@ -1,3 +1,15 @@
2004-01-20 Dom Lachowicz <cinamod@hotmail.com>
* src/wimp_style.c: Fix disappearing text in Gimp option menus.
Fix background color on XP menus.
2004-01-20 Dom Lachowicz <cinamod@hotmail.com>
* src/xp_theme.h
* src/xp_theme.c
* src/wimp_style.c: Remove UXTHEME_HAS_LINES stuff. I played around
with line drawing, and the results were absolutely dreadful.
2003-12-30 Dom Lachowicz <cinamod@hotmail.com> 2003-12-30 Dom Lachowicz <cinamod@hotmail.com>
* src/wimp_style.c * src/wimp_style.c

31
modules/engines/ms-windows/wimp_style.c
View File

@ -534,7 +534,9 @@ setup_wimp_rc_style(void)
"fg[NORMAL] = { %d, %d, %d }\n" "fg[NORMAL] = { %d, %d, %d }\n"
"bg[NORMAL] = { %d, %d, %d }\n" "bg[NORMAL] = { %d, %d, %d }\n"
"%s = \"%s\"\n" "%s = \"%s\"\n"
"}widget_class \"*MenuItem*\" style \"wimp-menu\"\n", "}widget_class \"*MenuItem*\" style \"wimp-menu\"\n"
"widget_class \"*GtkMenu\" style \"wimp-menu\"\n"
"widget_class \"*GtkMenuShell*\" style \"wimp-menu\"\n",
fg_prelight.red, fg_prelight.red,
fg_prelight.green, fg_prelight.green,
fg_prelight.blue, fg_prelight.blue,
@ -1683,17 +1685,9 @@ draw_hline (GtkStyle *style,
return; return;
} }
} }
#if UXTHEME_HAS_LINES
if (xp_theme_draw(window, XP_THEME_ELEMENT_HLINE, style, x1, y, x2, parent_class->draw_hline (style, window, state_type, area, widget,
style->ythickness, state_type, area)) detail, x1, x2, y);
{
}
else
#endif
{
parent_class->draw_hline (style, window, state_type, area, widget,
detail, x1, x2, y);
}
} }
static void static void
@ -1707,17 +1701,8 @@ draw_vline (GtkStyle *style,
gint y2, gint y2,
gint x) gint x)
{ {
#if UXTHEME_HAS_LINES parent_class->draw_vline (style, window, state_type, area, widget,
if (xp_theme_draw(window, XP_THEME_ELEMENT_VLINE, style, x, y1, detail, y1, y2, x);
style->xthickness, y2, state_type, area))
{
}
else
#endif
{
parent_class->draw_vline (style, window, state_type, area, widget,
detail, y1, y2, x);
}
} }
static void static void

41
modules/engines/ms-windows/xp_theme.c
View File

@ -97,12 +97,6 @@ static const short element_part_map[]=
MP_SEPARATOR, MP_SEPARATOR,
SP_GRIPPER, SP_GRIPPER,
SP_PANE SP_PANE
#if UXTHEME_HAS_LINES
,
GP_LINEHORZ,
GP_LINEVERT
#endif
}; };
static HINSTANCE uxtheme_dll = NULL; static HINSTANCE uxtheme_dll = NULL;
@ -244,11 +238,6 @@ xp_theme_get_handle_by_element (XpThemeElement element)
klazz = XP_THEME_CLASS_TOOLBAR; klazz = XP_THEME_CLASS_TOOLBAR;
break; break;
case XP_THEME_ELEMENT_HLINE:
case XP_THEME_ELEMENT_VLINE:
klazz = XP_THEME_CLASS_GLOBALS;
break;
case XP_THEME_ELEMENT_MENU_ITEM: case XP_THEME_ELEMENT_MENU_ITEM:
case XP_THEME_ELEMENT_MENU_SEPARATOR: case XP_THEME_ELEMENT_MENU_SEPARATOR:
klazz = XP_THEME_CLASS_MENU; klazz = XP_THEME_CLASS_MENU;
@ -604,36 +593,6 @@ xp_theme_map_gtk_state (XpThemeElement element, GtkStateType state)
ret = 1; ret = 1;
break; break;
#if UXTHEME_HAS_LINES
case XP_THEME_ELEMENT_HLINE:
switch(state) {
case GTK_STATE_ACTIVE:
ret = LHS_RAISED;
break;
case GTK_STATE_INSENSITIVE:
ret = LHS_SUNKEN;
break;
default:
ret = LHS_FLAT;
}
break;
case XP_THEME_ELEMENT_VLINE:
switch(state) {
case GTK_STATE_ACTIVE:
ret = LVS_RAISED;
break;
case GTK_STATE_INSENSITIVE:
ret = LVS_SUNKEN;
break;
default:
ret = LHS_FLAT;
}
break;
#endif
case XP_THEME_ELEMENT_MENU_ITEM: case XP_THEME_ELEMENT_MENU_ITEM:
case XP_THEME_ELEMENT_MENU_SEPARATOR: case XP_THEME_ELEMENT_MENU_SEPARATOR:
switch(state) { switch(state) {

2
modules/engines/ms-windows/xp_theme.h
View File

@ -88,8 +88,6 @@ typedef enum
XP_THEME_ELEMENT_MENU_SEPARATOR, XP_THEME_ELEMENT_MENU_SEPARATOR,
XP_THEME_ELEMENT_STATUS_GRIPPER, XP_THEME_ELEMENT_STATUS_GRIPPER,
XP_THEME_ELEMENT_STATUS_PANE, XP_THEME_ELEMENT_STATUS_PANE,
XP_THEME_ELEMENT_HLINE,
XP_THEME_ELEMENT_VLINE,
XP_THEME_ELEMENT__SIZEOF XP_THEME_ELEMENT__SIZEOF
} XpThemeElement; } XpThemeElement;