X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.cc;h=90d5e458ebcdc8e21b56fd0e47ff1e0c9f2eb037;hb=a0c7fe1f1203006558ee09c8d9045d552e73cc7e;hp=775d49a882983f87e8b737c0cc7a22d0219a6c3a;hpb=90dbcb271c5e6d7ca73c19a519b93885b833db0a;p=chaz%2Fopenbox diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 775d49a8..90d5e458 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.cc @@ -86,8 +86,7 @@ Basemenu::Basemenu(BScreen *scrn) { menu.frame_pixmap = menu.title_pixmap = - menu.hilite_pixmap = - menu.sel_pixmap = None; + menu.hilite_pixmap = None; menu.bevel_w = screen->getBevelWidth(); @@ -152,7 +151,7 @@ Basemenu::~Basemenu(void) { MenuItems::const_iterator it = menuitems.begin(); while (it != menuitems.end()) { BasemenuItem *item = *it; - if ((! internal_menu)) { + if (! internal_menu) { Basemenu *tmp = (Basemenu *) item->submenu(); if (tmp) { if (! tmp->internal_menu) { @@ -176,9 +175,6 @@ Basemenu::~Basemenu(void) { if (menu.hilite_pixmap) image_ctrl->removeImage(menu.hilite_pixmap); - if (menu.sel_pixmap) - image_ctrl->removeImage(menu.sel_pixmap); - blackbox->removeMenuSearch(menu.title); XDestroyWindow(display, menu.title); @@ -228,7 +224,7 @@ int Basemenu::remove(int index) { BasemenuItem *item = find(index); if (! item) return -1; - if ((! internal_menu)) { + if (! internal_menu) { Basemenu *tmp = (Basemenu *) item->submenu(); if (tmp) { if (! tmp->internal_menu) { @@ -254,7 +250,8 @@ int Basemenu::remove(int index) { void Basemenu::update(void) { MenuStyle *style = screen->getMenuStyle(); - menu.item_h = style->f_font->height() + menu.bevel_w; + menu.item_h = (style->f_font->height() < 9 ? 9 : style->f_font->height()) + + menu.bevel_w; // 9 for the menu pixmaps (checkmarks) menu.title_h = style->t_font->height() + menu.bevel_w * 2; if (title_vis) { @@ -341,16 +338,6 @@ void Basemenu::update(void) { } if (tmp) image_ctrl->removeImage(tmp); - tmp = menu.sel_pixmap; - if (texture->texture() == (BTexture::Flat | BTexture::Solid)) { - menu.sel_pixmap = None; - } else { - int hw = menu.item_h / 2; - menu.sel_pixmap = - image_ctrl->renderImage(hw, hw, *texture); - } - if (tmp) image_ctrl->removeImage(tmp); - XResizeWindow(display, menu.window, menu.width, menu.height); if (title_vis) @@ -399,10 +386,10 @@ void Basemenu::show(void) { void Basemenu::hide(void) { - if ((! torn) && hide_tree && parent && parent->isVisible()) { + if (! torn && hide_tree && parent && parent->isVisible()) { Basemenu *p = parent; - while (p->isVisible() && (! p->torn) && p->parent) p = p->parent; + while (p->isVisible() && ! p->torn && p->parent) p = p->parent; p->internal_hide(); } else { internal_hide(); @@ -415,7 +402,7 @@ void Basemenu::internal_hide(void) { if (tmp) tmp->submenu()->internal_hide(); - if (parent && (! torn)) { + if (parent && ! torn) { parent->drawItem(parent->which_sub, False, True); parent->which_sub = -1; @@ -539,12 +526,12 @@ void Basemenu::drawItem(int index, bool highlight, bool clear, BasemenuItem *item = find(index); if (! item) return; - bool dotext = True, dohilite = True, dosel = True; + bool dotext = True, dohilite = True, dosel = True, dooppsel = True; const char *text = item->label(); int sbl = index / menu.persub, i = index - (sbl * menu.persub); int item_x = (sbl * menu.item_w), item_y = (i * menu.item_h); int hilite_x = item_x, hilite_y = item_y, hoff_x = 0, hoff_y = 0; - int text_x = 0, text_y = 0, sel_x = 0, sel_y = 0; + int text_x = 0, text_y = 0, sel_x = 0, oppsel_x = 0, sel_y = 0; unsigned int hilite_w = menu.item_w, hilite_h = menu.item_h, text_w = 0, text_h = 0; unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4; @@ -571,14 +558,22 @@ void Basemenu::drawItem(int index, bool highlight, bool clear, } MenuStyle *style = screen->getMenuStyle(); - BPen pen((highlight || item->isSelected()) ? style->h_text : style->f_text), - hipen(style->hilite.color()); + BPen hipen(style->hilite.color()); + // match the text color + BPen pen((highlight ? style->h_text : + (item->isEnabled() ? style->f_text : + style->d_text))); sel_x = item_x; if (screen->getMenuStyle()->bullet_pos == Right) sel_x += (menu.item_w - menu.item_h - menu.bevel_w); sel_x += quarter_w; + oppsel_x = sel_x; + if (screen->getMenuStyle()->bullet_pos == Right) + oppsel_x -= (menu.item_w - menu.item_h - menu.bevel_w); + else + oppsel_x += (menu.item_w - menu.item_h - menu.bevel_w); sel_y = item_y + quarter_w; if (clear) { @@ -608,6 +603,12 @@ void Basemenu::drawItem(int index, bool highlight, bool clear, if (! (max(sel_x, x) <= min(sel_x + half_w, x + w) && max(sel_y, y) <= min(sel_y + half_w, y + h))) dosel = False; + + // check if we need to redraw the select pixmap/menu bullet + // on the opposite side of the menu + if (! (max(oppsel_x, x) <= min(oppsel_x + half_w, x + w) && + max(sel_y, y) <= min(sel_y + half_w, y + h))) + dooppsel = False; } if (dohilite && highlight && (menu.hilite_pixmap != ParentRelative)) { @@ -618,13 +619,32 @@ void Basemenu::drawItem(int index, bool highlight, bool clear, else XFillRectangle(display, menu.frame, hipen.gc(), hilite_x, hilite_y, hilite_w, hilite_h); - } else if (dosel && item->isSelected() && - (menu.sel_pixmap != ParentRelative)) { - if (menu.sel_pixmap) - XCopyArea(display, menu.sel_pixmap, menu.frame, hipen.gc(), 0, 0, - half_w, half_w, sel_x, sel_y); - else - XFillRectangle(display, menu.frame, hipen.gc(), sel_x, sel_y, half_w, half_w); + } + + if (dooppsel && item->isSelected()) { + XPoint pts[6]; + + pts[0].x = oppsel_x + 0; + pts[0].y = sel_y + 2; + + pts[1].x = 0; + pts[1].y = 3; + + pts[2].x = 2; + pts[2].y = 3; + + pts[3].x = 5; + pts[3].y = -5; + + + pts[4].x = 0; + pts[4].y = -3; + + pts[5].x = -5; + pts[5].y = 5; + + XFillPolygon(display, menu.frame, pen.gc(), pts, 6, Nonconvex, + CoordModePrevious); } if (dotext && text) { @@ -798,7 +818,7 @@ void Basemenu::motionNotifyEvent(XMotionEvent *me) { if (me->window == menu.title && (me->state & Button1Mask)) { if (movable) { if (! moving) { - if (parent && (! torn)) { + if (parent && ! torn) { parent->drawItem(parent->which_sub, False, True); parent->which_sub = -1; } @@ -817,7 +837,7 @@ void Basemenu::motionNotifyEvent(XMotionEvent *me) { drawSubmenu(which_sub); } } - } else if ((! (me->state & Button1Mask)) && me->window == menu.frame && + } else if (! (me->state & Button1Mask) && me->window == menu.frame && me->x >= 0 && me->x < static_cast(menu.width) && me->y >= 0 && me->y < static_cast(menu.frame_h)) { int sbl = (me->x / menu.item_w), i = (me->y / menu.item_h), @@ -832,7 +852,7 @@ void Basemenu::motionNotifyEvent(XMotionEvent *me) { drawItem(p, False, True); if (item->submenu()) if (item->submenu()->isVisible() && - (! item->submenu()->isTorn())) { + ! item->submenu()->isTorn()) { item->submenu()->internal_hide(); which_sub = -1; } @@ -916,7 +936,7 @@ void Basemenu::enterNotifyEvent(XCrossingEvent *ce) { int sbl = (ce->x / menu.item_w), i = (ce->y / menu.item_h), w = (sbl * menu.persub) + i; - if (w != which_sub && (! tmp->submenu()->isTorn())) { + if (w != which_sub && ! tmp->submenu()->isTorn()) { tmp->submenu()->internal_hide(); drawItem(which_sub, False, True); @@ -962,6 +982,6 @@ void Basemenu::reconfigure(void) { void Basemenu::changeItemLabel(unsigned int index, const string& label) { BasemenuItem *item = find(index); - assert(item); - item->newLabel(label); + if (item) + item->newLabel(label); }