X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.cc;h=57b338c8905743d279fd3579657d3f6359e279d6;hb=9e6b0d5a8d0226232802bdece77665b167f98dae;hp=20e65932273af6c37166d9b2bf134f722739e568;hpb=9583bb6cb8dacb1be9674bf7d91d6886ad0d7dd2;p=chaz%2Fopenbox

diff --git a/src/frame.cc b/src/frame.cc
index 20e65932..57b338c8 100644
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -128,7 +128,8 @@ void Frame::adjustSize()
   int width;   // the width of the client and its border
   int bwidth;  // width to make borders
   int cbwidth; // width of the inner client border
-  int butsize=0; // width and height of the titlebar buttons
+  int fontheight = _style->labelFont()->height(); // height of the font
+  int butsize = fontheight - 2; // width and height of the titlebar buttons
   const int bevel = _style->bevelWidth();
   
   if (_decorations & Client::Decor_Border) {
@@ -157,9 +158,8 @@ void Frame::adjustSize()
     _innersize.top += _titlebar.height() + bwidth;
 
     // set the label size
-    _label.setGeometry(0, bevel, width, _style->labelFont()->height());
+    _label.setGeometry(0, bevel, width, fontheight);
     // set the buttons sizes
-    butsize = _label.height() - 2;
     if (_decorations & Client::Decor_Iconify)
       _button_iconify.setGeometry(0, bevel + 1, butsize, butsize);
     if (_decorations & Client::Decor_Maximize)
@@ -173,7 +173,7 @@ void Frame::adjustSize()
     const int sep = bevel + 1;
 
     otk::ustring layout;
-    if (!python_get_string("titlebar_layout", &layout))
+    if (!python_get_string("TITLEBAR_LAYOUT", &layout))
       layout = "ILMC";
 
     // this code ensures that the string only has one of each possible
@@ -344,6 +344,8 @@ void Frame::adjustSize()
 void Frame::adjustPosition()
 {
   int x, y;
+  x = _client->area().x();
+  y = _client->area().y();
   clientGravity(x, y);
   move(x, y);
 }
@@ -450,9 +452,6 @@ void Frame::releaseClient()
 
 void Frame::clientGravity(int &x, int &y)
 {
-  x = _client->area().x();
-  y = _client->area().y();
-
   // horizontal
   switch (_client->gravity()) {
   default:
@@ -509,9 +508,6 @@ void Frame::clientGravity(int &x, int &y)
 
 void Frame::frameGravity(int &x, int &y)
 {
-  x = rect().x();
-  y = rect().y();
-  
   // horizontal
   switch (_client->gravity()) {
   default: