Changes in uspace/lib/ui/src/msgdialog.c [12dd36c:d0dfbba] in mainline

File:

• uspace/lib/ui/src/msgdialog.c (modified) (9 diffs)

uspace/lib/ui/src/msgdialog.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <mem.h>
@@ -111 +112 @@
         ui_wnd_params_init(&wparams);
         wparams.caption = params->caption;
+        if ((params->flags & umdf_topmost) != 0)
+                wparams.flags |= wndf_topmost;
+        if ((params->flags & umdf_center) != 0)
+                wparams.placement = ui_wnd_place_center;
 
         /* FIXME: Auto layout */
@@ -121 +126 @@
                 wparams.rect.p0.x = 0;
                 wparams.rect.p0.y = 0;
-                wparams.rect.p1.x = 400;
+                wparams.rect.p1.x = 440;
                 wparams.rect.p1.y = 110;
         }
@@ -150 +155 @@
                 rect.p0.x = 10;
                 rect.p0.y = 35;
-                rect.p1.x = 390;
+                rect.p1.x = 430;
                 rect.p1.y = 50;
         }
@@ -281 +286 @@
         if (dialog->cb != NULL && dialog->cb->close != NULL)
                 dialog->cb->close(dialog, dialog->arg);
+        else
+                ui_msg_dialog_destroy(dialog);
 }
 
@@ -306 +313 @@
                                 dialog->cb->button(dialog, dialog->arg, 0);
                                 return;
+                        } else {
+                                ui_msg_dialog_destroy(dialog);
                         }
                 } else if (event->key == KC_ESCAPE) {
@@ -312 +321 @@
                                 dialog->cb->close(dialog, dialog->arg);
                                 return;
+                        } else {
+                                ui_msg_dialog_destroy(dialog);
                         }
                 }
@@ -333 +344 @@
                                 dialog->cb->button(dialog, dialog->arg, i);
                 }
+        } else {
+                ui_msg_dialog_destroy(dialog);
         }
 }