From: Dana Jansens <danakj@orodu.net>
Date: Fri, 14 Feb 2003 03:13:26 +0000 (+0000)
Subject: layout the titlebar right, was adding too much space when buttons were removed from... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=2f2d6e736ed4565564e57bdd37e5cb23826d13cf;p=chaz%2Fopenbox

layout the titlebar right, was adding too much space when buttons were removed from the titlebar
---

diff --git a/src/frame.cc b/src/frame.cc
index edcfdfcd..9e97f2b0 100644
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -645,45 +645,44 @@ void Frame::layoutTitle()
       geom.icon_x = x;
       XMapWindow(**otk::display, _icon);
       XMoveWindow(**otk::display, _icon, x, geom.bevel + 1);
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 'd':
     case 'D':
       if (!d) break;
       XMapWindow(**otk::display, _desk);
       XMoveWindow(**otk::display, _desk, x, geom.bevel + 1);
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 'i':
     case 'I':
       if (!i) break;
       XMapWindow(**otk::display, _iconify);
       XMoveWindow(**otk::display, _iconify, x, geom.bevel + 1);
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 't':
     case 'T':
       if (!t) break;
       XMapWindow(**otk::display, _label);
       XMoveWindow(**otk::display, _label, x, geom.bevel);
-      x += geom.label_width;
+      x += geom.label_width + geom.bevel;
       break;
     case 'm':
     case 'M':
       if (!m) break;
       XMapWindow(**otk::display, _max);
       XMoveWindow(**otk::display, _max, x, geom.bevel + 1);
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 'c':
     case 'C':
       if (!c) break;
       XMapWindow(**otk::display, _close);
       XMoveWindow(**otk::display, _close, x, geom.bevel + 1);
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     }
-    x += geom.bevel;
   }
 }