nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-08 18:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

use more proper term

Browse Source
This commit is contained in:
NishiOwO
2025-12-15 15:27:04 +09:00
parent a5cd1974e4
commit 02c21233ae
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/basic/box.c
View File

@@ -26,20 +26,21 @@ int main() {
box = MwVaCreateWidget(MwBoxClass, "box", window, 0, 0, 0, 0, box = MwVaCreateWidget(MwBoxClass, "box", window, 0, 0, 0, 0,
MwNpadding, 10, MwNpadding, 10,
MwNspacing, 10,
NULL); NULL);
box2 = MwVaCreateWidget(MwBoxClass, "box2", box, 0, 0, 0, 0, box2 = MwVaCreateWidget(MwBoxClass, "box2", box, 0, 0, 0, 0,
MwNpadding, 10, MwNspacing, 10,
MwNorientation, MwVERTICAL, MwNorientation, MwVERTICAL,
NULL); NULL);
box3 = MwVaCreateWidget(MwBoxClass, "box3", box, 0, 0, 0, 0, box3 = MwVaCreateWidget(MwBoxClass, "box3", box, 0, 0, 0, 0,
MwNpadding, 10, MwNspacing, 10,
MwNorientation, MwVERTICAL, MwNorientation, MwVERTICAL,
NULL); NULL);
box4 = MwVaCreateWidget(MwBoxClass, "box4", box, 0, 0, 0, 0, box4 = MwVaCreateWidget(MwBoxClass, "box4", box, 0, 0, 0, 0,
MwNpadding, 10, MwNspacing, 10,
MwNorientation, MwVERTICAL, MwNorientation, MwVERTICAL,
MwNfixedSize, 40, MwNfixedSize, 40,
NULL); NULL);

2
include/Mw/StringDefs.h
View File

@@ -34,7 +34,7 @@
#define MwNfillArea "IfillArea" #define MwNfillArea "IfillArea"
#define MwNratio "Iratio" #define MwNratio "Iratio"
#define MwNfixedSize "IfixedSize" #define MwNfixedSize "IfixedSize"
#define MwNouterPadding "IouterPadding" #define MwNspacing "Ispacing"
#define MwNtitle "Stitle" #define MwNtitle "Stitle"
#define MwNtext "Stext" #define MwNtext "Stext"

4
milsko.xml
View File

@@ -86,7 +86,7 @@
<integer name="borderWidth" /> <integer name="borderWidth" />
<integer name="ratio" /> <integer name="ratio" />
<integer name="fixedSize" /> <integer name="fixedSize" />
<integer name="outerPadding" /> <integer name="spacing" />
<string name="title" /> <string name="title" />
<string name="text" /> <string name="text" />
@@ -491,8 +491,8 @@
<widget name="Box"> <widget name="Box">
<properties> <properties>
<property name="orientation" /> <property name="orientation" />
<property name="spacing" />
<property name="padding" /> <property name="padding" />
<property name="outerPadding" />
</properties> </properties>
</widget> </widget>
<widget name="Button"> <widget name="Button">

22
src/widget/box.c
View File

@@ -6,8 +6,8 @@ static int create(MwWidget handle) {
MwSetDefault(handle); MwSetDefault(handle);
MwSetInteger(handle, MwNorientation, MwHORIZONTAL); MwSetInteger(handle, MwNorientation, MwHORIZONTAL);
MwSetInteger(handle, MwNspacing, 0);
MwSetInteger(handle, MwNpadding, 0); MwSetInteger(handle, MwNpadding, 0);
MwSetInteger(handle, MwNouterPadding, 0);
return 0; return 0;
} }
@@ -29,9 +29,9 @@ static void layout(MwWidget handle) {
int i; int i;
int sum = 0; int sum = 0;
int horiz = MwGetInteger(handle, MwNorientation) == MwHORIZONTAL ? 1 : 0; int horiz = MwGetInteger(handle, MwNorientation) == MwHORIZONTAL ? 1 : 0;
int sz = MwGetInteger(handle, horiz ? MwNwidth : MwNheight) - MwGetInteger(handle, MwNouterPadding) * 2; int sz = MwGetInteger(handle, horiz ? MwNwidth : MwNheight) - MwGetInteger(handle, MwNpadding) * 2;
int fsz = MwGetInteger(handle, horiz ? MwNheight : MwNwidth) - MwGetInteger(handle, MwNouterPadding) * 2; int fsz = MwGetInteger(handle, horiz ? MwNheight : MwNwidth) - MwGetInteger(handle, MwNpadding) * 2;
int sk = MwGetInteger(handle, MwNouterPadding); int sk = MwGetInteger(handle, MwNpadding);
for(i = 0; i < arrlen(handle->children); i++) { for(i = 0; i < arrlen(handle->children); i++) {
int n = MwGetInteger(handle->children[i], MwNratio); int n = MwGetInteger(handle->children[i], MwNratio);
@@ -39,7 +39,7 @@ static void layout(MwWidget handle) {
if(n == MwDEFAULT) n = 1; if(n == MwDEFAULT) n = 1;
if(s != MwDEFAULT) { if(s != MwDEFAULT) {
sz -= s + ((i != (arrlen(handle->children) - 1)) ? MwGetInteger(handle, MwNpadding) : 0); sz -= s + ((i != (arrlen(handle->children) - 1)) ? MwGetInteger(handle, MwNspacing) : 0);
} else { } else {
sum += n; sum += n;
} }
@@ -56,15 +56,15 @@ static void layout(MwWidget handle) {
} else { } else {
wsz = sz * n / sum; wsz = sz * n / sum;
} }
wsz -= ((i != (arrlen(handle->children) - 1)) ? MwGetInteger(handle, MwNpadding) : 0); wsz -= ((i != (arrlen(handle->children) - 1)) ? MwGetInteger(handle, MwNspacing) : 0);
MwVaApply(handle->children[i], MwVaApply(handle->children[i],
horiz ? MwNx : MwNy, sk, /* this is what gets changed */ horiz ? MwNx : MwNy, sk, /* this is what gets changed */
horiz ? MwNy : MwNx, MwGetInteger(handle, MwNouterPadding), /* fixed between widgets */ horiz ? MwNy : MwNx, MwGetInteger(handle, MwNpadding), /* fixed between widgets */
horiz ? MwNwidth : MwNheight, wsz, /* this is what gets changed */ horiz ? MwNwidth : MwNheight, wsz, /* this is what gets changed */
horiz ? MwNheight : MwNwidth, fsz, /* fixed between widgets */ horiz ? MwNheight : MwNwidth, fsz, /* fixed between widgets */
NULL); NULL);
sk += wsz + ((i != (arrlen(handle->children) - 1)) ? MwGetInteger(handle, MwNpadding) : 0); sk += wsz + ((i != (arrlen(handle->children) - 1)) ? MwGetInteger(handle, MwNspacing) : 0);
} }
} }