diff options
| author | ptyl@cloudon.com <ptyl@cloudon.com> | 2013-10-15 20:21:17 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-15 22:38:04 +0300 |
| commit | 79d83741eb0d60d741415de8b8f01b3ef8510ae2 (patch) | |
| tree | 3f220783cc0b4a54cbdcda738b7ca3ac14114b36 /vcl | |
| parent | a83b3b5d45ba516883e80eefd7c5f6785b8a567c (diff) | |
New iOS client code
does not work yet - needs fix by tor after refactoring of ios-bootstrap.h
Change-Id: I0728306beb734511bd3f16e2e4922fd726bb37da
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/ios/iosinst.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 7b4bcd2db879..353abe4662ef 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -155,7 +155,7 @@ public: sal_uLong nSalFrameStyle, SystemParentData *pSysParent ) : SvpSalFrame( pInstance, pParent, nSalFrameStyle, - true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA, + true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, pSysParent ) { enableDamageTracker(); @@ -339,7 +339,7 @@ IMPL_LINK( IosSalInstance, RenderWindows, RenderWindowsArg*, arg ) it++ ) { IosSalFrame *pFrame = static_cast<IosSalFrame *>(*it); SalFrameGeometry aGeom = pFrame->GetGeometry(); - CGRect bbox = CGRectMake( aGeom.nX, aGeom.nY, aGeom.nWidth, aGeom.nHeight ); + CGRect bbox = CGRectMake( 0, 0, aGeom.nWidth, aGeom.nHeight ); if ( pFrame->IsVisible() && CGRectIntersectsRect( invalidRect, bbox ) ) { @@ -353,7 +353,7 @@ IMPL_LINK( IosSalInstance, RenderWindows, RenderWindowsArg*, arg ) CGImageCreate( aDevice->getSize().getX(), aDevice->getSize().getY(), 8, 32, aDevice->getScanlineStride(), CGColorSpaceCreateDeviceRGB(), - kCGImageAlphaNoneSkipLast, + kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little, provider, NULL, false, @@ -428,7 +428,7 @@ void touch_lo_tap(int x, int y) } extern "C" -void touch_lo_mouse_drag(int x, int y, LOMouseButtonState state) +void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state) { SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame(); |