Fixed window move y overflow

2 files changed, 1 insertions, 2 deletions

diff --git a/apps/wm.c b/apps/wm.c
index 0988538..2df2e51 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -124,7 +124,6 @@ int main(int argc, char **argv)
 			cursor->y = mouse_y;
 
 			if (event->but1 && !(focused->flags & WF_NO_DRAG) &&
-			    mouse_y + (int)focused->height < vbe->height - 1 &&
 			    mouse_skip % MOUSE_SKIP == 0) {
 				mouse_skip = 0;
 				focused->x = mouse_x;
diff --git a/libgui/gui.c b/libgui/gui.c
index 3279ab0..50a6f62 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -130,7 +130,7 @@ void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
 	int bypp = dest->bpp >> 3;
 	u8 *srcfb = src->fb;
 	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
-	for (u32 cy = 0; cy < src->height; cy++) {
+	for (u32 cy = 0; cy < src->height && cy + y < dest->height; cy++) {
 		for (u32 cx = 0; cx < src->width; cx++) {
 			if (srcfb[bypp * cx + 3]) {
 				destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];