aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index fa4a29a..a01cc7a 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.107 2003/08/13 09:50:45 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.108 2003/08/13 15:28:24 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -269,10 +269,6 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
269 m_clock_theme.setAntialias(screen().antialias()); 269 m_clock_theme.setAntialias(screen().antialias());
270 m_iconbar_theme.setAntialias(screen().antialias()); 270 m_iconbar_theme.setAntialias(screen().antialias());
271 m_workspace_theme.setAntialias(screen().antialias()); 271 m_workspace_theme.setAntialias(screen().antialias());
272 // signal a change
273 m_clock_theme.reconfigSig().notify();
274 m_workspace_theme.reconfigSig().notify();
275 m_iconbar_theme.reconfigSig().notify();
276 272
277 // setup hide timer 273 // setup hide timer
278 m_hide_timer.setTimeout(Fluxbox::instance()->getAutoRaiseDelay()); 274 m_hide_timer.setTimeout(Fluxbox::instance()->getAutoRaiseDelay());
@@ -396,8 +392,8 @@ void Toolbar::reconfigure() {
396 392
397 393
398 394
399 frame.window.setBorderColor(theme().borderColor()); 395 frame.window.setBorderColor(theme().border().color());
400 frame.window.setBorderWidth(theme().borderWidth()); 396 frame.window.setBorderWidth(theme().border().width());
401 frame.window.clear(); 397 frame.window.clear();
402 398
403 if (theme().shape() && m_shape.get()) 399 if (theme().shape() && m_shape.get())
@@ -410,6 +406,7 @@ void Toolbar::reconfigure() {
410 // we're done with all resizing and stuff now we can request a new 406 // we're done with all resizing and stuff now we can request a new
411 // area to be reserved on screen 407 // area to be reserved on screen
412 updateStrut(); 408 updateStrut();
409
413} 410}
414 411
415 412
@@ -499,8 +496,8 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
499 *m_rc_placement = where; 496 *m_rc_placement = where;
500 int head_x = 0, 497 int head_x = 0,
501 head_y = 0, 498 head_y = 0,
502 head_w, 499 head_w = screen().width(),
503 head_h; 500 head_h = screen().height();
504 501
505#ifdef XINERAMA 502#ifdef XINERAMA
506 if (screen().hasXinerama()) { 503 if (screen().hasXinerama()) {
@@ -509,13 +506,8 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
509 head_y = screen().getHeadY(head); 506 head_y = screen().getHeadY(head);
510 head_w = screen().getHeadWidth(head); 507 head_w = screen().getHeadWidth(head);
511 head_h = screen().getHeadHeight(head); 508 head_h = screen().getHeadHeight(head);
512 } else
513#endif // XINERAMA
514 {
515 head_w = screen().width();
516 head_h = screen().height();
517 } 509 }
518 510#endif // XINERAMA
519 511
520 frame.width = head_w * (*m_rc_width_percent) / 100; 512 frame.width = head_w * (*m_rc_width_percent) / 100;
521 //!! TODO: change this 513 //!! TODO: change this
@@ -539,7 +531,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
539 frame.height += (frame.bevel_w * 2); 531 frame.height += (frame.bevel_w * 2);
540 532
541 int bevel_width = theme().bevelWidth(); 533 int bevel_width = theme().bevelWidth();
542 int border_width = theme().borderWidth(); 534 int border_width = theme().border().width();
543 535
544 // should we flipp sizes? 536 // should we flipp sizes?
545 if (isVertical()) { 537 if (isVertical()) {