Skip to content

Commit

Permalink
Merge pull request #4543 from vector-im/gil/element_4438
Browse files Browse the repository at this point in the history
it's easy for the back button to trigger a leftpanel reveal (#4438)
  • Loading branch information
gileluard authored Jul 12, 2021
2 parents 4e34cb0 + e15d842 commit 14b605c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ Changes to be released in next version
* Fix crash on Apple Silicon Macs.
* Media Picker: Generate video thumbnails with the correct orientation (#4515).
* Directory List (pop-up one): Fix duplicate rooms being shown (#4537).
* Use different title for scan button for self verification (#4525)
* Use different title for scan button for self verification (#4525).
* it's easy for the back button to trigger a leftpanel reveal (#4438).

⚠️ API Changes
*
Expand Down
6 changes: 3 additions & 3 deletions Riot/Modules/TabBar/TabBarCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
}

private func setupSideMenuGestures() {
self.parameters.appNavigator.sideMenu.addScreenEdgePanGesturesToPresent(to: self.masterNavigationController.view)

self.parameters.appNavigator.sideMenu.addPanGestureToPresent(to: self.masterNavigationController.navigationBar)
if let rootViewController = self.masterNavigationController.viewControllers.first {
self.parameters.appNavigator.sideMenu.addScreenEdgePanGesturesToPresent(to: rootViewController.view)
}
}

// MARK: Navigation
Expand Down

0 comments on commit 14b605c

Please sign in to comment.