X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fappwidget.cc;h=afb86c0bb6a859e564ae9775abdd195a315382f6;hb=67fbe8354f27386235e0c8dc57bd036e34a4fe5e;hp=d1ae736959e4a3507c0ecba69c43df290ef9167c;hpb=c7e157e53c862140858230b2b23aeb39f9f9c1ed;p=chaz%2Fopenbox diff --git a/otk/appwidget.cc b/otk/appwidget.cc index d1ae7369..afb86c0b 100644 --- a/otk/appwidget.cc +++ b/otk/appwidget.cc @@ -15,26 +15,32 @@ extern "C" { namespace otk { AppWidget::AppWidget(Application *app, Direction direction, - Cursor cursor, int bevel_width) + Cursor cursor, int bevel_width) : Widget(app, app->getStyle(), direction, cursor, bevel_width), _application(app) { assert(app); - _wm_protocols = Property::atoms.wm_protocols; - _wm_delete = Property::atoms.wm_protocols; - // set WM Protocols on the window Atom protocols[2]; - protocols[0] = _wm_protocols; - protocols[1] = _wm_delete; + protocols[0] = Property::atoms.wm_protocols; + protocols[1] = Property::atoms.wm_delete_window; XSetWMProtocols(**display, window(), protocols, 2); + + setStyle(_style); } AppWidget::~AppWidget() { } +void AppWidget::setStyle(RenderStyle *style) +{ + Widget::setStyle(style); + + setTexture(style->titlebarUnfocusBackground()); +} + void AppWidget::show(void) { Widget::show(true); @@ -52,8 +58,8 @@ void AppWidget::hide(void) void AppWidget::clientMessageHandler(const XClientMessageEvent &e) { EventHandler::clientMessageHandler(e); - if (e.message_type == _wm_protocols && - static_cast(e.data.l[0]) == _wm_delete) + if (e.message_type == Property::atoms.wm_protocols && + static_cast(e.data.l[0]) == Property::atoms.wm_delete_window) hide(); }