diff options
| author | Ptyl Dragon <ptyl@cloudon.com> | 2013-10-24 11:28:42 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-11-15 16:51:51 +0100 |
| commit | 637e8970cfe56d53b5d1da40b31246414e54c759 (patch) | |
| tree | c0d7f74ff0e7037ebe2d9d7ee618abf8977d0ba5 | |
| parent | 2ffb7509ecee55209beae73c3bc8df60e44d3e35 (diff) | |
now showing blank tile
Change-Id: I76cbf205e19ffff83bea1ebae28f5172b2fbc250
| -rw-r--r-- | ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m | 1 | ||||
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m index bcc2191f58dc..5dc9db16732a 100644 --- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m +++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileRendererViewController.m @@ -30,6 +30,7 @@ -(void)initScrollView{ self.scrollView = [UIScrollView new]; + self.scrollView.backgroundColor = [UIColor grayColor]; self.view = self.scrollView; } -(void)resize{ diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index b219ef02573b..ca544063bf4c 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -55,7 +55,9 @@ #include <ndole.hxx> #include <ndindex.hxx> #include <accmap.hxx> +#include <vcl/bitmapex.hxx> #include <svtools/colorcfg.hxx> +#include <vcl/bmpacc.hxx> #include <svtools/accessibilityoptions.hxx> #include <accessibilityoptions.hxx> #include <statstr.hrc> @@ -64,6 +66,7 @@ #include <sortedobjs.hxx> #include <anchoredobject.hxx> #include <wrtsh.hxx> +#include <vcl/alpha.hxx> #include "../../ui/inc/view.hxx" #include <PostItMgr.hxx> @@ -1788,7 +1791,16 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); pViewShell->PaintTile(&aDevice, Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); - //TODO now get it to the 'context' + BitmapEx aBitmapEx(aDevice.GetBitmapEx(Point(0,0), aDevice.GetOutputSizePixel())); + Bitmap aBitmap = aBitmapEx.GetBitmap(); + BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess(); + touch_lo_copy_buffer((void *) readAccess->GetBuffer(), + tileWidth, + tileHeight, + readAccess-> GetScanlineSize(), + context, + contextWidth, + contextHeight); } } |