nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show the arrows in the alttab list box at the right times (they were one step behind)

Browse source
This commit is contained in:
Dana Jansens 2008-02-06 09:35:28 -05:00
parent e9eac7ce50
commit d81339c9cf
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
openbox/focus_cycle_popup.c
View file

@ -398,6 +398,42 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
/* reset the scrolling when the dialog is first shown */
p->scroll = 0;
/* find the height of the dialog */
h = t + b + (icon_rows * MAX(HILITE_SIZE, texth));
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
/* in icon mode the text sits below the icons, so make some space */
h += OUTSIDE_BORDER + texth;
/* find the focused target */
newtarget = NULL;
for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
const ObFocusCyclePopupTarget *target = it->data;
if (target->client == c) {
/* save the target */
newtarget = target;
break;
}
}
selected_pos = i;
g_assert(newtarget != NULL);
/* scroll the list if needed */
last_scroll = p->scroll;
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
const gint top = p->scroll + SCROLL_MARGIN;
const gint bottom = p->scroll + icon_rows - SCROLL_MARGIN;
const gint min_scroll = 0;
const gint max_scroll = p->n_targets - icon_rows;
if (top - selected_pos >= 0) {
p->scroll -= top - selected_pos + 1;
p->scroll = MAX(p->scroll, min_scroll);
} else if (selected_pos - bottom >= 0) {
p->scroll += selected_pos - bottom + 1;
p->scroll = MIN(p->scroll, max_scroll);
}
}
/* show the scroll arrows when appropriate */
if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
XMapWindow(obt_display, p->list_mode_up);
@ -413,12 +449,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
} else
XUnmapWindow(obt_display, p->list_mode_down);
/* find the height of the dialog */
h = t + b + (icon_rows * MAX(HILITE_SIZE, texth));
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
/* in icon mode the text sits below the icons, so make some space */
h += OUTSIDE_BORDER + texth;
else if (showing_arrows)
/* make space for the arrows */
if (showing_arrows)
h += ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
+ ob_rr_theme->down_arrow_mask->height + OUTSIDE_BORDER;
@ -476,37 +508,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
}
}
/* find the focused target */
newtarget = NULL;
for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
const ObFocusCyclePopupTarget *target = it->data;
if (target->client == c) {
/* save the target */
newtarget = target;
break;
}
}
selected_pos = i;
/* scroll the list if needed */
last_scroll = p->scroll;
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
const gint top = p->scroll + SCROLL_MARGIN;
const gint bottom = p->scroll + icon_rows - SCROLL_MARGIN;
const gint min_scroll = 0;
const gint max_scroll = p->n_targets - icon_rows;
if (top - selected_pos >= 0) {
p->scroll -= top - selected_pos + 1;
p->scroll = MAX(p->scroll, min_scroll);
} else if (selected_pos - bottom >= 0) {
p->scroll += selected_pos - bottom + 1;
p->scroll = MIN(p->scroll, max_scroll);
}
}
g_assert(newtarget != NULL);
/* * * draw everything * * */
/* draw the background */