nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-07 09:59:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

icon

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

2
examples/basic/listbox.c
View File

@@ -26,7 +26,7 @@ int main() {
lb = MwCreateWidget(MwListBoxClass, "listbox", wmain, 5, 5, 630, 470); lb = MwCreateWidget(MwListBoxClass, "listbox", wmain, 5, 5, 630, 470);
MwAddUserHandler(lb, MwNactivateHandler, activate, NULL); MwAddUserHandler(lb, MwNactivateHandler, activate, NULL);
MwListBoxInsertMultiple(lb, -1, (char**)harvard, sizeof(harvard) / sizeof(harvard[0]) - 1); MwListBoxInsertMultiple(lb, -1, (char**)harvard, NULL, sizeof(harvard) / sizeof(harvard[0]) - 1);
MwLoop(wmain); MwLoop(wmain);
} }

6
include/Mw/Widget/ListBox.h
View File

@@ -24,17 +24,19 @@ MWDECL MwClass MwListBoxClass;
* %param handle Widget * %param handle Widget
* %param index Index * %param index Index
* %param text Text * %param text Text
* %param pixmap Pixmap
*/ */
MWDECL void MwListBoxInsert(MwWidget handle, int index, const char* text); MWDECL void MwListBoxInsert(MwWidget handle, int index, const char* text, MwLLPixmap pixmap);
/*! /*!
* %brief Inserts multiple items on the listbox * %brief Inserts multiple items on the listbox
* %param handle Widget * %param handle Widget
* %param index Index * %param index Index
* %param text Text * %param text Text
* %param pixmap Pixmap
* %param count Count * %param count Count
*/ */
MWDECL void MwListBoxInsertMultiple(MwWidget handle, int index, char** text, int count); MWDECL void MwListBoxInsertMultiple(MwWidget handle, int index, char** text, MwLLPixmap* pixmap, int count);
/*! /*!
* %brief Deletes item from the listbox * %brief Deletes item from the listbox

17
src/widget/listbox.c
View File

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