better comments for the frame and its widgets' adjust() method

diff --git a/src/backgroundwidget.cc b/src/backgroundwidget.cc
index 8b63b44d8781c76055af85d8115b9fa76cc52bc7..e7f7e732086f185843b4215528cae5a8322af46f 100644 (file)
--- a/src/backgroundwidget.cc
+++ b/src/backgroundwidget.cc
@@ -81,7 +81,7 @@ void OBBackgroundWidget::unfocus()
 
 void OBBackgroundWidget::adjust()
 {
-  // XXX: adjust shit
+  // nothing to adjust here. its done in OBFrame::adjustSize
 }
 
 }

diff --git a/src/buttonwidget.cc b/src/buttonwidget.cc
index 390e5948e9f88810c98872cac78eb59a331cc34f..ceca8d38a830735c1be3132fc8b442b768449913 100644 (file)
--- a/src/buttonwidget.cc
+++ b/src/buttonwidget.cc
@@ -132,7 +132,7 @@ void OBButtonWidget::update()
 
 void OBButtonWidget::adjust()
 {
-  // XXX: adjust shit
+  // nothing to adjust. no children.
 }
 
 

diff --git a/src/frame.cc b/src/frame.cc
index 3d290bc9133049ce4957ef7575393775fad39be9..4f466b46d26edbaf053bfc0cae138102cc36e701 100644 (file)
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -116,6 +116,7 @@ void OBFrame::unfocus()
 
 void OBFrame::adjust()
 {
+  // the party all happens in adjustSize
 }
 
 
@@ -128,6 +129,7 @@ void OBFrame::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
+  const int bevel = _style->getBevelWidth();
   
   if (_decorations & OBClient::Decor_Border) {
     bwidth = _style->getBorderWidth();
@@ -151,33 +153,31 @@ void OBFrame::adjustSize()
     _titlebar.setGeometry(-bwidth,
                           -bwidth,
                           width,
-                          (_style->getFont()->height() +
-                           _style->getBevelWidth() * 2));
+                          _style->getFont()->height() + bevel * 2);
     _innersize.top += _titlebar.height() + bwidth;
 
     // set the label size
-    _label.setGeometry(0, _style->getBevelWidth(),
-                       width, _style->getFont()->height());
+    _label.setGeometry(0, bevel, width, _style->getFont()->height());
     // set the buttons sizes
     if (_decorations & OBClient::Decor_Iconify)
-      _button_iconify.setGeometry(0, _style->getBevelWidth() + 1,
+      _button_iconify.setGeometry(0, bevel + 1,
                                   _label.height() - 2,
                                   _label.height() - 2);
     if (_decorations & OBClient::Decor_Maximize)
-      _button_max.setGeometry(0, _style->getBevelWidth() + 1,
+      _button_max.setGeometry(0, bevel + 1,
                               _label.height() - 2,
                               _label.height() - 2);
     if (_decorations & OBClient::Decor_Sticky)
-      _button_stick.setGeometry(0, _style->getBevelWidth() + 1,
+      _button_stick.setGeometry(0, bevel + 1,
                                 _label.height() - 2,
                                 _label.height() - 2);
     if (_decorations & OBClient::Decor_Close)
-      _button_close.setGeometry(0, _style->getBevelWidth() + 1,
+      _button_close.setGeometry(0, bevel + 1,
                                 _label.height() - 2,
                                 _label.height() - 2);
 
     // separation between titlebar elements
-    const int sep = _style->getBevelWidth() + 1;
+    const int sep = bevel + 1;
 
     std::string layout = "SLIMC"; // XXX: get this from somewhere
     // XXX: it is REQUIRED that by this point, the string only has one of each
@@ -284,8 +284,6 @@ void OBFrame::adjustSize()
   else
     _handle.hide(true);
   
-  // XXX: more is gunna have to happen here
-
   _size.left   = _innersize.left + bwidth;
   _size.right  = _innersize.right + bwidth;
   _size.top    = _innersize.top + bwidth;

diff --git a/src/frame.hh b/src/frame.hh
index 5f70b643e372ca09f7967fde8d3f3d8c554d2038..ab1e1b0347eb5c82e4a90fa42cfbc5bc453e76fb 100644 (file)
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -93,8 +93,9 @@ public:
   //! Set the style to decorate the frame with
   virtual void setStyle(otk::Style *style);
 
-  //! Realign children
+  //! Empty overridden method to prevent automatic alignment of children
   virtual void adjust();
+  
   //! Displays focused decorations
   virtual void focus();
   //! Displays unfocused decorations

diff --git a/src/labelwidget.cc b/src/labelwidget.cc
index f00f738b71d14eab909c01a5dd656f6c62a805d3..4fd48b59ab3275f259fe292cdbdb8b6fd034dd38 100644 (file)
--- a/src/labelwidget.cc
+++ b/src/labelwidget.cc
@@ -113,7 +113,7 @@ void OBLabelWidget::update()
 
 void OBLabelWidget::adjust()
 {
-  // XXX: adjust shit
+  // nothing to adjust. no children.
 }
 
 }