gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-03 14:55:46 +01:00
Code Issues Projects Releases Wiki Activity

fixed misc bugs

Browse Source
This commit is contained in:
kojima
2000-04-02 00:04:06 +00:00
parent ead4f5d3e1
commit 449a5fde76
9 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/WUtil.h
View File

@@ -366,7 +366,7 @@ WMBag *WMCreateTreeBagWithDestructor(void (*destructor)(void*));
/* this is slow */
/* erase will remove the element from the bag,
* but will keep the index of the other elements unchanged */
#define WMEraseFromBag(bag, index) bag->func.deleteFromBag(bag, index)
#define WMEraseFromBag(bag, index) bag->func.eraseFromBag(bag, index)
/* delete and remove will remove the elements and cause the elements
* after them to decrement their indexes by 1 */

2
WINGs/wbrowser.c
View File

@@ -457,7 +457,7 @@ WMInsertBrowserItem(WMBrowser *bPtr, int column, int row, char *text,
if (column < 0 || column >= bPtr->columnCount)
return NULL;
item = WMInsertListItem(bPtr->columns[column], row, text);
item->isBranch = isBranch;

12
WINGs/wlist.c
View File

@@ -170,6 +170,8 @@ WMInsertListItem(WMList *lPtr, int row, char *text)
&& row >= 0)
lPtr->selectedItem++;
row = WMIN(row, WMGetBagItemCount(lPtr->items));
if (row < 0)
WMPutInBag(lPtr->items, item);
else
@@ -203,7 +205,7 @@ WMRemoveListItem(WMList *lPtr, int row)
} else if (lPtr->selectedItem > row) {
lPtr->selectedItem--;
}
if (row <= lPtr->topItem+lPtr->fullFitLines+lPtr->flags.dontFitAll)
lPtr->topItem--;
if (lPtr->topItem < 0)
@@ -455,9 +457,7 @@ paintItem(List *lPtr, int index)
int width, height, x, y;
WMListItem *itemPtr;
itemPtr = WMGetFromBag(lPtr->items, index);
width = lPtr->view->size.width - 2 - 19;
height = lPtr->itemHeight;
@@ -486,8 +486,8 @@ paintItem(List *lPtr, int index)
&rect);
} else {
if (itemPtr->selected)
XFillRectangle(scr->display, view->window, WMColorGC(scr->white), x, y,
width, height);
XFillRectangle(scr->display, view->window, WMColorGC(scr->white),
x, y, width, height);
else
XClearArea(scr->display, view->window, x, y, width, height, False);
@@ -620,6 +620,8 @@ WMSelectListItem(WMList *lPtr, int row)
else
notify = 1;
assert(lPtr->selectedItem < WMGetBagItemCount(lPtr->items));
if (!lPtr->flags.allowMultipleSelection) {
/* unselect previous selected item */
if (lPtr->selectedItem >= 0) {