diff options
Diffstat (limited to 'src/ui/widget.h')
-rw-r--r-- | src/ui/widget.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/ui/widget.h b/src/ui/widget.h index 0b7a76e1..66fe222b 100644 --- a/src/ui/widget.h +++ b/src/ui/widget.h | |||
@@ -93,6 +93,9 @@ enum iWidgetFlag { | |||
93 | #define focusRoot_WidgetFlag iBit64(39) | 93 | #define focusRoot_WidgetFlag iBit64(39) |
94 | #define unhittable_WidgetFlag iBit64(40) | 94 | #define unhittable_WidgetFlag iBit64(40) |
95 | #define touchDrag_WidgetFlag iBit64(41) /* touch event behavior: immediate drag */ | 95 | #define touchDrag_WidgetFlag iBit64(41) /* touch event behavior: immediate drag */ |
96 | #define noBackground_WidgetFlag iBit64(42) | ||
97 | #define drawBackgroundToHorizontalSafeArea_WidgetFlag iBit64(43) | ||
98 | #define drawBackgroundToVerticalSafeArea_WidgetFlag iBit64(44) | ||
96 | 99 | ||
97 | enum iWidgetAddPos { | 100 | enum iWidgetAddPos { |
98 | back_WidgetAddPos, | 101 | back_WidgetAddPos, |
@@ -159,12 +162,18 @@ void drawBackground_Widget(const iWidget *); | |||
159 | void drawChildren_Widget (const iWidget *); | 162 | void drawChildren_Widget (const iWidget *); |
160 | 163 | ||
161 | iLocalDef int width_Widget(const iAnyObject *d) { | 164 | iLocalDef int width_Widget(const iAnyObject *d) { |
162 | iAssert(isInstance_Object(d, &Class_Widget)); | 165 | if (d) { |
163 | return ((const iWidget *) d)->rect.size.x; | 166 | iAssert(isInstance_Object(d, &Class_Widget)); |
167 | return ((const iWidget *) d)->rect.size.x; | ||
168 | } | ||
169 | return 0; | ||
164 | } | 170 | } |
165 | iLocalDef int height_Widget(const iAnyObject *d) { | 171 | iLocalDef int height_Widget(const iAnyObject *d) { |
166 | iAssert(isInstance_Object(d, &Class_Widget)); | 172 | if (d) { |
167 | return ((const iWidget *) d)->rect.size.y; | 173 | iAssert(isInstance_Object(d, &Class_Widget)); |
174 | return ((const iWidget *) d)->rect.size.y; | ||
175 | } | ||
176 | return 0; | ||
168 | } | 177 | } |
169 | iLocalDef iObjectList *children_Widget(iAnyObject *d) { | 178 | iLocalDef iObjectList *children_Widget(iAnyObject *d) { |
170 | iAssert(isInstance_Object(d, &Class_Widget)); | 179 | iAssert(isInstance_Object(d, &Class_Widget)); |