pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

listbox rewrite done
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
Nishi 2026-04-18 19:40:28 +09:00
commit 55c562645a
Signed by: nishi
GPG key ID: 27EF69B208EB9343
6 changed files with 77 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/widget/combobox.c
View file

@ -125,7 +125,7 @@ static void click(MwWidget handle) {
MwLLSetCursor(((MwListBox)cb->listbox->internal)->frame->lowlevel, &MwCursorArrow, &MwCursorArrowMask);
for(i = 0; i < arrlen(cb->list); i++) {
MwListBoxInsert(cb->listbox, -1, 0, cb->list[i]);
MwListBoxSet(cb->listbox, -1, 0, cb->list[i]);
}
MwAddUserHandler(cb->listbox, MwNlistBoxActivateHandler, listbox_activate, NULL);

67
src/widget/listbox.c
View file

@ -387,18 +387,64 @@ static void prop_change(MwWidget handle, const char* prop) {
}
}
static void mwListBoxInsertImpl(MwWidget handle, int row, int col, const char* text) {
static void redrawIfNeeded(MwWidget handle, int row) {
MwListBox lb = handle->internal;
int old;
if(row == -1) row = arrlen(lb->list);
old = row;
resize(handle);
if(old < (MwGetInteger(lb->vscroll, MwNvalue) + MwGetInteger(lb->vscroll, MwNareaShown))) {
if(MwGetInteger(lb->vscroll, MwNvalue) <= row && row <= (MwGetInteger(lb->vscroll, MwNvalue) + MwGetInteger(lb->vscroll, MwNareaShown))) {
MwForceRender(lb->frame);
}
}
static int mwListBoxSetImpl(MwWidget handle, int row, int col, const char* text) {
MwListBox lb = handle->internal;
MwListBoxEntry entry;
char* t = text == NULL ? NULL : MwStringDuplicate(text);
if(row == -1) row = arrlen(lb->list);
entry.name = NULL;
entry.pixmap = NULL;
if(row < arrlen(lb->list)) {
entry = lb->list[row];
}
if(col == -1) col = arrlen(entry.name);
arrins(entry.name, col, t);
if(row < arrlen(lb->list)) {
lb->list[row] = entry;
} else {
arrins(lb->list, row, entry);
}
if(row >= arrlen(lb->list)) resize(handle);
redrawIfNeeded(handle, row);
return row;
}
static void mwListBoxSetIconImpl(MwWidget handle, int index, MwLLPixmap icon) {
MwListBox lb = handle->internal;
MwListBoxEntry entry;
if(index == -1) index = arrlen(lb->list);
entry.name = NULL;
entry.pixmap = NULL;
if(index < arrlen(lb->list)) {
entry = lb->list[index];
}
entry.pixmap = icon;
if(index < arrlen(lb->list)) {
lb->list[index] = entry;
} else {
arrins(lb->list, index, entry);
}
if(index >= arrlen(lb->list)) resize(handle);
redrawIfNeeded(handle, index);
}
static void mwListBoxDeleteImpl(MwWidget handle, int index) {
MwListBox lb = handle->internal;
int i;
@ -496,11 +542,16 @@ static void func_handler(MwWidget handle, const char* name, void* out, va_list v
int alignment = va_arg(va, int);
mwListBoxSetAlignmentImpl(handle, index, alignment);
}
if(strcmp(name, "mwListBoxInsert") == 0) {
if(strcmp(name, "mwListBoxSet") == 0) {
int row = va_arg(va, int);
int col = va_arg(va, int);
const char* text = va_arg(va, const char*);
mwListBoxInsertImpl(handle, row, col, text);
*(int*)out = mwListBoxSetImpl(handle, row, col, text);
}
if(strcmp(name, "mwListBoxSetIcon") == 0) {
int index = va_arg(va, int);
MwLLPixmap icon = va_arg(va, MwLLPixmap);
mwListBoxSetIconImpl(handle, index, icon);
}
}