Changeset 7e38970d in mainline for uspace/lib/ui/private/fixed.h

Timestamp:

2020-12-07T00:08:37Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/ui/private/fixed.h (moved) (moved from uspace/lib/draw/include/draw/path.h ) (2 diffs)

uspace/lib/ui/private/fixed.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup draw
+/** @addtogroup libui
  * @{
  */
 /**
- * @file
+ * @file Fixed layout structure
+ *
  */
 
-#ifndef DRAW_PATH_H_
-#define DRAW_PATH_H_
+#ifndef _UI_PRIVATE_FIXED_H
+#define _UI_PRIVATE_FIXED_H
 
 #include <adt/list.h>
+#include <gfx/coord.h>
+#include <stdbool.h>
+#include <types/ui/fixed.h>
 
-typedef enum {
-        PATH_STEP_MOVETO,
-        PATH_STEP_LINETO
-} path_step_type_t;
+/** Actual structure of fixed layout.
+ *
+ * This is private to libui.
+ */
+struct ui_fixed {
+        /** Base control object */
+        struct ui_control *control;
+        /** Layout elements (ui_fixed_elem_t) */
+        list_t elem;
+};
 
+/** Fixed layout element. */
 typedef struct {
-        link_t link;
-        path_step_type_t type;
-        double to_x;
-        double to_y;
-} path_step_t;
+        /** Containing fixed layout */
+        struct ui_fixed *fixed;
+        /** Link to @c fixed->elem list */
+        link_t lelems;
+        /** Control */
+        ui_control_t *control;
+} ui_fixed_elem_t;
 
-struct path;
-typedef struct path path_t;
-
-extern void path_init(path_t *);
-extern void path_clear(path_t *);
-
-extern void path_get_cursor(path_t *, double *, double *);
-
-extern void path_move_to(path_t *, double, double);
-extern void path_line_to(path_t *, double, double);
-
-extern void path_rectangle(path_t *, double, double, double, double);
+extern ui_fixed_elem_t *ui_fixed_first(ui_fixed_t *f);
+extern ui_fixed_elem_t *ui_fixed_next(ui_fixed_elem_t *);
 
 #endif