From 767e6734cb31ed805b6c6a8ddc8d41e032e969a5 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <buggins@fromru.com>
Date: Tue, 20 May 2014 16:36:00 +0400
Subject: [PATCH] tiled images support is working

---
 src/dlangui/graphics/images.d      | 3 ++-
 src/dlangui/graphics/resources.d   | 2 --
 src/dlangui/platforms/sdl/sdlapp.d | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/dlangui/graphics/images.d b/src/dlangui/graphics/images.d
index 7eb7fd51..2ce3ead1 100644
--- a/src/dlangui/graphics/images.d
+++ b/src/dlangui/graphics/images.d
@@ -112,9 +112,10 @@ static if (USE_FREEIMAGE) {
 		//get the image width and height, and size per pixel
 		int width = FreeImage_GetWidth(dib);
 		int height = FreeImage_GetHeight(dib);
-        int stride = FreeImage_GetLine(dib);
+        int stride = FreeImage_GetPitch(dib);
 		int bpp = FreeImage_GetBPP(dib);
 		int pixelSize = (bpp + 7)/8;
+		//Log.d("image ", width, "x", height, " stride ", stride, "(", stride / pixelSize, ") bpp ", bpp, " pixelSize ", pixelSize);
 		FREE_IMAGE_COLOR_TYPE colorType = FreeImage_GetColorType(dib);
         int transparentIndex = 0;
         int transparencyCount = 0;
diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d
index a89a36b2..b030c289 100644
--- a/src/dlangui/graphics/resources.d
+++ b/src/dlangui/graphics/resources.d
@@ -311,8 +311,6 @@ class ImageDrawable : Drawable {
                         buf.drawFragment(dst.left, dst.top, _image.get, src);
                 }
             }
-            buf.drawImage(rc.left + 30, rc.top + 30, _image);
-            buf.drawFrame(Rect(rc.left + 30, rc.top + 30, rc.left + imgdx + 30, rc.top + imgdy + 30), 0x80800000, Rect(2,2,2,2));
 		} else {
             // rescaled or normal
             if (rc.width != _image.width || rc.height != _image.height)
diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d
index e48b512e..76608312 100644
--- a/src/dlangui/platforms/sdl/sdlapp.d
+++ b/src/dlangui/platforms/sdl/sdlapp.d
@@ -823,7 +823,7 @@ version(USE_SDL) {
 									Log.d("SDL_WINDOWEVENT_ENTER");
                                     break;
                                 case SDL_WINDOWEVENT_LEAVE:
-                                    Log.d("SDL_WINDOWEVENT_MAXIMIZED");
+									Log.d("SDL_WINDOWEVENT_LEAVE");
                                     break;
                                 case SDL_WINDOWEVENT_FOCUS_GAINED:
 									Log.d("SDL_WINDOWEVENT_FOCUS_GAINED");