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

icon

Browse source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@360 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
Nishi 2025-10-16 10:38:37 +00:00
commit ba4010eb52
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/widget/listbox.c
View file

@ -105,10 +105,11 @@ static void frame_draw(MwWidget handle) {
}
if(lb->pixmap_list[i] != NULL) {
MwRect r2;
int h = (lb->pixmap_list[i]->height > MwTextHeight(handle, "M")) ? MwTextHeight(handle, "M") : lb->pixmap_list[i]->height;
r2.x = MwDefaultBorderWidth;
r2.y = p.y + (MwTextHeight(handle, "M") - lb->pixmap_list[i]->height) / 2;
r2.width = lb->pixmap_list[i]->width;
r2.height = lb->pixmap_list[i]->height;
r2.y = p.y + (MwTextHeight(handle, "M") - h) / 2;
r2.width = h * lb->pixmap_list[i]->width / lb->pixmap_list[i]->height;
r2.height = h;
MwLLDrawPixmap(handle->lowlevel, &r2, lb->pixmap_list[i]);
}
p.y += MwTextHeight(handle, lb->list[i]) / 2;
@ -228,7 +229,7 @@ MwClassRec MwListBoxClassRec = {
NULL};
MwClass MwListBoxClass = &MwListBoxClassRec;
void MwListBoxInsert(MwWidget handle, int index, const char* text) {
void MwListBoxInsert(MwWidget handle, int index, const char* text, MwLLPixmap pixmap) {
char* str = malloc(strlen(text) + 1);
MwListBox lb = handle->internal;
@ -236,7 +237,7 @@ void MwListBoxInsert(MwWidget handle, int index, const char* text) {
if(index == -1) index = arrlen(lb->list);
arrins(lb->list, index, str);
arrins(lb->pixmap_list, index, NULL);
arrins(lb->pixmap_list, index, pixmap);
resize(handle);
if(index < (MwGetInteger(lb->vscroll, MwNvalue) + MwGetInteger(lb->vscroll, MwNareaShown))) {
@ -244,7 +245,7 @@ void MwListBoxInsert(MwWidget handle, int index, const char* text) {
}
}
void MwListBoxInsertMultiple(MwWidget handle, int index, char** text, int count) {
void MwListBoxInsertMultiple(MwWidget handle, int index, char** text, MwLLPixmap* pixmap, int count) {
int i;
MwListBox lb = handle->internal;
int old;
@ -256,7 +257,11 @@ void MwListBoxInsertMultiple(MwWidget handle, int index, char** text, int count)
strcpy(str, text[i]);
arrins(lb->list, index, str);
arrins(lb->pixmap_list, index, NULL);
if(pixmap == NULL) {
arrins(lb->pixmap_list, index, NULL);
} else {
arrins(lb->pixmap_list, index, pixmap[i]);
}
index++;
}