Changeset 8c772c4 in mainline for uspace/app

Timestamp:

2020-11-07T22:12:12Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3583ffb

Parents:

d55ab823

Message:

Create UI controls based on UI object instead of based on UI resource

We want to be a bit more generic. Better not expose UI resource
(at least not in this particular case).

Location:

uspace/app

Files:

• terminal/terminal.c (modified) (1 diff)
• terminal/terminal.h (modified) (1 diff)
• uidemo/uidemo.c (modified) (5 diffs)

uspace/app/terminal/terminal.c

@@ -835 +835 @@
 
         term->gc = ui_window_get_gc(term->window);
-        term->ui_res = ui_window_get_res(term->window);
 
         ui_window_set_cb(term->window, &terminal_window_cb, (void *) term);

uspace/app/terminal/terminal.h

@@ -57 +57 @@
         ui_t *ui;
         ui_window_t *window;
-        ui_resource_t *ui_res;
         gfx_context_t *gc;
 

uspace/app/uidemo/uidemo.c

@@ -99 +99 @@
         ui_demo_t demo;
         gfx_rect_t rect;
-        ui_resource_t *ui_res;
         errno_t rc;
 
@@ -127 +126 @@
         demo.window = window;
 
-        ui_res = ui_window_get_res(window);
-
         rc = ui_fixed_create(&demo.fixed);
         if (rc != EOK) {
@@ -135 +132 @@
         }
 
-        rc = ui_label_create(ui_res, "Hello there!", &demo.label);
+        rc = ui_label_create(ui, "Hello there!", &demo.label);
         if (rc != EOK) {
                 printf("Error creating label.\n");
@@ -154 +151 @@
         }
 
-        rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);
+        rc = ui_pbutton_create(ui, "Confirm", &demo.pb1);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -176 +173 @@
         }
 
-        rc = ui_pbutton_create(ui_res, "Cancel", &demo.pb2);
+        rc = ui_pbutton_create(ui, "Cancel", &demo.pb2);
         if (rc != EOK) {
                 printf("Error creating button.\n");