[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
|8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 2902b39b3e349f26c04fc93acd37b7db813b1e55
Author: Ptyl Dragon p...@cloudon.com
Date: Fri Nov 1 13:09:28 2013 +0200
UISteppers now go down as well
Change-Id: I06e1b7fec490ec373a9775915d6dc2c30ce805f1
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index 22d98fa..1107eef 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -48,7 +48,7 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
stepper.autorepeat = YES;
stepper.continuous = NO;
[stepper addObserver:self forKeyPath:@value
- options: NSKeyValueObservingOptionNew
+ options: NSKeyValueObservingOptionNew |
NSKeyValueObservingOptionOld
context:0];
return stepper;
}
@@ -57,8 +57,10 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
{
if (object == self.dataStepper) {
- NSNumber * floatNumber = change[NSKeyValueChangeNewKey];
-CGFloat value = [self currentDataValue] + [floatNumber floatValue];
+NSNumber * newNumber = change[NSKeyValueChangeNewKey];
+NSNumber * oldNumber = change[NSKeyValueChangeOldKey];
+
+CGFloat value = [self currentDataValue] + [newNumber floatValue] -
[oldNumber floatValue];
if(value == ((NSInteger) value)){
self.data.text = [[NSNumber numberWithInteger:(NSInteger) value]
stringValue];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m |4 1 file changed, 4 deletions(-) New commits: commit acc592a28a3648aa56c0db41f3c3fc50be8f0191 Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 1 14:38:46 2013 +0200 No Y flip needed here Change-Id: I2518a6151050edee8796a77633097fdd11202647 diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m index f066116..864244e 100644 --- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m +++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m @@ -46,10 +46,6 @@ CGContextRef context = UIGraphicsGetCurrentContext(); CGContextSaveGState(context); -CGContextTranslateCTM(context, 0, self.tester.params.contextHeight); -CGContextScaleCTM(context, 1, -1); -CGContextScaleCTM(context, 1, 1); - touch_lo_draw_tile(context, self.tester.params.contextWidth, self.tester.params.contextHeight, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
|3 ---
1 file changed, 3 deletions(-)
New commits:
commit 42b060d8ea3819ac04dae87b8cccd16397a9ba88
Author: Tor Lillqvist t...@collabora.com
Date: Fri Nov 1 14:50:40 2013 +0200
Saving the graphics state around touch_lo_draw_tile() seems unnecessary
Change-Id: Ic1a6cf64fb05810eccc91d0095c9ced54d3d9fe1
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
index 864244e..0c18b82 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
@@ -45,15 +45,12 @@
{
CGContextRef context = UIGraphicsGetCurrentContext();
-CGContextSaveGState(context);
touch_lo_draw_tile(context,
self.tester.params.contextWidth,
self.tester.params.contextHeight,
MLODpxPointByDpxes(self.tester.params.tilePosX,self.tester.params.tilePosY),
MLODpxSizeByDpxes(self.tester.params.tileWidth,self.tester.params.tileHeight));
-CGContextRestoreGState(context);
-
MLODpxSize size = touch_lo_get_content_size();
NSLog(@touch_lo_get_content_size: width=%f, height=%f,size.width,
size.height);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
|1
ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
| 12 ++
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
| 19 +++---
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
|7 +++
4 files changed, 34 insertions(+), 5 deletions(-)
New commits:
commit 9f1e17cf4f8130fb356de4c69634154d08ea87e7
Author: Ptyl Dragon p...@cloudon.com
Date: Fri Nov 1 15:55:44 2013 +0200
changed testing app UI to be more clear what it does
Change-Id: I5307478fc47f0810cae24c72ce509ac6a409bf1b
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
index 8465b5d..041e198 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
@@ -19,4 +19,5 @@ typedef void (^MLOTestingTileParameterExtractor)(CGFloat
value);
-(void)extractMode:(MLOTestingTileParametersMode) mode;
-(void)setParamFrame:(CGRect) paramFrame;
-(void)addToSuperview;
+-(void)enterMode:(MLOTestingTileParametersMode)mode;
@end
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index 9c0af4f..a661539 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -185,4 +185,16 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
extractor([self currentDataValue]);
}
}
+-(BOOL)isSupportingMode:(MLOTestingTileParametersMode) mode{
+return [self getExtractor:mode]!=nil;
+}
+-(void)enterMode:(MLOTestingTileParametersMode)mode{
+CGFloat alpha = [self isSupportingMode:mode] ? 1.0f: 0.0f;
+self.label.alpha = alpha;
+self.data.alpha = alpha;
+self.dataStepper.alpha = alpha;
+self.step.alpha =alpha;
+self.stepStepper.alpha = alpha;
+}
+
@end
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
index 0c18b82..f8fcadb 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
@@ -45,11 +45,22 @@
{
CGContextRef context = UIGraphicsGetCurrentContext();
+MLODpxPoint tilePosition
=MLODpxPointByDpxes(self.tester.params.tilePosX,self.tester.params.tilePosY);
+MLODpxSize tileSize =
MLODpxSizeByDpxes(self.tester.params.tileWidth,self.tester.params.tileHeight);
+NSInteger contextWidth = self.tester.params.contextWidth;
+NSInteger contextHeight = self.tester.params.contextHeight;
+
+NSLog(@touch_lo_draw_tile(contextWidth=%d, contextHeight=%d,
tilePosition=%@, tileSize=%@,
+ contextWidth,
+ contextHeight,
+ NSStringFromCGPoint(tilePosition),
+ NSStringFromCGSize(tileSize));
+
touch_lo_draw_tile(context,
- self.tester.params.contextWidth,
- self.tester.params.contextHeight,
-
MLODpxPointByDpxes(self.tester.params.tilePosX,self.tester.params.tilePosY),
-
MLODpxSizeByDpxes(self.tester.params.tileWidth,self.tester.params.tileHeight));
+ contextWidth,
+ contextHeight,
+ tilePosition,
+ tileSize);
MLODpxSize size = touch_lo_get_content_size();
NSLog(@touch_lo_get_content_size: width=%f, height=%f,size.width,
size.height);
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index 4a235e1..52d7b64 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -26,11 +26,13 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
self = [self init];
if(self){
self.tester = tester;
-self.mode = WIDTH_IS_HEIGHT;
[self initParams];
[self initModeButton];
[self initRenderButton];
+self.mode = WIDTH_IS_NOT_HEIGHT;
+[self changeMode];
+
}
NSLog(@%@ initWithTester,self);
@@ -96,6 +98,9 @@ static const CGFloat
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
|8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4ba4d45da9f1f1df28fd68a29091e57bd30a9d61
Author: Ptyl Dragon p...@cloudon.com
Date: Fri Nov 1 16:11:21 2013 +0200
fix less than 1 step limit
Change-Id: Ic5fd714ff975b6e5afbe7ff78f3fc1da398a658d
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index a661539..89267e5 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -34,18 +34,18 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
self.widthIsNotHeightExtractor = widthIsNotHeightExtractor;
self.defaultValue = defaultValue;
[self initLabel:label];
-self.dataStepper = [self createStepper];
-self.stepStepper = [self createStepper];
+self.dataStepper = [self stepperWithMinValue:-MAXFLOAT];
+self.stepStepper = [self stepperWithMinValue:1];
[self initDataTextField];
[self initStepTextField];
}
return self;
}
--(UIStepper *) createStepper{
+-(UIStepper *) stepperWithMinValue:(CGFloat) minValue{
UIStepper * stepper = [UIStepper new];
stepper.maximumValue = MAXFLOAT;
-stepper.minimumValue = -MAXFLOAT;
+stepper.minimumValue = minValue;
stepper.stepValue = DEFAULT_STEP_VALUE;
stepper.autorepeat = YES;
stepper.continuous = NO;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/cxx/mlo.mm |2 --
1 file changed, 2 deletions(-)
New commits:
commit 4f1ab2f2b95ffafdf46f3c5b00d4819946f70522
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 11:43:05 2013 +0200
fileacc is not a separate component any more
Change-Id: I5adadb725e4792360d542121b2515a405901bc6e
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm
b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 478e012..b1436a9 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -35,7 +35,6 @@ extern C {
//ADD_LIB(dbaxml); // dbaccess lib
ADD_LIB(evtatt);// basic event handling
-ADD_LIB(fileacc); // Simple file access func
//ADD_LIB(frm); // form control in documents
ADD_LIB(fsstorage); // part of svl required when editing file
ADD_LIB(stocservices);
@@ -140,7 +139,6 @@ lo_get_libmap(void)
//MAP_LIB_LO(xmlfd),
MAP_LIB(xmlsecurity), //MAP_LIB_LO(sc), //MAP_LIB_LO(sd),
MAP_LIB_LO(svx),MAP_LIB_LO(fwl),MAP_LIB_LO(oox),
-MAP_LIB(fileacc), MAP_LIB_LO(svt),MAP_LIB_LO(xof),
MAP_LIB_LO(evtatt), MAP_LIB_LO(fsstorage), MAP_LIB_LO(lng),
MAP_LIB_LO(swd),MAP_LIB_LO(sw), MAP_LIB_LO(lnth),
MAP_LIB_LO(unordf), MAP_LIB_LO(unoxml), MAP_LIB_LO(xo),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared sw/source
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
| 12 +-
sw/source/core/view/viewsh.cxx
|8 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit deaee517c69ee7026a70b71867d7ca476e582987
Author: Ptyl Dragon p...@cloudon.com
Date: Mon Oct 28 16:54:21 2013 +0200
for tor
Change-Id: I1565450c763e4f0bf1a724978b5550163d627482
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index be2e144..acd00c1 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -39,12 +39,12 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
}
-(void)initParams{
-self.params = @[[self createParam:@contextWidth extractor:^(CGFloat
value){self.contextWidth = value;} value:300],
-[self createParam:@contextHeight extractor:^(CGFloat
value){self.contextHeight = value;} value:300],
-[self createParam:@tilePosX extractor:^(CGFloat
value){self.tilePosX = value;} value:0],
-[self createParam:@tilePosY extractor:^(CGFloat
value){self.tilePosY = value;} value:0],
-[self createParam:@tileWidth extractor:^(CGFloat
value){self.tileWidth = value;} value:300],
-[self createParam:@tileHeight extractor:^(CGFloat
value){self.tileHeight = value;} value:300]
+self.params = @[[self createParam:@contextWidth extractor:^(CGFloat
value){self.contextWidth = value;} value:600],
+[self createParam:@contextHeight extractor:^(CGFloat
value){self.contextHeight = value;} value:600],
+[self createParam:@tilePosX extractor:^(CGFloat
value){self.tilePosX = value;} value:600],
+[self createParam:@tilePosY extractor:^(CGFloat
value){self.tilePosY = value;} value:600],
+[self createParam:@tileWidth extractor:^(CGFloat
value){self.tileWidth = value;} value:1000],
+[self createParam:@tileHeight extractor:^(CGFloat
value){self.tileHeight = value;} value:1000]
];
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index fdf7577..d64e1fa 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1792,15 +1792,15 @@ void touch_lo_draw_tile(void * context, int
contextWidth, int contextHeight, int
MapMode aMapMode(aDevice.GetMapMode());
aMapMode.SetMapUnit(MAP_TWIP);
aMapMode.SetOrigin(Point(-tilePosX, -tilePosY));
-// scaling
-Fraction scaleX(contextWidth,tileWidth);
-Fraction scaleY(contextHeight,tileHeight);
+// scaling
+Fraction scaleX(tileWidth,contextWidth);
+Fraction scaleY(tileHeight,contextHeight);
aMapMode.SetScaleX(scaleX);
aMapMode.SetScaleY(scaleY);
aDevice.SetMapMode(aMapMode);
// resizes the virtual device so to contain the entrie context
aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
-// draw
+// draw - works in logic coordinates
pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY),
Size(tileWidth, tileHeight)));
// copy the aDevice content to mpImage
Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)),
aDevice.PixelToLogic(Size(contextWidth, contextHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared sw/source
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
|8 +++
sw/source/core/view/viewsh.cxx
| 11 --
2 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 8ff597b589f49a27ee75b7a8bd7301a90e7b4770
Author: Ptyl Dragon p...@cloudon.com
Date: Thu Oct 24 16:48:28 2013 +0200
now iOS draws something (upside down)
Change-Id: Ibf04322d34605fce30b2fa477de98a3e2ff9c2d1
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index 2381df9..be2e144 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -39,12 +39,12 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
}
-(void)initParams{
-self.params = @[[self createParam:@contextWidth extractor:^(CGFloat
value){self.contextWidth = value;} value:100],
-[self createParam:@contextHeight extractor:^(CGFloat
value){self.contextHeight = value;} value:100],
+self.params = @[[self createParam:@contextWidth extractor:^(CGFloat
value){self.contextWidth = value;} value:300],
+[self createParam:@contextHeight extractor:^(CGFloat
value){self.contextHeight = value;} value:300],
[self createParam:@tilePosX extractor:^(CGFloat
value){self.tilePosX = value;} value:0],
[self createParam:@tilePosY extractor:^(CGFloat
value){self.tilePosY = value;} value:0],
-[self createParam:@tileWidth extractor:^(CGFloat
value){self.tileWidth = value;} value:100],
-[self createParam:@tileHeight extractor:^(CGFloat
value){self.tileHeight = value;} value:100]
+[self createParam:@tileWidth extractor:^(CGFloat
value){self.tileWidth = value;} value:300],
+[self createParam:@tileHeight extractor:^(CGFloat
value){self.tileHeight = value;} value:300]
];
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index af6b8af..3a978d4 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -58,6 +58,7 @@
#include vcl/bitmapex.hxx
#include svtools/colorcfg.hxx
#include vcl/bmpacc.hxx
+#include vcl/alpha.hxx
#include svtools/accessibilityoptions.hxx
#include accessibilityoptions.hxx
#include statstr.hrc
@@ -1790,12 +1791,10 @@ void touch_lo_draw_tile(void * context, int
contextWidth, int contextHeight, int
// SystemGraphicsData aData;
// [setup the aData]
// VirtualDevice aDevice(aData, [color depth]);
-VirtualDevice aDevice;
-aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
-
-pViewShell-PaintTile(aDevice, Rectangle(tilePosX, tilePosY,
tileWidth, tileHeight));
-BitmapEx aBitmapEx(aDevice.GetBitmapEx(Point(0,0),
aDevice.GetOutputSizePixel()));
-Bitmap aBitmap = aBitmapEx.GetBitmap();
+//VirtualDevice aDevice;
+//aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
+pViewShell-PaintTile(pViewShell-GetOut(), Rectangle(tilePosX,
tilePosY, tileWidth, tileHeight));
+Bitmap aBitmap(pViewShell-GetOut()-GetBitmap(Point(0,0),
pViewShell-GetOut()-PixelToLogic(Size(contextWidth, contextHeight;
BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess();
touch_lo_copy_buffer((void *) readAccess-GetBuffer(),
tileWidth,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
