[Libreoffice-commits] core.git: ios/iosremote
siqi
me at siqi.fr
Mon Jul 15 04:09:47 PDT 2013
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 3 ++-
ios/iosremote/iosremote/slideShow_vc.m | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 99aaa7d985a84302a9945633727bcb444329353e
Author: siqi <me at siqi.fr>
Date: Mon Jul 15 13:09:26 2013 +0200
click on next slide preview will bring users to the next slide
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index 1867d81..9e5f891 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -299,7 +299,7 @@
<rect key="frame" x="3" y="3" width="86" height="172"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="B2g-rO-b9G">
+ <imageView contentMode="scaleAspectFit" verticalCompressionResistancePriority="1000" id="B2g-rO-b9G">
<rect key="frame" x="0.0" y="104" width="86" height="68"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -627,6 +627,7 @@
<class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
<relationships>
+ <relationship kind="action" name="startPresentationAction:"/>
<relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
</relationships>
</class>
diff --git a/ios/iosremote/iosremote/slideShow_vc.m b/ios/iosremote/iosremote/slideShow_vc.m
index 9504e79..c8f58fc 100644
--- a/ios/iosremote/iosremote/slideShow_vc.m
+++ b/ios/iosremote/iosremote/slideShow_vc.m
@@ -186,8 +186,8 @@
}
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+ UITouch *touch = [[event allTouches] anyObject];
if (!self.touchPointerImage.isHidden){
- UITouch *touch = [[event allTouches] anyObject];
CGPoint loc = [touch locationInView:self.touchPointerImage];
if (loc.x >= 0 && loc.x <= self.touchPointerImage.frame.size.width
&& loc.y >= 0 && loc.y <= self.touchPointerImage.frame.size.height){
@@ -198,6 +198,12 @@
[self.movingPointer setHidden:NO];
}
}
+
+ if ([touch view] == self.secondarySlideView)
+ {
+ // Change to the next slide when secondary slide is clicked
+ [self nextSlideAction:nil];
+ }
}
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
More information about the Libreoffice-commits
mailing list