Changeset b71c0fc in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2020-11-07T16:07:22Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d55ab823

Parents:

fa01c05

Message:

Make fixed layout a UI control and hook it up to the window

File:

• uspace/app/uidemo/uidemo.c (modified) (5 diffs)

uspace/app/uidemo/uidemo.c

@@ -34 +34 @@
 
 #include <gfx/coord.h>
-#include <io/pos_event.h>
 #include <stdio.h>
 #include <str.h>
@@ -43 +42 @@
 #include <ui/resource.h>
 #include <ui/ui.h>
-#include <ui/wdecor.h>
 #include <ui/window.h>
 #include "uidemo.h"
 
 static void wnd_close(ui_window_t *, void *);
-static errno_t wnd_paint(ui_window_t *, void *);
-static void wnd_pos(ui_window_t *, void *, pos_event_t *pos);
 
 static ui_window_cb_t window_cb = {
-        .close = wnd_close,
-        .paint = wnd_paint,
-        .pos = wnd_pos
+        .close = wnd_close
 };
 
@@ -73 +67 @@
 
         ui_quit(demo->ui);
-}
-
-/** Window paint request.
- *
- * @param window Window
- * @param arg Argument (demo)
- * @return EOK on success or an error code
- */
-static errno_t wnd_paint(ui_window_t *window, void *arg)
-{
-        ui_demo_t *demo = (ui_demo_t *) arg;
-        errno_t rc;
-
-        /* Let window paint its background */
-        rc = ui_window_def_paint(window);
-        if (rc != EOK)
-                return rc;
-
-        return ui_fixed_paint(demo->fixed);
-}
-
-/** Window position event.
- *
- * @param window Window
- * @param arg Argument (demo)
- */
-static void wnd_pos(ui_window_t *window, void *arg, pos_event_t *event)
-{
-        ui_demo_t *demo = (ui_demo_t *) arg;
-
-        /* Make sure we don't process events until fully initialized */
-        if (demo->fixed == NULL)
-                return;
-
-        ui_fixed_pos_event(demo->fixed, event);
 }
 
@@ -240 +199 @@
         }
 
+        ui_window_add(window, ui_fixed_ctl(demo.fixed));
+
         rc = ui_window_paint(window);
         if (rc != EOK) {
@@ -248 +209 @@
         ui_run(ui);
 
-        ui_fixed_destroy(demo.fixed);
         ui_window_destroy(window);
         ui_destroy(ui);