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) {
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) {
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) {
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();
if (tmp)
tmp->submenu()->internal_hide();
- if (parent && (! torn)) {
+ if (parent && ! torn) {
parent->drawItem(parent->which_sub, False, True);
parent->which_sub = -1;
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;
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) {
if (! (max(sel_x, x) <= min<signed>(sel_x + half_w, x + w) &&
max(sel_y, y) <= min<signed>(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<signed>(oppsel_x + half_w, x + w) &&
+ max(sel_y, y) <= min<signed>(sel_y + half_w, y + h)))
+ dooppsel = False;
}
if (dohilite && highlight && (menu.hilite_pixmap != ParentRelative)) {
hilite_x, hilite_y, hilite_w, hilite_h);
}
- if (dosel && item->isSelected()) {
+ if (dooppsel && item->isSelected()) {
XPoint pts[6];
- // put the check mark on the opposite side of the menu
- int x = sel_x;
- if (screen->getMenuStyle()->bullet_pos == Right)
- x -= (menu.item_w - menu.item_h - menu.bevel_w);
- else
- x += (menu.item_w - menu.item_h - menu.bevel_w);
-
- pts[0].x = x + 0;
+ pts[0].x = oppsel_x + 0;
pts[0].y = sel_y + 2;
pts[1].x = 0;
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;
}
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<signed>(menu.width) &&
me->y >= 0 && me->y < static_cast<signed>(menu.frame_h)) {
int sbl = (me->x / menu.item_w), i = (me->y / menu.item_h),
drawItem(p, False, True);
if (item->submenu())
if (item->submenu()->isVisible() &&
- (! item->submenu()->isTorn())) {
+ ! item->submenu()->isTorn()) {
item->submenu()->internal_hide();
which_sub = -1;
}
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);
void Basemenu::changeItemLabel(unsigned int index, const string& label) {
BasemenuItem *item = find(index);
- assert(item);
- item->newLabel(label);
+ if (item)
+ item->newLabel(label);
}