}
#include "client.hh"
+#include "backgroundwidget.hh"
+#include "labelwidget.hh"
+#include "buttonwidget.hh"
#include "otk/strut.hh"
#include "otk/rect.hh"
#include "otk/screeninfo.hh"
#include "otk/style.hh"
#include "otk/widget.hh"
-#include "otk/button.hh"
-#include "otk/focuswidget.hh"
-#include "otk/focuslabel.hh"
#include <string>
otk::Strut _innersize;
// decoration windows
- otk::OtkFocusWidget _plate; // sits entirely under the client window
- otk::OtkFocusWidget _titlebar;
- otk::OtkButton _button_close;
- otk::OtkButton _button_iconify;
- otk::OtkButton _button_max;
- otk::OtkButton _button_stick;
- otk::OtkFocusLabel _label;
- otk::OtkFocusWidget _handle;
- otk::OtkButton _grip_left;
- otk::OtkButton _grip_right;
+ OBBackgroundWidget _plate; // sits entirely under the client window
+ OBBackgroundWidget _titlebar;
+ OBButtonWidget _button_close;
+ OBButtonWidget _button_iconify;
+ OBButtonWidget _button_max;
+ OBButtonWidget _button_stick;
+ OBLabelWidget _label;
+ OBBackgroundWidget _handle;
+ OBButtonWidget _grip_left;
+ OBButtonWidget _grip_right;
//! The decorations to display on the window.
/*!
*/
void releaseClient(bool remap);
+ //! Shape the frame window to the client window
+ void adjustShape();
+
public:
//! Constructs an OBFrame object, and reparents the client to itself
/*!
//! Set the style to decorate the frame with
virtual void setStyle(otk::Style *style);
- //! Update the frame to match the client
- void adjust();
- //! Shape the frame window to the client window
- void adjustShape();
+ //! Update the frame's size to match the client
+ void adjustSize();
+ //! Update the frame's position to match the client
+ void adjustPosition();
- //! Applies gravity for the client's gravity, moving the frame to the
- //! appropriate place
- void applyGravity();
+ //! Applies gravity to the client's position to find where the frame should
+ //! be positioned.
+ /*!
+ @return The proper coordinates for the frame, based on the client.
+ */
+ void clientGravity(int &x, int &y);
+
+ //! Reversly applies gravity to the frame's position to find where the client
+ //! should be positioned.
+ /*!
+ @return The proper coordinates for the client, based on the frame.
+ */
+ void frameGravity(int &x, int &y);
- //! Reversely applies gravity for the client's gravity, moving the frame so
- //! that the client is in its pre-gravity position
- void reverseGravity();
};
}