Changeset 3583ffb in mainline for uspace/lib/ui/src

Timestamp:

2020-11-08T19:51:04Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f93e4e3

Parents:

8c772c4

Message:

Revert "Create UI controls based on UI object…"

This was a mistake. Controls need ui_resource object, which must be
(at least currently) specific to a window and cannot be obtained from
ui_t.

Location:

uspace/lib/ui/src

Files:

• label.c (modified) (3 diffs)
• pbutton.c (modified) (3 diffs)
• wdecor.c (modified) (4 diffs)
• window.c (modified) (4 diffs)

uspace/lib/ui/src/label.c

@@ -45 +45 @@
 #include "../private/label.h"
 #include "../private/resource.h"
-#include "../private/ui.h"
 
 static void ui_label_ctl_destroy(void *);
@@ -65 +64 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_label_create(ui_t *ui, const char *text,
+errno_t ui_label_create(ui_resource_t *resource, const char *text,
     ui_label_t **rlabel)
 {
@@ -88 +87 @@
         }
 
-        label->res = ui->resource;
+        label->res = resource;
         label->halign = gfx_halign_left;
         *rlabel = label;

uspace/lib/ui/src/pbutton.c

@@ -47 +47 @@
 #include "../private/pbutton.h"
 #include "../private/resource.h"
-#include "../private/ui.h"
 
 /** Caption movement when button is pressed down */
@@ -73 +72 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_pbutton_create(ui_t *ui, const char *caption,
+errno_t ui_pbutton_create(ui_resource_t *resource, const char *caption,
     ui_pbutton_t **rpbutton)
 {
@@ -97 +96 @@
         }
 
-        pbutton->res = ui->resource;
+        pbutton->res = resource;
         *rpbutton = pbutton;
         return EOK;

uspace/lib/ui/src/wdecor.c

@@ -46 +46 @@
 #include <ui/wdecor.h>
 #include "../private/resource.h"
-#include "../private/ui.h"
 #include "../private/wdecor.h"
 
@@ -62 +61 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_wdecor_create(ui_t *ui, const char *caption,
+errno_t ui_wdecor_create(ui_resource_t *resource, const char *caption,
     ui_wdecor_t **rwdecor)
 {
@@ -78 +77 @@
         }
 
-        rc = ui_pbutton_create(ui, "X", &wdecor->btn_close);
+        rc = ui_pbutton_create(resource, "X", &wdecor->btn_close);
         if (rc != EOK) {
                 free(wdecor->caption);
@@ -88 +87 @@
             (void *)wdecor);
 
-        wdecor->res = ui->resource;
+        wdecor->res = resource;
         wdecor->active = true;
         *rwdecor = wdecor;

uspace/lib/ui/src/window.c

@@ -135 +135 @@
                 goto error;
 
-        ui->resource = res;
-
-        rc = ui_wdecor_create(ui, params->caption, &wdecor);
+        rc = ui_wdecor_create(res, params->caption, &wdecor);
         if (rc != EOK)
                 goto error;
@@ -225 +223 @@
 }
 
-/** Get window GC.
- *
- * Return the grapic context of the window. It is relative to the upper-left
- * corner of the window.
- *
- * @param window Window
- * @return Graphic context
- */
+ui_resource_t *ui_window_get_res(ui_window_t *window)
+{
+        return window->res;
+}
+
 gfx_context_t *ui_window_get_gc(ui_window_t *window)
 {
@@ -238 +233 @@
 }
 
-/** Get window application rectangle.
- *
- * Return the window's application rectangle. This is a rectangle covering
- * everything apart from the window frame and title bar.
- *
- * @param window Window
- * @param rect Place to store application rectangle
- */
 void ui_window_get_app_rect(ui_window_t *window, gfx_rect_t *rect)
 {
@@ -254 +241 @@
 }
 
-/** Paint window.
- *
- * @param window Window
- * @return EOK on success or an error code
- */
 errno_t ui_window_paint(ui_window_t *window)
 {