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

uspace/lib/ui/private/image.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libguigfx
+/** @addtogroup libui
  * @{
  */
 /**
- * @file GFX canvas backend structure
+ * @file Image structure
  *
  */
 
-#ifndef _GUIGFX_PRIVATE_CANVAS_H
-#define _GUIGFX_PRIVATE_CANVAS_H
+#ifndef _UI_PRIVATE_IMAGE_H
+#define _UI_PRIVATE_IMAGE_H
 
-#include <canvas.h>
-#include <draw/surface.h>
 #include <gfx/bitmap.h>
-#include <gfx/context.h>
 #include <gfx/coord.h>
-#include <io/pixel.h>
-#include <memgfx/memgc.h>
 
-/** Actual structure of canvas GC. */
-struct canvas_gc {
-        /** Memory GC */
-        mem_gc_t *mgc;
-        /** Base graphic context */
-        gfx_context_t *gc;
-        /** Canvas */
-        canvas_t *canvas;
-        /** Surface */
-        surface_t *surface;
+/** Actual structure of image.
+ *
+ * This is private to libui.
+ */
+struct ui_image {
+        /** Base control object */
+        struct ui_control *control;
+        /** UI resource */
+        struct ui_resource *res;
+        /** Image rectangle */
+        gfx_rect_t rect;
+        /** Flags */
+        ui_image_flags_t flags;
+        /** Bitmap */
+        gfx_bitmap_t *bitmap;
+        /** Bitmap rectangle */
+        gfx_rect_t brect;
 };