nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-19 23:54:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix things

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@490 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-24 17:31:05 +00:00
parent 90080a3d24
commit 453fb8702d
23 changed files with 14131 additions and 14136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/button.c
View File

@@ -38,8 +38,8 @@ static void draw(MwWidget handle) {
r.width = px->width * sh;
r.height = px->height * sh;
}
r.width -= MwDefaultBorderWidth * 2;
r.height -= MwDefaultBorderWidth * 2;
r.width -= MwGetDefaultBorderWidth(handle) * 2;
r.height -= MwGetDefaultBorderWidth(handle) * 2;
r.x += (double)(ow - r.width) / 2;
r.y += (double)(oh - r.height) / 2;

8
src/widget/frame.c
View File

@@ -23,10 +23,10 @@ static void draw(MwWidget handle) {
fr.height = MwGetInteger(handle, MwNheight);
MwDrawFrame(handle, &fr, base, inverted);
rr.x = MwDefaultBorderWidth;
rr.y = MwDefaultBorderWidth;
rr.width = MwGetInteger(handle, MwNwidth) - (MwDefaultBorderWidth * 2);
rr.height = MwGetInteger(handle, MwNheight) - (MwDefaultBorderWidth * 2);
rr.x = MwGetDefaultBorderWidth(handle);
rr.y = MwGetDefaultBorderWidth(handle);
rr.width = MwGetInteger(handle, MwNwidth) - (MwGetDefaultBorderWidth(handle) * 2);
rr.height = MwGetInteger(handle, MwNheight) - (MwGetDefaultBorderWidth(handle) * 2);
} else {
rr.x = 0;

30
src/widget/listbox.c
View File

@@ -124,11 +124,11 @@ static void frame_mouse_down(MwWidget handle, void* user, void* call) {
if(m->button == MwLLMouseLeft) {
int st = 0;
int i;
int y = MwDefaultBorderWidth;
int y = MwGetDefaultBorderWidth(handle);
int h = MwGetInteger(handle, MwNheight);
st = get_first_entry(handle->parent, lb);
for(i = 0; (st + i) < arrlen(lb->list) && i < (h - MwDefaultBorderWidth * 2) / MwTextHeight(handle, "M"); i++) {
for(i = 0; (st + i) < arrlen(lb->list) && i < (h - MwGetDefaultBorderWidth(handle) * 2) / MwTextHeight(handle, "M"); i++) {
if(y <= m->point.y && m->point.y <= (y + MwTextHeight(handle, "M"))) {
unsigned long t;
int old = lb->selected;
@@ -169,11 +169,11 @@ static void frame_mouse_move(MwWidget handle, void* user, void* call) {
if(lb->pressed) {
int st = 0;
int i;
int y = MwDefaultBorderWidth;
int y = MwGetDefaultBorderWidth(handle);
int h = MwGetInteger(handle, MwNheight);
st = get_first_entry(handle->parent, lb);
for(i = 0; (st + i) < arrlen(lb->list) && i < (h - MwDefaultBorderWidth * 2) / MwTextHeight(handle, "M"); i++) {
for(i = 0; (st + i) < arrlen(lb->list) && i < (h - MwGetDefaultBorderWidth(handle) * 2) / MwTextHeight(handle, "M"); i++) {
if(y <= p->y && p->y <= (y + MwTextHeight(handle, "M"))) {
lb->selected = st + i;
}
@@ -198,12 +198,12 @@ static void frame_draw(MwWidget handle) {
r.width = MwGetInteger(handle, MwNwidth);
r.height = MwGetInteger(handle, MwNheight);
p.x = MwDefaultBorderWidth;
p.y = MwDefaultBorderWidth;
p.x = MwGetDefaultBorderWidth(handle);
p.y = MwGetDefaultBorderWidth(handle);
st = get_first_entry(handle->parent, lb);
for(i = st; i < arrlen(lb->list) && i < st + (r.height - MwDefaultBorderWidth * 2) / MwTextHeight(handle, "M"); i++) {
for(i = st; i < arrlen(lb->list) && i < st + (r.height - MwGetDefaultBorderWidth(handle) * 2) / MwTextHeight(handle, "M"); i++) {
int selected = lb->selected == i ? 1 : 0;
int j;
@@ -219,7 +219,7 @@ static void frame_draw(MwWidget handle) {
if(lb->list[i].pixmap != NULL) {
MwRect r2;
int h = (lb->list[i].pixmap->height > MwTextHeight(handle, "M")) ? MwTextHeight(handle, "M") : lb->list[i].pixmap->height;
r2.x = MwDefaultBorderWidth;
r2.x = MwGetDefaultBorderWidth(handle);
r2.y = p.y + (MwTextHeight(handle, "M") - h) / 2;
r2.width = h * lb->list[i].pixmap->width / lb->list[i].pixmap->height;
r2.height = h;
@@ -232,9 +232,9 @@ static void frame_draw(MwWidget handle) {
if(t == NULL) t = "";
p.x += MwDefaultBorderWidth;
p.x += MwGetDefaultBorderWidth(handle);
MwDrawText(handle, &p, t, 0, MwALIGNMENT_BEGINNING, selected ? base : text);
p.x += get_col_width(lb, j) - MwDefaultBorderWidth;
p.x += get_col_width(lb, j) - MwGetDefaultBorderWidth(handle);
if(j == 0) p.x -= MwGetInteger(handle->parent, MwNleftPadding);
}
@@ -254,7 +254,7 @@ static void resize(MwWidget handle) {
int h = MwGetInteger(handle, MwNheight);
int ih, y;
y = MwGetInteger(handle, MwNhasHeading) ? (MwTextHeight(handle, "M") + MwDefaultBorderWidth * 2) : 0;
y = MwGetInteger(handle, MwNhasHeading) ? (MwTextHeight(handle, "M") + MwGetDefaultBorderWidth(handle) * 2) : 0;
if(lb->vscroll == NULL) {
lb->vscroll = MwVaCreateWidget(MwScrollBarClass, "vscroll", handle, w - 16, 0, 16, h, NULL);
@@ -283,7 +283,7 @@ static void resize(MwWidget handle) {
MwNheight, h,
NULL);
}
h -= MwDefaultBorderWidth * 2;
h -= MwGetDefaultBorderWidth(handle) * 2;
ih = arrlen(lb->list);
if(ih == 0) ih = 1;
@@ -345,16 +345,16 @@ static void draw(MwWidget handle) {
r.x = x;
r.y = 0;
r.width = get_col_width(lb, i);
r.height = MwDefaultBorderWidth * 2 + MwTextHeight(handle, "M");
r.height = MwGetDefaultBorderWidth(handle) * 2 + MwTextHeight(handle, "M");
MwDrawFrame(handle, &r, base, 0);
x += MwDefaultBorderWidth;
x += MwGetDefaultBorderWidth(handle);
p.x = x;
p.y = r.y + r.height / 2;
MwDrawText(handle, &p, lb->list[0].name[i], 0, MwALIGNMENT_BEGINNING, text);
x += r.width + MwDefaultBorderWidth;
x += r.width + MwGetDefaultBorderWidth(handle);
}
}

10
src/widget/scrollbar.c
View File

@@ -194,13 +194,13 @@ static void mouse_down(MwWidget handle, void* ptr) {
scr->point = handle->mouse_point;
scr->drag = 0;
if(or == MwVERTICAL) {
int tri = (ww - MwDefaultBorderWidth * 2) + MwDefaultBorderWidth;
int tri = (ww - MwGetDefaultBorderWidth(handle) * 2) + MwGetDefaultBorderWidth(handle);
if(tri <= scr->point.y && scr->point.y <= (wh - tri)) {
scr->drag = 1;
scr->pos = calc_positition(handle) - scr->point.y;
}
} else if(or == MwHORIZONTAL) {
int tri = (wh - MwDefaultBorderWidth * 2) + MwDefaultBorderWidth;
int tri = (wh - MwGetDefaultBorderWidth(handle) * 2) + MwGetDefaultBorderWidth(handle);
if(tri <= scr->point.x && scr->point.x <= (ww - tri)) {
scr->drag = 1;
scr->pos = calc_positition(handle) - scr->point.x;
@@ -225,13 +225,13 @@ static int mwScrollBarGetVisibleLengthImpl(MwWidget handle) {
int s = 0;
if(or == MwVERTICAL) {
tri = (ww - MwDefaultBorderWidth * 2) * 2;
tri = (ww - MwGetDefaultBorderWidth(handle) * 2) * 2;
s = wh;
} else if(or == MwHORIZONTAL) {
tri = (wh - MwDefaultBorderWidth * 2) * 2;
tri = (wh - MwGetDefaultBorderWidth(handle) * 2) * 2;
s = ww;
}
return s - tri - MwDefaultBorderWidth * 2;
return s - tri - MwGetDefaultBorderWidth(handle) * 2;
}
static void func_handler(MwWidget handle, const char* name, void* out, va_list va) {