aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-17 11:30:59 (GMT)
committerfluxgen <fluxgen>2003-05-17 11:30:59 (GMT)
commit0e1eb7484118cfec7d065022d1391651ca70d7be (patch)
treeeb3a41c7f2e3ca304c9dbcecf971826c9802f989 /src/Toolbar.cc
parent1d49072a767b6c3525906135330d1d715616574c (diff)
downloadfluxbox_pavel-0e1eb7484118cfec7d065022d1391651ca70d7be.zip
fluxbox_pavel-0e1eb7484118cfec7d065022d1391651ca70d7be.tar.bz2
fixed autohide bug on toolbar buttons
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 52c707a..2508ec9 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.83 2003/05/15 23:30:03 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.84 2003/05/17 11:30:59 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -235,6 +235,10 @@ Toolbar::Frame::Frame(FbTk::EventHandler &evh, int screen_num):
235 evm.add(evh, window_label); 235 evm.add(evh, window_label);
236 evm.add(evh, clock); 236 evm.add(evh, clock);
237 237
238 psbutton.setMouseMotionHandler(&evh);
239 nsbutton.setMouseMotionHandler(&evh);
240 pwbutton.setMouseMotionHandler(&evh);
241 nwbutton.setMouseMotionHandler(&evh);
238} 242}
239 243
240Toolbar::Frame::~Frame() { 244Toolbar::Frame::~Frame() {
@@ -287,6 +291,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
287 m_clock_timer.setTimeout(delay); 291 m_clock_timer.setTimeout(delay);
288 m_clock_timer.start(); 292 m_clock_timer.start();
289 293
294 m_theme.font().setAntialias(screen().antialias());
295
290 hide_handler.toolbar = this; 296 hide_handler.toolbar = this;
291 m_hide_timer.setTimeout(Fluxbox::instance()->getAutoRaiseDelay()); 297 m_hide_timer.setTimeout(Fluxbox::instance()->getAutoRaiseDelay());
292 m_hide_timer.fireOnce(true); 298 m_hide_timer.fireOnce(true);
@@ -300,9 +306,6 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
300 306
301 m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); 307 m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font()));
302 308
303 XMapSubwindows(display, frame.window.window());
304 frame.window.show();
305
306 // finaly: setup Commands for the buttons in the frame 309 // finaly: setup Commands for the buttons in the frame
307 typedef FbTk::SimpleCommand<BScreen> ScreenCmd; 310 typedef FbTk::SimpleCommand<BScreen> ScreenCmd;
308 FbTk::RefCount<FbTk::Command> nextworkspace(new ScreenCmd(screen(), 311 FbTk::RefCount<FbTk::Command> nextworkspace(new ScreenCmd(screen(),
@@ -318,9 +321,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
318 frame.pwbutton.setOnClick(prevwindow); 321 frame.pwbutton.setOnClick(prevwindow);
319 frame.nwbutton.setOnClick(nextwindow); 322 frame.nwbutton.setOnClick(nextwindow);
320 323
321 324 frame.window.showSubwindows();
322 reconfigure(); 325 frame.window.show();
323
324} 326}
325 327
326 328