nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2025-12-31 06:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed to use MwNvalue

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@796 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-11-24 16:12:18 +00:00
parent 68495f968a
commit 8e1949ad12
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Mw/TypeDefs.h
View File

@@ -126,7 +126,6 @@ struct _MwListBox {
MwWidget vscroll;
MwWidget frame;
MwListBoxEntry* list;
int selected;
unsigned long click_time;
int pressed;
int* width;

7
src/dialog/filechooser.c
View File

@@ -68,9 +68,16 @@ static void cancel_window(MwWidget handle, void* user, void* call) {
}
static void okay(MwWidget handle, void* user, void* call) {
filechooser_t* fc = handle->parent->opaque;
char* p;
(void)user;
(void)call;
p = MwDirectoryJoin(fc->path, fc->sorted_entries[MwGetInteger(fc->files, MwNvalue)]->name);
MwDispatchUserHandler(handle->parent, MwNfileChosenHandler, p);
free(p);
destroy(handle->parent);
}

23
src/widget/listbox.c
View File

@@ -133,12 +133,13 @@ static void frame_mouse_down(MwWidget handle, void* user, void* call) {
for(i = 0; (st + i) < arrlen(lb->list) && i < (h - MwDefaultBorderWidth(handle) * 2) / (MwTextHeight(handle, "M") + Padding) + 2; i++) {
if(y <= m->point.y && m->point.y <= (y + MwTextHeight(handle, "M") + Padding)) {
unsigned long t;
int old = lb->selected;
int old = MwGetInteger(handle->parent, MwNvalue);
lb->selected = st + i;
MwSetInteger(handle->parent, MwNvalue, st + i);
if((((t = MwTimeGetTick()) - lb->click_time) < MwDoubleClickTimeout && old == st + i) || MwGetInteger(handle->parent, MwNsingleClickSelectable)) {
MwDispatchUserHandler(handle->parent, MwNactivateHandler, &lb->selected);
int n = MwGetInteger(handle->parent, MwNvalue);
MwDispatchUserHandler(handle->parent, MwNactivateHandler, &n);
}
lb->click_time = t;
@@ -177,7 +178,7 @@ static void frame_mouse_move(MwWidget handle, void* user, void* call) {
st = get_first_entry(handle->parent, lb);
for(i = 0; (st + i) < arrlen(lb->list) && i < (h - MwDefaultBorderWidth(handle) * 2) / (MwTextHeight(handle, "M") + Padding) + 2; i++) {
if(y <= p->y && p->y <= (y + MwTextHeight(handle, "M") + Padding)) {
lb->selected = st + i;
MwSetInteger(handle->parent, MwNvalue, st + i);
}
y += MwTextHeight(handle, "M") + Padding;
}
@@ -219,7 +220,7 @@ static void frame_draw(MwWidget handle) {
ent = area / MwTextHeight(handle, "M") + 2;
for(i = st; i < arrlen(lb->list) && i < st + ent; i++) {
int selected = lb->selected == i ? 1 : 0;
int selected = MwGetInteger(handle->parent, MwNvalue) == i ? 1 : 0;
int j;
if(selected) {
@@ -346,10 +347,10 @@ static int create(MwWidget handle) {
MwSetInteger(handle, MwNsingleClickSelectable, 0);
MwSetInteger(handle, MwNhasHeading, 0);
MwSetInteger(handle, MwNleftPadding, 0);
MwSetInteger(handle, MwNvalue, -1);
resize(handle);
lb->list = NULL;
lb->selected = -1;
lb->click_time = 0;
lb->width = NULL;
lb->alignment = NULL;
@@ -480,11 +481,11 @@ static void mwListBoxDeleteImpl(MwWidget handle, int index) {
arrfree(lb->list[index].name);
arrdel(lb->list, index);
if(lb->selected >= arrlen(lb->list)) {
lb->selected = arrlen(lb->list) - 1;
if(MwGetInteger(handle, MwNvalue) >= arrlen(lb->list)) {
MwSetInteger(handle, MwNvalue, arrlen(lb->list) - 1);
}
if(lb->selected < 0) {
lb->selected = -1;
if(MwGetInteger(handle, MwNvalue) < 0) {
MwSetInteger(handle, MwNvalue, -1);
}
resize(handle);
@@ -505,7 +506,7 @@ static void mwListBoxResetImpl(MwWidget handle) {
arrdel(lb->list, 0);
}
lb->selected = -1;
MwSetInteger(handle, MwNvalue, -1);
MwSetInteger(lb->vscroll, MwNvalue, 0);