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

Timestamp:

2020-11-03T18:46:35Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b71c0fc

Parents:

4ac11ff

Message:

UI window should fill the application are background

Except for applications that want to do their own drawing without the
use of UI control hierarchy. We solve this by doing it in a default
paint callback that the application can override with its own
paint routine.

File:

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

uspace/app/uidemo/uidemo.c

@@ -33 +33 @@
  */
 
-#include <gfx/color.h>
 #include <gfx/coord.h>
-#include <gfx/render.h>
 #include <io/pos_event.h>
 #include <stdio.h>
@@ -50 +48 @@
 
 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
 };
@@ -73 +73 @@
 
         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);
 }
 
@@ -122 +141 @@
         ui_demo_t demo;
         gfx_rect_t rect;
-        gfx_rect_t app_rect;
-        gfx_color_t *color;
         ui_resource_t *ui_res;
-        gfx_context_t *gc;
         errno_t rc;
 
@@ -156 +172 @@
 
         ui_res = ui_window_get_res(window);
-        gc = ui_window_get_gc(window);
-        ui_window_get_app_rect(window, &app_rect);
 
         rc = ui_fixed_create(&demo.fixed);
@@ -226 +240 @@
         }
 
-        rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &color);
-        if (rc != EOK) {
-                printf("Error allocating color.\n");
-                return rc;
-        }
-
-        rc = gfx_set_color(gc, color);
-        if (rc != EOK) {
-                printf("Error setting color.\n");
-                return rc;
-        }
-
-        rc = gfx_fill_rect(gc, &app_rect);
-        if (rc != EOK) {
-                printf("Error filling background.\n");
-                return rc;
-        }
-
-        rc = ui_fixed_paint(demo.fixed);
-        if (rc != EOK) {
-                printf("Error painting UI controls.\n");
+        rc = ui_window_paint(window);
+        if (rc != EOK) {
+                printf("Error painting window.\n");
                 return rc;
         }