Skip to content

Commit

Permalink
Fix brave#953: Disable pan to dismiss gesture for left menu.
Browse files Browse the repository at this point in the history
This menu will be gone soon anyway, this is a quick fix.
  • Loading branch information
iccub committed Apr 8, 2019
1 parent 2c8e93a commit 5f6c759
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions Client/Frontend/Menu/HomeMenuController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ protocol LinkNavigationDelegate: class {
func linkNavigatorDidSelectURLString(url: String, visitType: VisitType)
}

class HomeMenuController: UIViewController, PopoverContentComponent {
class HomeMenuController: UIViewController {

weak var delegate: HomeMenuControllerDelegate?

let bookmarksController: BookmarksViewController
Expand All @@ -60,14 +60,6 @@ class HomeMenuController: UIViewController, PopoverContentComponent {

weak var visibleController: UIViewController?

var isPanToDismissEnabled: Bool {
if visibleController === bookmarksNavController {
// Don't break reordering bookmarks
return !bookmarksController.tableView.isEditing
}
return true
}

// Buttons swap out the full page, meaning only one can be active at a time
var pageButtons: [UIButton: UIViewController] {
return [
Expand Down Expand Up @@ -305,3 +297,7 @@ extension HomeMenuController: LinkNavigationDelegate {
return self.linkNavigatorDidSelectURL(url: url, visitType: visitType)
}
}

extension HomeMenuController: PopoverContentComponent {
var isPanToDismissEnabled: Bool { return false }
}

0 comments on commit 5f6c759

Please # to comment.