summaryrefslogtreecommitdiff
path: root/src/ui/widget.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/widget.c')
-rw-r--r--src/ui/widget.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/ui/widget.c b/src/ui/widget.c
index cace9568..d218d7ee 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -71,7 +71,6 @@ iDefineObjectConstruction(Widget)
71void init_Widget(iWidget *d) { 71void init_Widget(iWidget *d) {
72 init_String(&d->id); 72 init_String(&d->id);
73 d->flags = 0; 73 d->flags = 0;
74 d->flags2 = 0;
75 d->rect = zero_Rect(); 74 d->rect = zero_Rect();
76 d->bgColor = none_ColorId; 75 d->bgColor = none_ColorId;
77 d->frameColor = none_ColorId; 76 d->frameColor = none_ColorId;
@@ -120,11 +119,11 @@ const iString *id_Widget(const iWidget *d) {
120 return &d->id; 119 return &d->id;
121} 120}
122 121
123int flags_Widget(const iWidget *d) { 122int64_t flags_Widget(const iWidget *d) {
124 return d->flags; 123 return d->flags;
125} 124}
126 125
127void setFlags_Widget(iWidget *d, int flags, iBool set) { 126void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
128 iChangeFlags(d->flags, flags, set); 127 iChangeFlags(d->flags, flags, set);
129 if (flags & keepOnTop_WidgetFlag) { 128 if (flags & keepOnTop_WidgetFlag) {
130 if (set) { 129 if (set) {
@@ -136,10 +135,6 @@ void setFlags_Widget(iWidget *d, int flags, iBool set) {
136 } 135 }
137} 136}
138 137
139void setFlags2_Widget(iWidget *d, int flags2, iBool set) {
140 iChangeFlags(d->flags2, flags2, set);
141}
142
143void setPos_Widget(iWidget *d, iInt2 pos) { 138void setPos_Widget(iWidget *d, iInt2 pos) {
144 d->rect.pos = pos; 139 d->rect.pos = pos;
145 setFlags_Widget(d, fixedPosition_WidgetFlag, iTrue); 140 setFlags_Widget(d, fixedPosition_WidgetFlag, iTrue);
@@ -248,7 +243,7 @@ void arrange_Widget(iWidget *d) {
248 if (d->flags & moveToParentRightEdge_WidgetFlag) { 243 if (d->flags & moveToParentRightEdge_WidgetFlag) {
249 d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect); 244 d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
250 } 245 }
251 if (d->flags2 & centerHorizontal_WidgetFlag2) { 246 if (d->flags & centerHorizontal_WidgetFlag) {
252 centerHorizontal_Widget_(d); 247 centerHorizontal_Widget_(d);
253 } 248 }
254 if (d->flags & resizeToParentWidth_WidgetFlag) { 249 if (d->flags & resizeToParentWidth_WidgetFlag) {
@@ -366,7 +361,7 @@ void arrange_Widget(iWidget *d) {
366 if (child->flags & fixedPosition_WidgetFlag) { 361 if (child->flags & fixedPosition_WidgetFlag) {
367 continue; 362 continue;
368 } 363 }
369 if (child->flags2 & centerHorizontal_WidgetFlag2) { 364 if (child->flags & centerHorizontal_WidgetFlag) {
370 continue; 365 continue;
371 } 366 }
372 if (d->flags & (arrangeHorizontal_WidgetFlag | arrangeVertical_WidgetFlag)) { 367 if (d->flags & (arrangeHorizontal_WidgetFlag | arrangeVertical_WidgetFlag)) {
@@ -419,7 +414,7 @@ void arrange_Widget(iWidget *d) {
419 } 414 }
420 } 415 }
421 } 416 }
422 if (d->flags2 & centerHorizontal_WidgetFlag2) { 417 if (d->flags & centerHorizontal_WidgetFlag) {
423 centerHorizontal_Widget_(d); 418 centerHorizontal_Widget_(d);
424 } 419 }
425 } 420 }
@@ -637,7 +632,7 @@ iAny *addChildPos_Widget(iWidget *d, iAnyObject *child, enum iWidgetAddPos addPo
637 return child; 632 return child;
638} 633}
639 634
640iAny *addChildFlags_Widget(iWidget *d, iAnyObject *child, int childFlags) { 635iAny *addChildFlags_Widget(iWidget *d, iAnyObject *child, int64_t childFlags) {
641 setFlags_Widget(child, childFlags, iTrue); 636 setFlags_Widget(child, childFlags, iTrue);
642 return addChild_Widget(d, child); 637 return addChild_Widget(d, child);
643} 638}