diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-12 16:15:45 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-12 16:17:22 -0500 |
| commit | df73dfa049b9d0bb81e09b27ecf678dce9b46301 (patch) | |
| tree | 0afd9adf0e2a44747b1ed5fd4b861c8a20026ce1 | |
| parent | 32c3a97f2e6d029cfb183deb03ebd6963166ead1 (diff) | |
make the dock's hiding always have at least 1px on screen
| -rw-r--r-- | openbox/dock.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/openbox/dock.c b/openbox/dock.c index 9d4b56c4..ed8bed4b 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -227,8 +227,10 @@ void dock_configure(void) gint l, r, t, b; gint strw, strh; Rect *a; + gint hidesize; RrMargins(dock->a_frame, &l, &t, &r, &b); + hidesize = MAX(1, ob_rr_theme->obwidth); dock->area.width = dock->area.height = 0; @@ -361,51 +363,51 @@ void dock_configure(void) case OB_DIRECTION_NORTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->area.y -= dock->area.height - ob_rr_theme->obwidth; + dock->area.y -= dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->area.x -= dock->area.width - ob_rr_theme->obwidth; + dock->area.x -= dock->area.width - hidesize; break; } break; case OB_DIRECTION_NORTH: - dock->area.y -= dock->area.height - ob_rr_theme->obwidth; + dock->area.y -= dock->area.height - hidesize; break; case OB_DIRECTION_NORTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->area.y -= dock->area.height - ob_rr_theme->obwidth; + dock->area.y -= dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->area.x += dock->area.width - ob_rr_theme->obwidth; + dock->area.x += dock->area.width - hidesize; break; } break; case OB_DIRECTION_WEST: - dock->area.x -= dock->area.width - ob_rr_theme->obwidth; + dock->area.x -= dock->area.width - hidesize; break; case OB_DIRECTION_EAST: - dock->area.x += dock->area.width - ob_rr_theme->obwidth; + dock->area.x += dock->area.width - hidesize; break; case OB_DIRECTION_SOUTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->area.y += dock->area.height - ob_rr_theme->obwidth; + dock->area.y += dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->area.x -= dock->area.width - ob_rr_theme->obwidth; + dock->area.x -= dock->area.width - hidesize; break; } break; case OB_DIRECTION_SOUTH: - dock->area.y += dock->area.height - ob_rr_theme->obwidth; + dock->area.y += dock->area.height - hidesize; break; case OB_DIRECTION_SOUTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->area.y += dock->area.height - ob_rr_theme->obwidth; + dock->area.y += dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->area.x += dock->area.width - ob_rr_theme->obwidth; + dock->area.x += dock->area.width - hidesize; break; } break; @@ -414,8 +416,8 @@ void dock_configure(void) } if (!config_dock_floating && config_dock_hide) { - strw = ob_rr_theme->obwidth; - strh = ob_rr_theme->obwidth; + strw = hidesize; + strh = hidesize; } else { strw = dock->area.width; strh = dock->area.height; |