Changeset 3583ffb in mainline for uspace/lib/ui/src/window.c

Timestamp:

2020-11-08T19:51:04Z (4 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.

File:

• uspace/lib/ui/src/window.c (modified) (4 diffs)

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)
 {