Changeset 7e38970d in mainline for uspace/lib/ui/private/control.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/control.h (moved) (moved from uspace/lib/softrend/rectangle.h ) (2 diffs)

uspace/lib/ui/private/control.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup softrend
+/** @addtogroup libui
  * @{
  */
 /**
- * @file
+ * @file UI control structure
+ *
  */
 
-#ifndef SOFTREND_RECTANGLE_H_
-#define SOFTREND_RECTANGLE_H_
+#ifndef _UI_PRIVATE_CONTROL_H
+#define _UI_PRIVATE_CONTROL_H
 
+#include <gfx/coord.h>
 #include <stdbool.h>
-#include <types/common.h>
 
-extern bool rectangle_intersect(
-    sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
-extern void rectangle_union(
-    sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
+/** Actual structure of UI control.
+ *
+ * UI control is the abstract base class to all UI controls (e.g. push button,
+ * label). This is private to libui.
+ */
+struct ui_control {
+        /** Pointer to layout element structure this control is attached to
+         * or @c NULL if the control is not attached to a layout
+         */
+        void *elemp;
+        /** Ops */
+        struct ui_control_ops *ops;
+        /** Extended data */
+        void *ext;
+};
 
 #endif