From 41a2a954f5e7f60a18c51b44e3201d3b5dd6441f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 10:53:54 -0400 Subject: [PATCH 1/2] Dismiss message actions UI on orientation change. --- .../ConversationView/ConversationViewController.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 23391d999..69015ab70 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4988,6 +4988,7 @@ typedef enum : NSUInteger { - (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem { OWSAssertIsOnMainThread(); + [[OWSWindowManager sharedManager] hideMenuActionsWindow]; } @@ -4996,8 +4997,12 @@ typedef enum : NSUInteger { - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { + OWSAssertIsOnMainThread(); + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + [[OWSWindowManager sharedManager] hideMenuActionsWindow]; + // Snapshot the "last visible row". NSIndexPath *_Nullable lastVisibleIndexPath = self.lastVisibleIndexPath; From 0a1947c961a15aee139d3296580e2b34f37092a3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 10:55:26 -0400 Subject: [PATCH 2/2] Dismiss message actions UI on orientation change. --- .../ConversationView/ConversationViewController.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 69015ab70..74191822a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -5001,6 +5001,10 @@ typedef enum : NSUInteger { [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + // The "message actions" window tries to pin the message + // in the content of this view. It's easier to dismiss the + // "message actions" window when the device changes orientation + // than to try to ensure this works in that case. [[OWSWindowManager sharedManager] hideMenuActionsWindow]; // Snapshot the "last visible row".