aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-06-08 17:21:10 +0200
committerDrew DeVault <sir@cmpwn.com>2020-06-17 09:10:54 -0600
commit00ccb89288d8d64c2f47282e74cf59967be7178b (patch)
treed8825dfea831214ddb15571196e36a3f2aac5d82
parent9814213a91e7ceb0f8d422c45562fe0c5e74f2a9 (diff)
util/region: add wlr_region_scale_xy
-rw-r--r--include/wlr/util/region.h3
-rw-r--r--util/region.c15
2 files changed, 13 insertions, 5 deletions
diff --git a/include/wlr/util/region.h b/include/wlr/util/region.h
index c3dbd78a..9e193722 100644
--- a/include/wlr/util/region.h
+++ b/include/wlr/util/region.h
@@ -30,6 +30,9 @@
void wlr_region_scale(pixman_region32_t *dst, pixman_region32_t *src,
float scale);
+void wlr_region_scale_xy(pixman_region32_t *dst, pixman_region32_t *src,
+ float scale_x, float scale_y);
+
/**
* Applies a transform to a region inside a box of size `width` x `height`.
*/
diff --git a/util/region.c b/util/region.c
index bfec4ed4..f39f0469 100644
--- a/util/region.c
+++ b/util/region.c
@@ -7,7 +7,12 @@
void wlr_region_scale(pixman_region32_t *dst, pixman_region32_t *src,
float scale) {
- if (scale == 1) {
+ wlr_region_scale_xy(dst, src, scale, scale);
+}
+
+void wlr_region_scale_xy(pixman_region32_t *dst, pixman_region32_t *src,
+ float scale_x, float scale_y) {
+ if (scale_x == 1.0 && scale_y == 1.0) {
pixman_region32_copy(dst, src);
return;
}
@@ -21,10 +26,10 @@ void wlr_region_scale(pixman_region32_t *dst, pixman_region32_t *src,
}
for (int i = 0; i < nrects; ++i) {
- dst_rects[i].x1 = floor(src_rects[i].x1 * scale);
- dst_rects[i].x2 = ceil(src_rects[i].x2 * scale);
- dst_rects[i].y1 = floor(src_rects[i].y1 * scale);
- dst_rects[i].y2 = ceil(src_rects[i].y2 * scale);
+ dst_rects[i].x1 = floor(src_rects[i].x1 * scale_x);
+ dst_rects[i].x2 = ceil(src_rects[i].x2 * scale_x);
+ dst_rects[i].y1 = floor(src_rects[i].y1 * scale_y);
+ dst_rects[i].y2 = ceil(src_rects[i].y2 * scale_y);
}
pixman_region32_fini(dst);