X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=98c25977c1e0b3ea09bdf7bf26297a76eb4b9f6b;hp=479fec7af807ebc7dbd3bbb34c3f5a078c6a0197;hb=d4e2f71eb7c6a7488d1c13d351adca9ffbea87ed;hpb=bb43be9a97c4c6b8fd4ac94c7438f1b0ca1d33eb

diff --git a/src/editor.c b/src/editor.c
index 479fec7a..98c25977 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -248,8 +248,8 @@
 					 ED_AREA_YOFFSET_2(3))
 
 /* values for scrolling gadgets for drawing area */
-#define ED_SCROLLBUTTON_XSIZE		16
-#define ED_SCROLLBUTTON_YSIZE		16
+#define ED_SCROLLBUTTON_XSIZE		(graphic_info[IMG_EDITOR_PLAYFIELD_SCROLLBAR].width)
+#define ED_SCROLLBUTTON_YSIZE		(graphic_info[IMG_EDITOR_PLAYFIELD_SCROLLBAR].height)
 
 #define ED_SCROLL_UP_XPOS		(SXSIZE - ED_SCROLLBUTTON_XSIZE)
 #define ED_SCROLL_UP_YPOS		(0)
@@ -7669,7 +7669,9 @@ void DrawLevelEd()
   BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto,
 	     graphic_info[IMG_BACKGROUND_PALETTE].src_x,
 	     graphic_info[IMG_BACKGROUND_PALETTE].src_y,
-	     DXSIZE, DYSIZE, DX, DY);
+	     MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width),
+	     MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height),
+	     DX, DY);
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -7678,7 +7680,9 @@ void DrawLevelEd()
   BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
 	     graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
 	     graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
-	     EXSIZE, EYSIZE, EX, EY);
+	     MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width),
+	     MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height),
+	     EX, EY);
 
   // redraw_mask |= REDRAW_ALL;