diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-20 11:40:44 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-20 11:40:44 +0300 |
commit | 709329cef2fe3cd88d6a4e27389b64431f5936f6 (patch) | |
tree | f12cafbdb00325030760e2f2d89b5fce4c0177f7 /src/ui/widget.c | |
parent | 3bbe6b3c73f8c512279b1dd8d164d302d5e96752 (diff) |
Dialog show/hide animations
Use the animations introduced for mobile on desktop as well. Adding a
preference for this might be prudent.
Diffstat (limited to 'src/ui/widget.c')
-rw-r--r-- | src/ui/widget.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/widget.c b/src/ui/widget.c index 64f586ce..5502cb8e 100644 --- a/src/ui/widget.c +++ b/src/ui/widget.c | |||
@@ -101,9 +101,6 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) { | |||
101 | setFocus_Widget(NULL); | 101 | setFocus_Widget(NULL); |
102 | return; | 102 | return; |
103 | } | 103 | } |
104 | if (flags_Widget(d) & keepOnTop_WidgetFlag) { | ||
105 | removeOne_PtrArray(onTop_Root(d->root), d); | ||
106 | } | ||
107 | remove_Periodic(periodic_App(), d); | 104 | remove_Periodic(periodic_App(), d); |
108 | if (isHover_Widget(d)) { | 105 | if (isHover_Widget(d)) { |
109 | get_Window()->hover = NULL; | 106 | get_Window()->hover = NULL; |
@@ -858,6 +855,9 @@ iLocalDef iBool isMouseEvent_(const SDL_Event *ev) { | |||
858 | } | 855 | } |
859 | 856 | ||
860 | static iBool filterEvent_Widget_(const iWidget *d, const SDL_Event *ev) { | 857 | static iBool filterEvent_Widget_(const iWidget *d, const SDL_Event *ev) { |
858 | if (d->flags & destroyPending_WidgetFlag) { | ||
859 | return iFalse; /* no more events handled */ | ||
860 | } | ||
861 | const iBool isKey = isKeyboardEvent_(ev); | 861 | const iBool isKey = isKeyboardEvent_(ev); |
862 | const iBool isMouse = isMouseEvent_(ev); | 862 | const iBool isMouse = isMouseEvent_(ev); |
863 | if ((d->flags & disabled_WidgetFlag) || (d->flags & hidden_WidgetFlag && | 863 | if ((d->flags & disabled_WidgetFlag) || (d->flags & hidden_WidgetFlag && |
@@ -1103,8 +1103,8 @@ void drawBackground_Widget(const iWidget *d) { | |||
1103 | drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30); | 1103 | drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30); |
1104 | } | 1104 | } |
1105 | const iBool isFaded = fadeBackground && | 1105 | const iBool isFaded = fadeBackground && |
1106 | ~d->flags & noFadeBackground_WidgetFlag && | 1106 | ~d->flags & noFadeBackground_WidgetFlag;/* && |
1107 | ~d->flags & destroyPending_WidgetFlag; | 1107 | ~d->flags & destroyPending_WidgetFlag;*/ |
1108 | if (isFaded) { | 1108 | if (isFaded) { |
1109 | iPaint p; | 1109 | iPaint p; |
1110 | init_Paint(&p); | 1110 | init_Paint(&p); |