StrutPartial dock_strut;
-void dock_startup()
+void dock_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
+ if (reconfig) {
+ dock_configure();
+ return;
+ }
+
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
stacking_raise(DOCK_AS_WINDOW(dock));
}
-void dock_shutdown()
+void dock_shutdown(gboolean reconfig)
{
+ if (reconfig) return;
+
XDestroyWindow(ob_display, dock->frame);
RrAppearanceFree(dock->a_frame);
g_hash_table_remove(window_map, &dock->frame);
strh = ob_rr_theme->bwidth;
} else {
strw = dock->w;
- strh = dock->h;
+ strh = dock->h;
}
/* set the strut */
- if (config_dock_floating) {
+ if (!dock->dock_apps) {
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0);
+ } else if (config_dock_floating) {
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
} else {
dock->w -= ob_rr_theme->bwidth * 2;
dock->h -= ob_rr_theme->bwidth * 2;
- if (dock->w > 0 && dock->h > 0) {
+ if (dock->dock_apps) {
+ g_assert(dock->w > 0);
+ g_assert(dock->h > 0);
+
XMoveResizeWindow(ob_display, dock->frame,
dock->x, dock->y, dock->w, dock->h);