summaryrefslogtreecommitdiff
path: root/src/Basemenu.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Basemenu.cc')
-rw-r--r--src/Basemenu.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 32b1585..659d4d7 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.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: Basemenu.cc,v 1.5 2002/01/09 14:11:20 fluxgen Exp $ 25// $Id: Basemenu.cc,v 1.6 2002/01/11 09:26:33 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -58,7 +58,7 @@ Basemenu::Basemenu(BScreen *scrn) {
58 image_ctrl = screen->getImageControl(); 58 image_ctrl = screen->getImageControl();
59 display = fluxbox->getXDisplay(); 59 display = fluxbox->getXDisplay();
60 parent = (Basemenu *) 0; 60 parent = (Basemenu *) 0;
61 alignment = AlignDontCare; 61 alignment = ALIGNDONTCARE;
62 62
63 title_vis = 63 title_vis =
64 movable = 64 movable =
@@ -556,7 +556,7 @@ void Basemenu::drawSubmenu(int index) {
556 x = menu.x + 556 x = menu.x +
557 ((menu.item_w * (sbl + 1)) + screen->getBorderWidth()), y; 557 ((menu.item_w * (sbl + 1)) + screen->getBorderWidth()), y;
558 558
559 if (alignment == AlignTop) { 559 if (alignment == ALIGNTOP) {
560 y = (((shifted) ? menu.y_shift : menu.y) + 560 y = (((shifted) ? menu.y_shift : menu.y) +
561 ((title_vis) ? menu.title_h + screen->getBorderWidth() : 0) - 561 ((title_vis) ? menu.title_h + screen->getBorderWidth() : 0) -
562 ((item->submenu()->title_vis) ? 562 ((item->submenu()->title_vis) ?
@@ -569,7 +569,7 @@ void Basemenu::drawSubmenu(int index) {
569 item->submenu()->menu.title_h + screen->getBorderWidth() : 0)); 569 item->submenu()->menu.title_h + screen->getBorderWidth() : 0));
570 } 570 }
571 571
572 if (alignment == AlignBottom && 572 if (alignment == ALIGNBOTTOM &&
573 (y + item->submenu()->menu.height) > ((shifted) ? menu.y_shift : 573 (y + item->submenu()->menu.height) > ((shifted) ? menu.y_shift :
574 menu.y) + menu.height) { 574 menu.y) + menu.height) {
575 y = (((shifted) ? menu.y_shift : menu.y) + 575 y = (((shifted) ? menu.y_shift : menu.y) +
@@ -675,7 +675,7 @@ void Basemenu::drawItem(int index, Bool highlight, Bool clear,
675 675
676 sel_x = item_x; 676 sel_x = item_x;
677 677
678 if (screen->getMenuStyle()->bullet_pos == Right) 678 if (screen->getMenuStyle()->bullet_pos == RIGHT)
679 sel_x += (menu.item_w - menu.item_h - menu.bevel_w); 679 sel_x += (menu.item_w - menu.item_h - menu.bevel_w);
680 680
681 sel_x += quarter_w; 681 sel_x += quarter_w;
@@ -744,14 +744,14 @@ void Basemenu::drawItem(int index, Bool highlight, Bool clear,
744 744
745 if (dosel && item->submenu()) { 745 if (dosel && item->submenu()) {
746 switch (screen->getMenuStyle()->bullet) { 746 switch (screen->getMenuStyle()->bullet) {
747 case Square: 747 case SQUARE:
748 XDrawRectangle(display, menu.frame, gc, sel_x, sel_y, half_w, half_w); 748 XDrawRectangle(display, menu.frame, gc, sel_x, sel_y, half_w, half_w);
749 break; 749 break;
750 750
751 case Triangle: 751 case TRIANGLE:
752 XPoint tri[3]; 752 XPoint tri[3];
753 753
754 if (screen->getMenuStyle()->bullet_pos == Right) { 754 if (screen->getMenuStyle()->bullet_pos == RIGHT) {
755 tri[0].x = sel_x + quarter_w - 2; 755 tri[0].x = sel_x + quarter_w - 2;
756 tri[0].y = sel_y + quarter_w - 2; 756 tri[0].y = sel_y + quarter_w - 2;
757 tri[1].x = 4; 757 tri[1].x = 4;
@@ -771,7 +771,7 @@ void Basemenu::drawItem(int index, Bool highlight, Bool clear,
771 CoordModePrevious); 771 CoordModePrevious);
772 break; 772 break;
773 773
774 case Diamond: 774 case DIAMOND:
775 XPoint dia[4]; 775 XPoint dia[4];
776 776
777 dia[0].x = sel_x + quarter_w - 3; 777 dia[0].x = sel_x + quarter_w - 3;