From b8653c3ab8ee785fc0605a960ac83afb97ac7edf Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 28 Dec 2002 19:03:05 +0000
Subject: [PATCH] better comments for the frame and its widgets' adjust()
 method

---
 src/backgroundwidget.cc |  2 +-
 src/buttonwidget.cc     |  2 +-
 src/frame.cc            | 20 +++++++++-----------
 src/frame.hh            |  3 ++-
 src/labelwidget.cc      |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/backgroundwidget.cc b/src/backgroundwidget.cc
index 8b63b44d..e7f7e732 100644
--- 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 390e5948..ceca8d38 100644
--- 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 3d290bc9..4f466b46 100644
--- 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 5f70b643..ab1e1b03 100644
--- 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 f00f738b..4fd48b59 100644
--- 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.
 }
 
 }
-- 
2.45.2