diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-06-21 01:53:26 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-06-21 01:53:26 +0000 |
| commit | b1f5555218ecaa3827450125dc47b4bf0d404ee4 (patch) | |
| tree | 693db64d34df6381b1c434178ba3ccd062d5e8f6 /openbox/dock.c | |
| parent | a4a0cb78294bb1809b836ea1e86e9d7294bb2929 (diff) | |
put the render theme into a struct
Diffstat (limited to 'openbox/dock.c')
| -rw-r--r-- | openbox/dock.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/openbox/dock.c b/openbox/dock.c index 3fb9c78d..3dda174d 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -32,9 +32,9 @@ void dock_startup() RrVisual(ob_rr_inst), CWOverrideRedirect | CWEventMask, &attrib); - dock->a_frame = RrAppearanceCopy(theme_a_unfocused_title); - XSetWindowBorder(ob_display, dock->frame, theme_b_color->pixel); - XSetWindowBorderWidth(ob_display, dock->frame, theme_bwidth); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); + XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth); g_hash_table_insert(window_map, &dock->frame, dock); stacking_add(DOCK_AS_WINDOW(dock)); @@ -182,8 +182,8 @@ void dock_configure() } /* used for calculating offsets */ - dock->w += theme_bwidth * 2; - dock->h += theme_bwidth * 2; + dock->w += ob_rr_theme->bwidth * 2; + dock->h += ob_rr_theme->bwidth * 2; /* calculate position */ switch (config_dock_pos) { @@ -265,39 +265,39 @@ void dock_configure() break; case DockPos_TopLeft: if (config_dock_horz) - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; else - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Top: - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; break; case DockPos_TopRight: if (config_dock_horz) - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; else - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; case DockPos_Left: - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Right: - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; case DockPos_BottomLeft: if (config_dock_horz) - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; else - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Bottom: - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; break; case DockPos_BottomRight: if (config_dock_horz) - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; else - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; } } @@ -346,8 +346,8 @@ void dock_configure() } /* not used for actually sizing shit */ - dock->w -= theme_bwidth * 2; - dock->h -= theme_bwidth * 2; + dock->w -= ob_rr_theme->bwidth * 2; + dock->h -= ob_rr_theme->bwidth * 2; if (dock->w > 0 && dock->h > 0) { XMoveResizeWindow(ob_display, dock->frame, @@ -359,8 +359,8 @@ void dock_configure() XUnmapWindow(ob_display, dock->frame); /* but they are useful outside of this function! */ - dock->w += theme_bwidth * 2; - dock->h += theme_bwidth * 2; + dock->w += ob_rr_theme->bwidth * 2; + dock->h += ob_rr_theme->bwidth * 2; screen_update_struts(); } |