git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@828 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-11-29 21:17:15 +00:00
parent 77ec32ef42
commit 77ea00f047
4 changed files with 11 additions and 3 deletions

View File

@@ -30,6 +30,7 @@
#define MwNsingleClickSelectable "IsingleClickSelectable" #define MwNsingleClickSelectable "IsingleClickSelectable"
#define MwNflat "Iflat" #define MwNflat "Iflat"
#define MwNshowArrows "IshowArrows" #define MwNshowArrows "IshowArrows"
#define MwNpadding "Ipadding"
#define MwNtitle "Stitle" #define MwNtitle "Stitle"
#define MwNtext "Stext" #define MwNtext "Stext"

View File

@@ -72,6 +72,8 @@
<integer name="hideInput" /> <integer name="hideInput" />
<integer name="singleClickSelectable" /> <integer name="singleClickSelectable" />
<integer name="flat" /> <integer name="flat" />
<integer name="showArrows" />
<integer name="padding" />
<string name="title" /> <string name="title" />
<string name="text" /> <string name="text" />
@@ -449,6 +451,7 @@
<property name="pixmap" /> <property name="pixmap" />
<property name="text" /> <property name="text" />
<property name="flat" /> <property name="flat" />
<property name="padding" />
</properties> </properties>
</widget> </widget>
<widget name="CheckBox"> <widget name="CheckBox">
@@ -557,6 +560,7 @@
<property name="minValue" /> <property name="minValue" />
<property name="maxValue" /> <property name="maxValue" />
<property name="orientation" /> <property name="orientation" />
<property name="showArrows" />
</properties> </properties>
<functions> <functions>
<function name="GetVisibleLength"> <function name="GetVisibleLength">

View File

@@ -5,6 +5,7 @@ static int create(MwWidget handle) {
MwSetDefault(handle); MwSetDefault(handle);
MwSetInteger(handle, MwNflat, 0); MwSetInteger(handle, MwNflat, 0);
MwSetInteger(handle, MwNpadding, 0);
return 0; return 0;
} }
@@ -54,6 +55,8 @@ static void draw(MwWidget handle) {
r.width = px->common.width * sh; r.width = px->common.width * sh;
r.height = px->common.height * sh; r.height = px->common.height * sh;
} }
r.width -= MwGetInteger(handle, MwNpadding) * 2;
r.height -= MwGetInteger(handle, MwNpadding) * 2;
r.x += (double)(ow - r.width) / 2; r.x += (double)(ow - r.width) / 2;
r.y += (double)(oh - r.height) / 2; r.y += (double)(oh - r.height) / 2;
@@ -75,7 +78,7 @@ static void click(MwWidget handle) {
} }
static void prop_change(MwWidget handle, const char* key) { static void prop_change(MwWidget handle, const char* key) {
if(strcmp(key, MwNtext) == 0 || strcmp(key, MwNpixmap) == 0 || strcmp(key, MwNflat) == 0) MwForceRender(handle); if(strcmp(key, MwNtext) == 0 || strcmp(key, MwNpixmap) == 0 || strcmp(key, MwNflat) == 0 || strcmp(key, MwNpadding) == 0) MwForceRender(handle);
} }
MwClassRec MwButtonClassRec = { MwClassRec MwButtonClassRec = {