Merge pull request jessesquires#841 from jardamach/develop

Keyboard scrolling problem & fix of toolbar position while panning. fix jessesquires#666. fix jessesquires#405.
shaolinjr · Mar 17, 2015 · acb047f · acb047f
2 parents fc581c8 + d9aea32
commit acb047f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m
@@ -285,10 +285,14 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
                 return;
             }
 
+
+            // we should convert
+            CGRect keyboardEndFrameConverted = [self.contextView convertRect:newKeyboardFrame fromView:nil];
+
             //  do not convert frame to contextView coordinates here
             //  KVO is triggered during panning (see below)
             //  panning occurs in contextView coordinates already
-            [self jsq_notifyKeyboardFrameNotificationForFrame:newKeyboardFrame];
+            [self jsq_notifyKeyboardFrameNotificationForFrame:keyboardEndFrameConverted];
         }
     }
 }