Prev/Next navigation fix so that we could "jump over", for instance, …

…QRadioElement, that is also a QEntryElement, but is not focusable
HiveHicks · Aug 3, 2012 · 7e97842 · 7e97842
1 parent 044b967
commit 7e97842
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/quickdialog/QEntryElement.h b/quickdialog/QEntryElement.h
@@ -43,6 +43,8 @@
 
 
 - (QEntryElement *)init;
-
 - (QEntryElement *)initWithTitle:(NSString *)string Value:(NSString *)param Placeholder:(NSString *)string1;
+
+- (BOOL)canTakeFocus;
+
 @end
diff --git a/quickdialog/QEntryElement.m b/quickdialog/QEntryElement.m
@@ -72,6 +72,9 @@ - (void)fetchValueIntoObject:(id)obj {
 	[obj setValue:_textValue forKey:_key];
 }
 
+- (BOOL)canTakeFocus {
+    return YES;
+}
 
 #pragma mark - UITextInputTraits
 

diff --git a/quickdialog/QEntryTableViewCell.m b/quickdialog/QEntryTableViewCell.m
@@ -260,13 +260,14 @@ - (BOOL)resignFirstResponder {
 }
 
 - (QEntryElement *)findPreviousElementToFocusOn {
+
     QEntryElement *previousElement = nil;
     for (QSection *section in _entryElement.parentSection.rootElement.sections) {
-        for (QElement * e in section.elements){
+        for (QElement *e in section.elements) {
             if (e == _entryElement) {
                 return previousElement;
             }
-            else if ([e isKindOfClass:[QEntryElement class]]){
+            else if ([e isKindOfClass:[QEntryElement class]] && [(QEntryElement *)e canTakeFocus]) {
                 previousElement = (QEntryElement *)e;
             }
         }
@@ -275,13 +276,14 @@ - (QEntryElement *)findPreviousElementToFocusOn {
 }
 
 - (QEntryElement *)findNextElementToFocusOn {
+
     BOOL foundSelf = NO;
     for (QSection *section in _entryElement.parentSection.rootElement.sections) {
-        for (QElement * e in section.elements){
+        for (QElement *e in section.elements) {
             if (e == _entryElement) {
                 foundSelf = YES;
             }
-            else if (foundSelf && [e isKindOfClass:[QEntryElement class]]){
+            else if (foundSelf && [e isKindOfClass:[QEntryElement class]] && [(QEntryElement *)e canTakeFocus]) {
                 return (QEntryElement *) e;
             }
         }

diff --git a/quickdialog/QMultilineElement.m b/quickdialog/QMultilineElement.m
@@ -65,5 +65,8 @@ - (void)fetchValueIntoObject:(id)obj
 	[obj setValue:self.textValue forKey:_key];
 }
 
+- (BOOL)canTakeFocus {
+    return NO;
+}
 
 @end
diff --git a/quickdialog/QRadioElement.m b/quickdialog/QRadioElement.m
@@ -140,5 +140,8 @@ - (void)fetchValueIntoObject:(id)obj {
     }
 }
 
+- (BOOL)canTakeFocus {
+    return NO;
+}
 
 @end
diff --git a/quickdialog/QSegmentedElement.m b/quickdialog/QSegmentedElement.m
@@ -50,4 +50,8 @@ - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView contr
     return cell;
 }
 
+- (BOOL)canTakeFocus {
+    return NO;
+}
+
 @end