Merge branch 'work/v1.10' into dev

# Conflicts:
#	CMakeLists.txt
#	Depends-Android.cmake
#	res/about/version.gmi
#	res/lang/cs.bin
#	res/lang/eo.bin
#	res/lang/es.bin
#	res/lang/fi.bin
#	res/lang/gl.bin
#	res/lang/ia.bin
#	res/lang/ie.bin
#	res/lang/ru.bin
#	res/lang/sr.bin
#	res/lang/tok.bin
#	res/lang/tr.bin
#	res/lang/uk.bin
#	res/lang/zh_Hant.bin
#	src/app.c
#	src/main.c
#	src/ui/documentwidget.c
#	src/ui/labelwidget.c
#	src/ui/sidebarwidget.c
#	src/ui/util.c

1 files changed, 25 insertions, 0 deletions

diff --git a/src/ui/widget.h b/src/ui/widget.h
index 57088c07..fb7eb5e2 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -123,6 +123,11 @@ enum iWidgetFlag {
 #define refChildrenOffset_WidgetFlag        iBit64(63) /* visual offset determined by the offset of referenced children */
 #define nativeMenu_WidgetFlag               iBit64(64)
 
+enum iWidgetFlag2 {
+    slidingSheetDraggable_WidgetFlag2 = iBit(1),
+    fadeBackground_WidgetFlag2        = iBit(2),
+};
+
 enum iWidgetAddPos {
     back_WidgetAddPos,
     front_WidgetAddPos,
@@ -139,7 +144,9 @@ struct Impl_Widget {
     iObject      object;
     iString      id;
     int64_t      flags;
+    int          flags2;
     iRect        rect;
+    iInt2        oldSize; /* in previous arrangement; for notification */
     iInt2        minSize;
     iWidget *    sizeRef;
     iWidget *    offsetRef;
@@ -230,6 +237,24 @@ iLocalDef int height_Widget(const iAnyObject *d) {
     }
     return 0;
 }
+iLocalDef int leftPad_Widget(const iWidget *d) {
+    return d->padding[0];
+}
+iLocalDef int topPad_Widget(const iWidget *d) {
+    return d->padding[1];
+}
+iLocalDef int rightPad_Widget(const iWidget *d) {
+    return d->padding[2];
+}
+iLocalDef int bottomPad_Widget(const iWidget *d) {
+    return d->padding[3];
+}
+iLocalDef iInt2 tlPad_Widget(const iWidget *d) {
+    return init_I2(leftPad_Widget(d), topPad_Widget(d));
+}
+iLocalDef iInt2 brPad_Widget(const iWidget *d) {
+    return init_I2(rightPad_Widget(d), bottomPad_Widget(d));
+}
 iLocalDef iObjectList *children_Widget(iAnyObject *d) {
     if (d == NULL) return NULL;
     iAssert(isInstance_Object(d, &Class_Widget));