diff options
author | fluxgen <fluxgen> | 2003-08-15 15:29:10 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-15 15:29:10 (GMT) |
commit | 1cfe7255424250c3922146652014b2bd93149e86 (patch) | |
tree | b867ee83c89e32d4a55ab850cb59feb7fdae8016 | |
parent | 069c236df9bdd7c1110cd264393850ee6a0b1e46 (diff) | |
download | fluxbox-1cfe7255424250c3922146652014b2bd93149e86.zip fluxbox-1cfe7255424250c3922146652014b2bd93149e86.tar.bz2 |
minor bug fix
-rw-r--r-- | src/Toolbar.cc | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 5e5a74d..5dd83e5 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.109 2003/08/15 13:51:43 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.110 2003/08/15 15:29:10 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -504,6 +504,20 @@ void Toolbar::update(FbTk::Subject *subj) { | |||
504 | } | 504 | } |
505 | 505 | ||
506 | void Toolbar::setPlacement(Toolbar::Placement where) { | 506 | void Toolbar::setPlacement(Toolbar::Placement where) { |
507 | // disable vertical toolbar | ||
508 | switch (where) { | ||
509 | case LEFTTOP: | ||
510 | case LEFTCENTER: | ||
511 | case LEFTBOTTOM: | ||
512 | case RIGHTTOP: | ||
513 | case RIGHTCENTER: | ||
514 | case RIGHTBOTTOM: | ||
515 | where = BOTTOMCENTER; | ||
516 | break; | ||
517 | default: | ||
518 | break; | ||
519 | } | ||
520 | |||
507 | *m_rc_placement = where; | 521 | *m_rc_placement = where; |
508 | int head_x = 0, | 522 | int head_x = 0, |
509 | head_y = 0, | 523 | head_y = 0, |
@@ -748,11 +762,11 @@ void Toolbar::setupMenus() { | |||
748 | Toolbar::Placement placement; | 762 | Toolbar::Placement placement; |
749 | } place_menu[] = { | 763 | } place_menu[] = { |
750 | {0, 0, "Top Left", Toolbar::TOPLEFT}, | 764 | {0, 0, "Top Left", Toolbar::TOPLEFT}, |
751 | /* | 765 | |
752 | {0, 0, "Left Top", Toolbar::LEFTTOP}, | 766 | {0, 0, "Left Top", Toolbar::LEFTTOP}, |
753 | {0, 0, "Left Center", Toolbar::LEFTCENTER}, | 767 | {0, 0, "Left Center", Toolbar::LEFTCENTER}, |
754 | {0, 0, "Left Bottom", Toolbar::LEFTBOTTOM}, | 768 | {0, 0, "Left Bottom", Toolbar::LEFTBOTTOM}, |
755 | */ | 769 | |
756 | {0, 0, "Bottom Left", Toolbar::BOTTOMLEFT}, | 770 | {0, 0, "Bottom Left", Toolbar::BOTTOMLEFT}, |
757 | {0, 0, "Top Center", Toolbar::TOPCENTER}, | 771 | {0, 0, "Top Center", Toolbar::TOPCENTER}, |
758 | {0, 0, 0, Toolbar::TOPCENTER}, | 772 | {0, 0, 0, Toolbar::TOPCENTER}, |
@@ -760,11 +774,11 @@ void Toolbar::setupMenus() { | |||
760 | {0, 0, 0, Toolbar::BOTTOMCENTER}, | 774 | {0, 0, 0, Toolbar::BOTTOMCENTER}, |
761 | {0, 0, "Bottom Center", Toolbar::BOTTOMCENTER}, | 775 | {0, 0, "Bottom Center", Toolbar::BOTTOMCENTER}, |
762 | {0, 0, "Top Right", Toolbar::TOPRIGHT}, | 776 | {0, 0, "Top Right", Toolbar::TOPRIGHT}, |
763 | /* | 777 | |
764 | {0, 0, "Right Top", Toolbar::RIGHTTOP}, | 778 | {0, 0, "Right Top", Toolbar::RIGHTTOP}, |
765 | {0, 0, "Right Center", Toolbar::RIGHTCENTER}, | 779 | {0, 0, "Right Center", Toolbar::RIGHTCENTER}, |
766 | {0, 0, "Right Bottom", Toolbar::RIGHTBOTTOM}, | 780 | {0, 0, "Right Bottom", Toolbar::RIGHTBOTTOM}, |
767 | */ | 781 | |
768 | {0, 0, "Bottom Right", Toolbar::BOTTOMRIGHT} | 782 | {0, 0, "Bottom Right", Toolbar::BOTTOMRIGHT} |
769 | }; | 783 | }; |
770 | tbar.placementMenu().setMinimumSublevels(3); | 784 | tbar.placementMenu().setMinimumSublevels(3); |