aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-18 15:11:12 (GMT)
committerrathnor <rathnor>2003-02-18 15:11:12 (GMT)
commitb4ffe4fe21699c7123728aeeb99576a540b3694e (patch)
treef8a133be750f844f3c48f5a631fb8bf088544549 /src/Window.cc
parentaa602770fbbd4e84154028d3181d275b81ea914d (diff)
downloadfluxbox_pavel-b4ffe4fe21699c7123728aeeb99576a540b3694e.zip
fluxbox_pavel-b4ffe4fe21699c7123728aeeb99576a540b3694e.tar.bz2
Added layer menus for windows, toolbar, and slit, plus associated
resources. Cleaned up some cruft from the previous layering setup.
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc
index fab5d53..b7a28fa 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.119 2003/02/17 22:42:52 fluxgen Exp $ 25// $Id: Window.cc,v 1.120 2003/02/18 15:11:10 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -112,13 +112,20 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
112 display(0), 112 display(0),
113 lastButtonPressTime(0), 113 lastButtonPressTime(0),
114 m_windowmenu(menutheme, screen_num, imgctrl), 114 m_windowmenu(menutheme, screen_num, imgctrl),
115 m_layermenu(menutheme, screen_num, imgctrl), 115 m_layermenu(0),
116 old_decoration(DECOR_NORMAL), 116 old_decoration(DECOR_NORMAL),
117 tab(0), 117 tab(0),
118 m_frame(tm, imgctrl, screen_num, 0, 0, 100, 100), 118 m_frame(tm, imgctrl, screen_num, 0, 0, 100, 100),
119 m_layeritem(getFrameWindow(), layer), 119 m_layeritem(m_frame.window(), layer),
120 m_layernum(layer.getLayerNum()) { 120 m_layernum(layer.getLayerNum())
121{
121 122
123 m_layermenu = new LayerMenu<FluxboxWindow>(
124 menutheme,
125 screen_num,
126 imgctrl,
127 *s->layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
128 this);
122 129
123 130
124 // redirect events from frame to us 131 // redirect events from frame to us
@@ -354,6 +361,8 @@ FluxboxWindow::~FluxboxWindow() {
354 client.window_group = 0; 361 client.window_group = 0;
355 } 362 }
356 363
364 if (m_layermenu) delete m_layermenu;
365
357 if (client.window) 366 if (client.window)
358 fluxbox->removeWindowSearch(client.window); 367 fluxbox->removeWindowSearch(client.window);
359 368