AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-06 00:30:08 +00:00
Code Issues Projects Releases Wiki Activity

toward bug 853775

Browse Source
This commit is contained in:
cinamod 2003-12-30 17:22:30 +00:00
parent 7b61ec8c3b
commit 16f9478ee3
5 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,10 @@
2003-12-30 Dom Lachowicz <cinamod@hotmail.com>
* src/wimp_style.c
* src/xp_theme.c
* src/xp_theme.h
* src/xp_theme_defs.h: Toward 853775, get toolbar button borders correct
2003-12-30 Dom Lachowicz <cinamod@hotmail.com>
* src/wimp_style.c: Fix bug 852354 to my liking

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

@ -1284,6 +1284,12 @@ draw_box (GtkStyle *style,
width, height, state_type, area))
return;
}
else if (GTK_IS_TOOLBAR (widget->parent))
{
if (xp_theme_draw(window, XP_THEME_ELEMENT_TOOLBAR_BUTTON, style, x, y,
width, height, state_type, area))
return;
}
else
{
gboolean is_default = !strcmp (detail, "buttondefault");

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

@ -240,7 +240,7 @@ xp_theme_get_handle_by_element (XpThemeElement element)
klazz = XP_THEME_CLASS_STATUS;
break;
case XP_THEME_ELEMENT_TOOLBAR:
case XP_THEME_ELEMENT_TOOLBAR_BUTTON:
klazz = XP_THEME_CLASS_TOOLBAR;
break;
@ -357,9 +357,22 @@ xp_theme_map_gtk_state (XpThemeElement element, GtkStateType state)
}
break;
case XP_THEME_ELEMENT_TOOLBAR:
ret = 1;
break;
case XP_THEME_ELEMENT_TOOLBAR_BUTTON:
switch (state)
{
case GTK_STATE_ACTIVE:
ret = TS_PRESSED;
break;
case GTK_STATE_PRELIGHT:
ret = TS_HOT;
break;
case GTK_STATE_INSENSITIVE:
ret = TS_DISABLED;
break;
default:
ret = TS_NORMAL;
}
break;
case XP_THEME_ELEMENT_TAB_PANE:
ret = 1;

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

@ -83,7 +83,7 @@ typedef enum
XP_THEME_ELEMENT_REBAR_GRIPPER_H,
XP_THEME_ELEMENT_REBAR_GRIPPER_V,
XP_THEME_ELEMENT_REBAR_CHEVRON,
XP_THEME_ELEMENT_TOOLBAR,
XP_THEME_ELEMENT_TOOLBAR_BUTTON,
XP_THEME_ELEMENT_MENU_ITEM,
XP_THEME_ELEMENT_MENU_SEPARATOR,
XP_THEME_ELEMENT_STATUS_GRIPPER,

4
modules/engines/ms-windows/xp_theme_defs.h
View File

@ -75,6 +75,10 @@ typedef HANDLE HTHEME;
#define RP_CHEVRON 4
#define TP_BUTTON 1
#define TS_NORMAL 1
#define TS_HOT 2
#define TS_PRESSED 3
#define TS_DISABLED 4
#define TTSS_NORMAL 1