diff options
Diffstat (limited to 'src/ui/root.c')
-rw-r--r-- | src/ui/root.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ui/root.c b/src/ui/root.c index 2d69970d..e279a048 100644 --- a/src/ui/root.c +++ b/src/ui/root.c | |||
@@ -271,7 +271,8 @@ void destroyPending_Root(iRoot *d) { | |||
271 | setCurrent_Root(d); | 271 | setCurrent_Root(d); |
272 | iForEach(PtrSet, i, d->pendingDestruction) { | 272 | iForEach(PtrSet, i, d->pendingDestruction) { |
273 | iWidget *widget = *i.value; | 273 | iWidget *widget = *i.value; |
274 | if (!isFinished_Anim(&widget->visualOffset)) { | 274 | if (!isFinished_Anim(&widget->visualOffset) || |
275 | isBeingVisuallyOffsetByReference_Widget(widget)) { | ||
275 | continue; | 276 | continue; |
276 | } | 277 | } |
277 | if (widget->flags & keepOnTop_WidgetFlag) { | 278 | if (widget->flags & keepOnTop_WidgetFlag) { |
@@ -1169,11 +1170,11 @@ void createUserInterface_Root(iRoot *d) { | |||
1169 | setId_Widget(mainStack, "stack"); | 1170 | setId_Widget(mainStack, "stack"); |
1170 | addChildFlags_Widget(div, iClob(mainStack), resizeChildren_WidgetFlag | expand_WidgetFlag | | 1171 | addChildFlags_Widget(div, iClob(mainStack), resizeChildren_WidgetFlag | expand_WidgetFlag | |
1171 | unhittable_WidgetFlag); | 1172 | unhittable_WidgetFlag); |
1172 | iWidget *tabBar = makeTabs_Widget(mainStack); | 1173 | iWidget *docTabs = makeTabs_Widget(mainStack); |
1173 | setId_Widget(tabBar, "doctabs"); | 1174 | setId_Widget(docTabs, "doctabs"); |
1174 | setBackgroundColor_Widget(tabBar, uiBackground_ColorId); | 1175 | setBackgroundColor_Widget(docTabs, uiBackground_ColorId); |
1175 | appendTabPage_Widget(tabBar, iClob(new_DocumentWidget()), "Document", 0, 0); | 1176 | appendTabPage_Widget(docTabs, iClob(new_DocumentWidget()), "Document", 0, 0); |
1176 | iWidget *buttons = findChild_Widget(tabBar, "tabs.buttons"); | 1177 | iWidget *buttons = findChild_Widget(docTabs, "tabs.buttons"); |
1177 | setFlags_Widget(buttons, collapse_WidgetFlag | hidden_WidgetFlag | | 1178 | setFlags_Widget(buttons, collapse_WidgetFlag | hidden_WidgetFlag | |
1178 | drawBackgroundToHorizontalSafeArea_WidgetFlag, iTrue); | 1179 | drawBackgroundToHorizontalSafeArea_WidgetFlag, iTrue); |
1179 | if (deviceType_App() == phone_AppDeviceType) { | 1180 | if (deviceType_App() == phone_AppDeviceType) { |