refine UIMenuController display. #458, #254, #463, #393

jessesquires · Sep 1, 2014 · 3bfa3fd · 3bfa3fd
1 parent 30bce9b
commit 3bfa3fd
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -632,25 +632,9 @@ - (void)jsq_didReceiveMenuWillShowNotification:(NSNotification *)notification
     [menu setMenuVisible:NO animated:NO];
 
     JSQMessagesCollectionViewCell *selectedCell = (JSQMessagesCollectionViewCell *)[self.collectionView cellForItemAtIndexPath:self.selectedIndexPathForMenu];
-    CGRect selectedCellFrame = [self.collectionView convertRect:selectedCell.frame toView:self.view];
+    CGRect selectedCellMessageBubbleFrame = [selectedCell convertRect:selectedCell.messageBubbleContainerView.frame toView:self.view];
 
-    BOOL menuIsAboveCell = CGRectGetMinY(menu.menuFrame) < CGRectGetMinY(selectedCellFrame);
-
-    CGFloat finalFrameY = CGRectGetMinY(selectedCellFrame);
-
-    if (menuIsAboveCell) {
-        finalFrameY += CGRectGetHeight(selectedCell.messageBubbleTopLabel.frame) + CGRectGetHeight(selectedCell.cellTopLabel.frame);
-    }
-    else {
-        finalFrameY += CGRectGetHeight(selectedCell.cellBottomLabel.frame);
-    }
-
-    CGRect finalFrame = CGRectMake(CGRectGetMinX(selectedCellFrame),
-                                   finalFrameY,
-                                   CGRectGetWidth(selectedCellFrame),
-                                   CGRectGetHeight(selectedCellFrame));
-
-    [menu setTargetRect:finalFrame inView:self.view];
+    [menu setTargetRect:selectedCellMessageBubbleFrame inView:self.view];
     [menu setMenuVisible:YES animated:YES];
 
     self.selectedIndexPathForMenu = nil;