aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-06-07 21:36:06 (GMT)
committerfluxgen <fluxgen>2004-06-07 21:36:06 (GMT)
commit3e52976eacb826bcb6651d7e7501468dd30f0b62 (patch)
treeac4323393e12fba1fd262bf07b198aab7127bf14
parentaaa72eada26a8e63ea685d940332bf2fd4795df8 (diff)
downloadfluxbox-3e52976eacb826bcb6651d7e7501468dd30f0b62.zip
fluxbox-3e52976eacb826bcb6651d7e7501468dd30f0b62.tar.bz2
minor fix
-rw-r--r--src/Slit.cc15
-rw-r--r--src/Toolbar.cc4
-rw-r--r--src/Toolbar.hh5
3 files changed, 13 insertions, 11 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 4157178..ecb0142 100644
--- a/src/Slit.cc
+++ b/src/Slit.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: Slit.cc,v 1.95 2004/06/07 11:46:04 rathnor Exp $ 25// $Id: Slit.cc,v 1.96 2004/06/07 21:36:06 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -247,12 +247,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
247 m_clientlist_menu(scr.menuTheme(), 247 m_clientlist_menu(scr.menuTheme(),
248 scr.imageControl(), 248 scr.imageControl(),
249 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 249 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
250 m_layermenu(new LayerMenu<Slit>(scr.menuTheme(), 250 //For KDE dock applets
251 scr.imageControl(),
252 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
253 this,
254 true)),
255 //For KDE dock applets
256 m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), 251 m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(),
257 "KWM_DOCKWINDOW", False)), //KDE v1.x 252 "KWM_DOCKWINDOW", False)), //KDE v1.x
258 m_kwm2_dockwindow(XInternAtom(FbTk::App::instance()->display(), 253 m_kwm2_dockwindow(XInternAtom(FbTk::App::instance()->display(),
@@ -316,6 +311,12 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
316 311
317 frame.window.setAlpha(*m_rc_alpha); 312 frame.window.setAlpha(*m_rc_alpha);
318 m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer)); 313 m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer));
314 m_layermenu.reset(new LayerMenu<Slit>(scr.menuTheme(),
315 scr.imageControl(),
316 *scr.layerManager().
317 getLayer(Fluxbox::instance()->getMenuLayer()),
318 this,
319 true));
319 moveToLayer((*m_rc_layernum).getNum()); 320 moveToLayer((*m_rc_layernum).getNum());
320 321
321 if (m_layermenu.get()) 322 if (m_layermenu.get())
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 5d74b3c..fae3142 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.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: Toolbar.cc,v 1.140 2004/06/07 11:46:04 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.141 2004/06/07 21:32:12 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -191,6 +191,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
191 frame(*this, scrn.screenNumber()), 191 frame(*this, scrn.screenNumber()),
192 m_window_pm(0), 192 m_window_pm(0),
193 m_screen(scrn), 193 m_screen(scrn),
194 m_layeritem(frame.window, layer),
194 m_layermenu(scrn.menuTheme(), 195 m_layermenu(scrn.menuTheme(),
195 scrn.imageControl(), 196 scrn.imageControl(),
196 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 197 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
@@ -203,7 +204,6 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
203 scrn.imageControl(), 204 scrn.imageControl(),
204 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 205 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
205 m_theme(scrn.screenNumber()), 206 m_theme(scrn.screenNumber()),
206 m_layeritem(frame.window, layer),
207 m_tool_factory(scrn), 207 m_tool_factory(scrn),
208 m_strut(0), 208 m_strut(0),
209 // lock rcmanager here 209 // lock rcmanager here
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 2ff3a02..5a00855 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -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: Toolbar.hh,v 1.52 2003/12/20 19:04:45 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.53 2004/06/07 21:32:11 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -160,6 +160,7 @@ private:
160 160
161 FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar 161 FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar
162 162
163 FbTk::XLayerItem m_layeritem; ///< layer item, must be declared before layermenu
163 LayerMenu<Toolbar> m_layermenu; 164 LayerMenu<Toolbar> m_layermenu;
164 FbMenu m_placementmenu, m_toolbarmenu; 165 FbMenu m_placementmenu, m_toolbarmenu;
165 166
@@ -167,7 +168,7 @@ private:
167 // themes 168 // themes
168 ToolbarTheme m_theme; 169 ToolbarTheme m_theme;
169 170
170 FbTk::XLayerItem m_layeritem; 171
171 typedef std::list<ToolbarItem *> ItemList; 172 typedef std::list<ToolbarItem *> ItemList;
172 ItemList m_item_list; 173 ItemList m_item_list;
173 174