Changeset 8c772c4 in mainline for uspace/lib/ui/src

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/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 *);
@@ -64 +65 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_label_create(ui_resource_t *resource, const char *text,
+errno_t ui_label_create(ui_t *ui, const char *text,
     ui_label_t **rlabel)
 {
@@ -87 +88 @@
         }
 
-        label->res = resource;
+        label->res = ui->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 */
@@ -72 +73 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_pbutton_create(ui_resource_t *resource, const char *caption,
+errno_t ui_pbutton_create(ui_t *ui, const char *caption,
     ui_pbutton_t **rpbutton)
 {
@@ -96 +97 @@
         }
 
-        pbutton->res = resource;
+        pbutton->res = ui->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"
 
@@ -61 +62 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_wdecor_create(ui_resource_t *resource, const char *caption,
+errno_t ui_wdecor_create(ui_t *ui, const char *caption,
     ui_wdecor_t **rwdecor)
 {
@@ -77 +78 @@
         }
 
-        rc = ui_pbutton_create(resource, "X", &wdecor->btn_close);
+        rc = ui_pbutton_create(ui, "X", &wdecor->btn_close);
         if (rc != EOK) {
                 free(wdecor->caption);
@@ -87 +88 @@
             (void *)wdecor);
 
-        wdecor->res = resource;
+        wdecor->res = ui->resource;
         wdecor->active = true;
         *rwdecor = wdecor;

uspace/lib/ui/src/window.c

@@ -135 +135 @@
                 goto error;
 
-        rc = ui_wdecor_create(res, params->caption, &wdecor);
+        ui->resource = res;
+
+        rc = ui_wdecor_create(ui, params->caption, &wdecor);
         if (rc != EOK)
                 goto error;
@@ -223 +225 @@
 }
 
-ui_resource_t *ui_window_get_res(ui_window_t *window)
-{
-        return window->res;
-}
-
+/** 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
+ */
 gfx_context_t *ui_window_get_gc(ui_window_t *window)
 {
@@ -233 +238 @@
 }
 
+/** 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)
 {
@@ -241 +254 @@
 }
 
+/** Paint window.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
 errno_t ui_window_paint(ui_window_t *window)
 {