Changeset 00ddb40 in mainline for uspace/lib/draw

Timestamp:

2014-08-31T20:10:20Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5713e5f

Parents:

8d3512f1

Message:

Get rid of black alias at the edge of rotated windows

Location:

uspace/lib/draw

Files:

• font/bitmap_backend.c (modified) (1 diff)
• source.c (modified) (6 diffs)
• source.h (modified) (3 diffs)

uspace/lib/draw/font/bitmap_backend.c

@@ -143 +143 @@
         source_t source;
         source_init(&source);
-        source_set_texture(&source, raw_surface, false);
+        source_set_texture(&source, raw_surface, PIXELMAP_EXTEND_TRANSPARENT_BLACK);
 
         transform_t transform;

uspace/lib/draw/source.c

@@ -45 +45 @@
         source->color = PIXEL(0, 0, 0, 0);
         source->texture = NULL;
-        source->texture_tile = false;
+        source->texture_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 
         source->alpha = PIXEL(255, 0, 0, 0);
         source->mask = NULL;
-        source->mask_tile = false;
+        source->mask_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 }
 
@@ -73 +73 @@
 }
 
-void source_set_texture(source_t *source, surface_t *texture, bool tile)
+void source_set_texture(source_t *source, surface_t *texture,
+    pixelmap_extend_t extend)
 {
         source->texture = texture;
-        source->texture_tile = tile;
+        source->texture_extend = extend;
 }
 
@@ -84 +85 @@
 }
 
-void source_set_mask(source_t *source, surface_t *mask, bool tile)
+void source_set_mask(source_t *source, surface_t *mask,
+    pixelmap_extend_t extend)
 {
         source->mask = mask;
-        source->mask_tile = tile;
+        source->mask_extend = extend;
 }
 
@@ -95 +97 @@
             (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0)) &&
             (source->texture != NULL) &&
-            (source->texture_tile == false) &&
+            (source->texture_extend == PIXELMAP_EXTEND_TRANSPARENT_BLACK) &&
             (transform_is_fast(&source->transform)));
 }
@@ -120 +122 @@
                 mask_pix = source->filter(
                     surface_pixmap_access(source->mask),
-                    x, y, source->mask_tile);
+                    x, y, source->mask_extend);
         } else {
                 mask_pix = source->alpha;
@@ -133 +135 @@
                 texture_pix = source->filter(
                     surface_pixmap_access(source->texture),
-                    x, y, source->texture_tile);
+                    x, y, source->texture_extend);
         } else {
                 texture_pix = source->color;

uspace/lib/draw/source.h

@@ -42 +42 @@
 #include <transform.h>
 #include <filter.h>
+#include <io/pixelmap.h>
 
 #include "surface.h"
@@ -51 +52 @@
         pixel_t color;
         surface_t *texture;
-        bool texture_tile;
+        pixelmap_extend_t texture_extend;
 
         pixel_t alpha;
         surface_t *mask;
-        bool mask_tile;
+        pixelmap_extend_t mask_extend;
 } source_t;
 
@@ -66 +67 @@
 
 extern void source_set_color(source_t *, pixel_t);
-extern void source_set_texture(source_t *, surface_t *, bool);
+extern void source_set_texture(source_t *, surface_t *, pixelmap_extend_t);
 
 extern void source_set_alpha(source_t *, pixel_t);
-extern void source_set_mask(source_t *, surface_t *, bool);
+extern void source_set_mask(source_t *, surface_t *, pixelmap_extend_t);
 
 extern bool source_is_fast(source_t *);