From 94ace21566bb062221af2848f446b9a3cd8b8985 Mon Sep 17 00:00:00 2001 From: IoI_xD Date: Wed, 8 Apr 2026 18:04:25 -0700 Subject: [PATCH] a --- src/backend/wayland.c | 11 +++------ src/draw.c | 55 +++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/backend/wayland.c b/src/backend/wayland.c index f9d0acd..c98a187 100644 --- a/src/backend/wayland.c +++ b/src/backend/wayland.c @@ -2333,12 +2333,8 @@ static MwLLPixmap MwLLCreatePixmapImpl(MwLL handle, unsigned char* data, int wid r->common.raw = malloc(4 * width * height); memcpy(r->common.raw, data, 4 * width * height); - // pixman_transform_init_identity(&transform); - r->wayland.img = NULL; - // pixman_image_set_transform(r->wayland.img, &transform); - MwLLPixmapUpdate(r); return r; @@ -2359,10 +2355,9 @@ static void MwLLDestroyPixmapImpl(MwLLPixmap pixmap) { } static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) { - int width, height; - pixman_transform_t transform; - pixman_transform_t reverse; - struct pixman_box16 b; + int width, height; + pixman_transform_t transform; + pixman_transform_t reverse; pixman_transform_init_identity(&transform); diff --git a/src/draw.c b/src/draw.c index 3dce0c3..55ace33 100644 --- a/src/draw.c +++ b/src/draw.c @@ -140,15 +140,16 @@ void MwDrawRectFading(MwWidget handle, MwRect* rect, MwLLColor color, int rounde pixmap = MwLLCreatePixmap(handle->lowlevel, data, 1, rect->height); if(rounded && rect->height >= (roundness * 2) && rect->width >= (roundness * 2) && roundness > 0) { for(i = 0; i < roundness; i++) { - int x = (roundness + 2); - int y = rect->y + (roundness + 2); - double point = ((i + (M_PI * 4)) / div); - r.x = (roundness + 4) - (sin(point) * roundness); - r.y = y + (cos(point) * roundness) + 1; - r.width = roundness; - r.height = (rect->height - ((r.y - rect->y) * 2) - 1); + int x = (roundness + 2); + int y = rect->y + (roundness + 2); + double point = ((i + (M_PI * 4)) / div); + double point2 = (((i + 2) + (M_PI * 4)) / div); + r.x = (roundness + 4) - (sin(point) * roundness); + r.y = y + (cos(point) * roundness) + 1; + r.width = roundness; + r.height = (rect->height - ((r.y - rect->y) * 2) - 1); MwLLDrawPixmap(handle->lowlevel, &r, pixmap); - r.width = x + (sin(point + 1) * roundness); + r.width = x + (sin(point2) * roundness); r.x = ((rect->width - (roundness + 1)) + (sin(point) * roundness)) - r.width; MwLLDrawPixmap(handle->lowlevel, &r, pixmap); } @@ -355,14 +356,15 @@ static void frame_border_complex(MwWidget handle, MwRect* rect, MwLLColor lighte /* top left edge */ for(i = 0; i < BORDER_SMOOTHNESS; i += 2) { MwPoint line[2]; - double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); - int x = rect->x + (roundness + 2); - int y = rect->y + (roundness + 2); + double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + double point2 = (((i + 2) + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + int x = rect->x + (roundness + 2); + int y = rect->y + (roundness + 2); line[0].x = x - (sin(point) * roundness); line[0].y = y + (cos(point) * roundness); - line[1].x = x - (sin(point + 1) * roundness); - line[1].y = y + (cos(point + 1) * roundness); + line[1].x = x - (sin(point2) * roundness); + line[1].y = y + (cos(point2) * roundness); MwLLLine(handle->lowlevel, line, invert ? lighter : darker); } @@ -389,13 +391,14 @@ static void frame_border_complex(MwWidget handle, MwRect* rect, MwLLColor lighte for(i = 0; i < BORDER_SMOOTHNESS; i += 2) { MwPoint line[2]; double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + double point2 = (((i + 1) + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); int x = (rect->x + rect->width) - (roundness + 2); int y = rect->y + (roundness + 2); double placeholder = (sin(point) * roundness); line[0].x = x + placeholder; line[0].y = y + (cos(point) * roundness); - line[1].x = x + (sin(point + 1) * roundness); - line[1].y = y + (cos(point + 1) * roundness); + line[1].x = x + (sin(point2) * roundness); + line[1].y = y + (cos(point2) * roundness); MwLLLine(handle->lowlevel, line, invert ? lighter : darker); } } else { @@ -422,14 +425,15 @@ static void frame_border_complex(MwWidget handle, MwRect* rect, MwLLColor lighte /* bottom left edge */ for(i = 0; i < BORDER_SMOOTHNESS; i += 2) { MwPoint line[2]; - double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); - int x = rect->x + (roundness + 2); - int y = (rect->y + rect->height) - (roundness + 2); + double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + double point2 = (((i + 1) + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + int x = rect->x + (roundness + 2); + int y = (rect->y + rect->height) - (roundness + 2); line[0].x = x - (sin(point) * roundness); line[0].y = y - (cos(point) * roundness); - line[1].x = x - (sin(point + 1) * roundness); - line[1].y = y - (cos(point + 1) * roundness); + line[1].x = x - (sin(point2) * roundness); + line[1].y = y - (cos(point2) * roundness); MwLLLine(handle->lowlevel, line, invert ? lighter : darker); } p[0].x = rect->x + roundness; @@ -458,14 +462,15 @@ static void frame_border_complex(MwWidget handle, MwRect* rect, MwLLColor lighte /* bottom right edge */ for(i = 0; i < BORDER_SMOOTHNESS; i += 2) { MwPoint line[2]; - double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); - int x = (rect->x + rect->width) - (roundness + 2); - int y = (rect->y + rect->height) - (roundness + 2); + double point = ((i + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + double point2 = (((i + 2) + (M_PI * (BORDER_SMOOTHNESS / 2.))) / (BORDER_SMOOTHNESS)); + int x = (rect->x + rect->width) - (roundness + 2); + int y = (rect->y + rect->height) - (roundness + 2); line[0].x = x + (sin(point) * roundness); line[0].y = y - (cos(point) * roundness); - line[1].x = x + (sin(point + 1) * roundness); - line[1].y = y - (cos(point + 1) * roundness); + line[1].x = x + (sin(point2) * roundness); + line[1].y = y - (cos(point2) * roundness); MwLLLine(handle->lowlevel, line, invert ? lighter : darker); } } else {