Changeset 7e38970d in mainline for uspace/app/uidemo/uidemo.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/app/uidemo/uidemo.h (moved) (moved from uspace/lib/guigfx/include/guigfx/canvas.h ) (2 diffs)

uspace/app/uidemo/uidemo.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libguigfx
+/** @addtogroup uidemo
  * @{
  */
 /**
- * @file GFX canvas backend
+ * @file User interface demo
  */
 
-#ifndef _GUIGFX_CANVAS_H
-#define _GUIGFX_CANVAS_H
+#ifndef UIDEMO_H
+#define UIDEMO_H
 
-#include <canvas.h>
-#include <types/gfx/context.h>
-#include <types/gfx/ops/context.h>
-#include <types/guigfx/canvas.h>
+#include <display.h>
+#include <ui/entry.h>
+#include <ui/fixed.h>
+#include <ui/label.h>
+#include <ui/pbutton.h>
+#include <ui/ui.h>
+#include <ui/window.h>
 
-extern gfx_context_ops_t canvas_gc_ops;
-
-extern errno_t canvas_gc_create(canvas_t *, surface_t *, canvas_gc_t **);
-extern errno_t canvas_gc_delete(canvas_gc_t *);
-extern gfx_context_t *canvas_gc_get_ctx(canvas_gc_t *);
+/** User interface demo */
+typedef struct {
+        ui_t *ui;
+        ui_window_t *window;
+        ui_fixed_t *fixed;
+        ui_entry_t *entry;
+        ui_image_t *image;
+        ui_label_t *label;
+        ui_pbutton_t *pb1;
+        ui_pbutton_t *pb2;
+} ui_demo_t;
 
 #endif