From: Dana Jansens Date: Sun, 10 Jun 2007 03:41:40 +0000 (+0000) Subject: use the osd theme stuff for the dock instead of active titlebar X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d3c22b58cba15c9420a9c09225c4ba5c66edfa23;p=chaz%2Fopenbox use the osd theme stuff for the dock instead of active titlebar --- diff --git a/openbox/dock.c b/openbox/dock.c index 9a03d75c..ff5b74cf 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -57,12 +57,11 @@ void dock_startup(gboolean reconfig) GList *it; XSetWindowBorder(ob_display, dock->frame, - RrColorPixel(ob_rr_theme-> - frame_focused_border_color)); - XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth); + RrColorPixel(ob_rr_theme->osd_border_color)); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth); RrAppearanceFree(dock->a_frame); - dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); stacking_add(DOCK_AS_WINDOW(dock)); @@ -90,10 +89,10 @@ void dock_startup(gboolean reconfig) RrVisual(ob_rr_inst), CWOverrideRedirect | CWEventMask, &attrib); - dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_focused_title); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); XSetWindowBorder(ob_display, dock->frame, - RrColorPixel(ob_rr_theme->frame_focused_border_color)); - XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->fbwidth); + RrColorPixel(ob_rr_theme->osd_border_color)); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth); g_hash_table_insert(window_map, &dock->frame, dock); stacking_add(DOCK_AS_WINDOW(dock)); @@ -262,8 +261,8 @@ void dock_configure() } /* used for calculating offsets */ - dock->w += ob_rr_theme->fbwidth * 2; - dock->h += ob_rr_theme->fbwidth * 2; + dock->w += ob_rr_theme->obwidth * 2; + dock->h += ob_rr_theme->obwidth * 2; a = screen_physical_area(); @@ -350,51 +349,51 @@ void dock_configure() case OB_DIRECTION_NORTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y -= dock->h - ob_rr_theme->fbwidth; + dock->y -= dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x -= dock->w - ob_rr_theme->fbwidth; + dock->x -= dock->w - ob_rr_theme->obwidth; break; } break; case OB_DIRECTION_NORTH: - dock->y -= dock->h - ob_rr_theme->fbwidth; + dock->y -= dock->h - ob_rr_theme->obwidth; break; case OB_DIRECTION_NORTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y -= dock->h - ob_rr_theme->fbwidth; + dock->y -= dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x += dock->w - ob_rr_theme->fbwidth; + dock->x += dock->w - ob_rr_theme->obwidth; break; } break; case OB_DIRECTION_WEST: - dock->x -= dock->w - ob_rr_theme->fbwidth; + dock->x -= dock->w - ob_rr_theme->obwidth; break; case OB_DIRECTION_EAST: - dock->x += dock->w - ob_rr_theme->fbwidth; + dock->x += dock->w - ob_rr_theme->obwidth; break; case OB_DIRECTION_SOUTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y += dock->h - ob_rr_theme->fbwidth; + dock->y += dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x -= dock->w - ob_rr_theme->fbwidth; + dock->x -= dock->w - ob_rr_theme->obwidth; break; } break; case OB_DIRECTION_SOUTH: - dock->y += dock->h - ob_rr_theme->fbwidth; + dock->y += dock->h - ob_rr_theme->obwidth; break; case OB_DIRECTION_SOUTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y += dock->h - ob_rr_theme->fbwidth; + dock->y += dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x += dock->w - ob_rr_theme->fbwidth; + dock->x += dock->w - ob_rr_theme->obwidth; break; } break; @@ -403,8 +402,8 @@ void dock_configure() } if (!config_dock_floating && config_dock_hide) { - strw = ob_rr_theme->fbwidth; - strh = ob_rr_theme->fbwidth; + strw = ob_rr_theme->obwidth; + strh = ob_rr_theme->obwidth; } else { strw = dock->w; strh = dock->h; @@ -503,8 +502,8 @@ void dock_configure() dock->h += minh; /* not used for actually sizing shit */ - dock->w -= ob_rr_theme->fbwidth * 2; - dock->h -= ob_rr_theme->fbwidth * 2; + dock->w -= ob_rr_theme->obwidth * 2; + dock->h -= ob_rr_theme->obwidth * 2; if (dock->dock_apps) { g_assert(dock->w > 0); @@ -519,8 +518,8 @@ void dock_configure() XUnmapWindow(ob_display, dock->frame); /* but they are useful outside of this function! */ - dock->w += ob_rr_theme->fbwidth * 2; - dock->h += ob_rr_theme->fbwidth * 2; + dock->w += ob_rr_theme->obwidth * 2; + dock->h += ob_rr_theme->obwidth * 2; screen_update_areas(); }