_screen(otk::OBDisplay::screenInfo(client->screen())),
_plate(this, OBWidget::Type_Plate),
_titlebar(this, OBWidget::Type_Titlebar),
- _button_close(&_titlebar),
- _button_iconify(&_titlebar),
- _button_max(&_titlebar),
- _button_stick(&_titlebar),
- _label(&_titlebar),
+ _button_close(&_titlebar, OBWidget::Type_CloseButton),
+ _button_iconify(&_titlebar, OBWidget::Type_IconifyButton),
+ _button_max(&_titlebar, OBWidget::Type_MaximizeButton),
+ _button_stick(&_titlebar, OBWidget::Type_StickyButton),
+ _label(&_titlebar, OBWidget::Type_Label),
_handle(this, OBWidget::Type_Handle),
- _grip_left(&_handle),
- _grip_right(&_handle),
+ _grip_left(&_handle, OBWidget::Type_LeftGrip),
+ _grip_right(&_handle, OBWidget::Type_RightGrip),
_decorations(client->decorations())
{
assert(client);
assert(style);
otk::OtkWidget::setStyle(style);
- // set the grips' textures
- _grip_left.setTexture(style->getGripFocus());
- _grip_left.setUnfocusTexture(style->getGripUnfocus());
- _grip_left.setPressedFocusTexture(style->getGripFocus());
- _grip_left.setPressedUnfocusTexture(style->getGripUnfocus());
- _grip_right.setTexture(style->getGripFocus());
- _grip_right.setUnfocusTexture(style->getGripUnfocus());
- _grip_right.setPressedFocusTexture(style->getGripFocus());
- _grip_right.setPressedUnfocusTexture(style->getGripUnfocus());
// if a style was previously set, then 'replace' is true, cause we're
// replacing a style
// XXX: change when focus changes!
XSetWindowBorder(otk::OBDisplay::display, getWindow(),
_style->getBorderColor()->pixel());
- XSetWindowBorder(otk::OBDisplay::display, _grip_left.getWindow(),
- _style->getBorderColor()->pixel());
- XSetWindowBorder(otk::OBDisplay::display, _grip_right.getWindow(),
- _style->getBorderColor()->pixel());
// if !replace, then adjust() will get called after the client is grabbed!
if (replace) {
#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>
// decoration windows
OBBackgroundWidget _plate; // sits entirely under the client window
OBBackgroundWidget _titlebar;
- otk::OtkButton _button_close;
- otk::OtkButton _button_iconify;
- otk::OtkButton _button_max;
- otk::OtkButton _button_stick;
- otk::OtkFocusLabel _label;
+ OBButtonWidget _button_close;
+ OBButtonWidget _button_iconify;
+ OBButtonWidget _button_max;
+ OBButtonWidget _button_stick;
+ OBLabelWidget _label;
OBBackgroundWidget _handle;
- otk::OtkButton _grip_left;
- otk::OtkButton _grip_right;
+ OBButtonWidget _grip_left;
+ OBButtonWidget _grip_right;
//! The decorations to display on the window.
/*!