Skip to content

Commit acd6c76

Browse files
author
UQ Times
committed
コメント修正
1 parent 293c896 commit acd6c76

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

GestureRecognizer-Samples/CustomizedGestureRecognizer/CustomizedGestureRecognizer/StrokeGestureRecognizer.m

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
121121
{
122122
[super touchesMoved:touches withEvent:event];
123123

124+
/* これを書いておくと、iOS4とiOS5で同じ挙動になる */
125+
//if (self.state == UIGestureRecognizerStateBegan) {
126+
//
127+
// self.state = UIGestureRecognizerStateChanged;
128+
//}
129+
124130
CGPoint nowPoint = [[touches anyObject] locationInView:self.view];
125131
CGPoint prevPoint = [[touches anyObject] previousLocationInView:self.view];
126132
LocalStrokeDirection currentDirection; // 前回と今回とを比較しどの方向に移動したか
@@ -155,7 +161,7 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
155161
// 必要とするジェスチャーを通り過ぎた
156162
// ここが実行される時には
157163
// iOS4: Began, iOS5: Began/Changed
158-
// なので、Canclledにする
164+
// なので、Cancelledにする
159165
self.state = UIGestureRecognizerStateCancelled;
160166
return;
161167
}
@@ -173,7 +179,7 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
173179
if ([self.wantedGesture count] == _strokeCount) {
174180
// 必要とするジェスチャーと一致
175181
// iOS4では"Began"に設定すると"Changed"に設定しない限りずっと"Began"だが、
176-
// iOS5では1度だけBeganで自動的に"Changed"になってしまう
182+
// iOS5では1度だけBeganで、以降は自動的に"Changed"になってしまう
177183
// iOS4: Possible -> Began -> Ended
178184
// iOS5: Possible -> Began -> Changed -> Ended
179185
self.state = UIGestureRecognizerStateBegan;
@@ -194,13 +200,13 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
194200
case UIGestureRecognizerStateFailed: // ジェスチャーと認識されなかった
195201
self.state = UIGestureRecognizerStateFailed;
196202
break;
197-
case UIGestureRecognizerStateBegan: // iOS4
198-
case UIGestureRecognizerStateChanged: // iOS5
203+
case UIGestureRecognizerStateBegan:
204+
case UIGestureRecognizerStateChanged:
199205
// ジェスチャーが正しく認識された状態で指を話した
200206
self.state = UIGestureRecognizerStateEnded;
201207
break;
202208
default:
203-
// ジェスチャーの認識中に指が離された
209+
// ジェスチャーの認識途中で指が離された
204210
self.state = UIGestureRecognizerStateCancelled;
205211
break;
206212
}

GestureRecognizer-Samples/CustomizedGestureRecognizer/CustomizedGestureRecognizer/ViewController.m

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ - (void)viewDidLoad
7070
[cShapedGesture addWantedStroke:StrokeGestureRecognizerDirectionRight];
7171
[self.view addGestureRecognizer:cShapedGesture];
7272
[cShapedGesture release];
73-
7473
}
7574

7675
- (void)viewDidUnload
@@ -165,8 +164,8 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
165164
- (void)handleIShapedGesture:(StrokeGestureRecognizer *)recognizer
166165
{
167166
switch ([recognizer state]) {
168-
case UIGestureRecognizerStateBegan: // iOS4
169-
case UIGestureRecognizerStateChanged: // iOS5
167+
case UIGestureRecognizerStateBegan:
168+
case UIGestureRecognizerStateChanged:
170169
// まだ途中だが、正しいジェスチャーであると認識している
171170
[self.currentGestureName setText:@"I-shaped gesture"];
172171
break;
@@ -188,8 +187,8 @@ - (void)handleIShapedGesture:(StrokeGestureRecognizer *)recognizer
188187
- (void)handleLShapedGesture:(StrokeGestureRecognizer *)recognizer
189188
{
190189
switch ([recognizer state]) {
191-
case UIGestureRecognizerStateBegan: // iOS4
192-
case UIGestureRecognizerStateChanged: // iOS5
190+
case UIGestureRecognizerStateBegan:
191+
case UIGestureRecognizerStateChanged:
193192
// まだ途中だが、正しいジェスチャーであると認識している
194193
[self.currentGestureName setText:@"L-shaped gesture"];
195194
break;
@@ -211,8 +210,8 @@ - (void)handleLShapedGesture:(StrokeGestureRecognizer *)recognizer
211210
- (void)handleUShapedGesture:(StrokeGestureRecognizer *)recognizer
212211
{
213212
switch ([recognizer state]) {
214-
case UIGestureRecognizerStateBegan: // iOS4
215-
case UIGestureRecognizerStateChanged: // iOS5
213+
case UIGestureRecognizerStateBegan:
214+
case UIGestureRecognizerStateChanged:
216215
// まだ途中だが、正しいジェスチャーであると認識している
217216
[self.currentGestureName setText:@"U-shaped gesture"];
218217
break;
@@ -235,8 +234,8 @@ - (void)handleUShapedGesture:(StrokeGestureRecognizer *)recognizer
235234
- (void)handleOShapedGesture:(StrokeGestureRecognizer *)recognizer
236235
{
237236
switch ([recognizer state]) {
238-
case UIGestureRecognizerStateBegan: // iOS4
239-
case UIGestureRecognizerStateChanged: // iOS5
237+
case UIGestureRecognizerStateBegan:
238+
case UIGestureRecognizerStateChanged:
240239
// まだ途中だが、正しいジェスチャーであると認識している
241240
[self.currentGestureName setText:@"O-shaped gesture"];
242241
break;
@@ -258,8 +257,8 @@ - (void)handleOShapedGesture:(StrokeGestureRecognizer *)recognizer
258257
- (void)handleCShapedGesture:(StrokeGestureRecognizer *)recognizer
259258
{
260259
switch ([recognizer state]) {
261-
case UIGestureRecognizerStateBegan: // iOS4
262-
case UIGestureRecognizerStateChanged: // iOS5
260+
case UIGestureRecognizerStateBegan:
261+
case UIGestureRecognizerStateChanged:
263262
// まだ途中だが、正しいジェスチャーであると認識している
264263
[self.currentGestureName setText:@"C-shaped gesture"];
265264
break;

0 commit comments

Comments
 (0)