buzzert/Attractor
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update for iOS 17.

Browse Source
This commit is contained in:
James Magahern
2024-07-29 19:21:51 -07:00
parent 6dccb25b3e
commit a0056af8b1
8 changed files with 97 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
App/Browser View/BrowserViewController+Keyboard.swift
View File

@@ -94,11 +94,11 @@ extension BrowserViewController: ShortcutResponder
}
func goBack(_ sender: Any?) {
tab.webView.goBack()
currentTab.webView.goBack()
}
func goForward(_ sender: Any?) {
tab.webView.goForward()
currentTab.webView.goForward()
}
func createTab(_ sender: Any?) {
@@ -106,24 +106,24 @@ extension BrowserViewController: ShortcutResponder
}
func previousTab(_ sender: Any?) {
if let tabIndex = tabController.tabs.firstIndex(of: self.tab) {
if let tabIndex = tabController.tabs.firstIndex(of: self.currentTab) {
if tabIndex - 1 >= 0 {
self.tab = tabController.tabs[tabIndex - 1]
self.currentTab = tabController.tabs[tabIndex - 1]
}
}
}
func nextTab(_ sender: Any?) {
if let tabIndex = tabController.tabs.firstIndex(of: self.tab) {
if let tabIndex = tabController.tabs.firstIndex(of: self.currentTab) {
if tabIndex + 1 < tabController.tabs.count {
self.tab = tabController.tabs[tabIndex + 1]
self.currentTab = tabController.tabs[tabIndex + 1]
}
}
}
func closeTab(_ sender: Any?) {
if tabController.tabs.count > 1 {
tabController.closeTab(self.tab)
tabController.closeTab(self.currentTab)
} else {
#if targetEnvironment(macCatalyst)
if let originWindowScene = self.view.window?.windowScene {
@@ -145,11 +145,11 @@ extension BrowserViewController: ShortcutResponder
}
override func increaseSize(_ sender: Any?) {
tab.webView._viewScale += 0.10
currentTab.webView._viewScale += 0.10
}
override func decreaseSize(_ sender: Any?) {
tab.webView._viewScale -= 0.10
currentTab.webView._viewScale -= 0.10
}
func showPreferences(_ sender: Any?) {
@@ -171,8 +171,8 @@ extension BrowserViewController: ShortcutResponder
func handleOpenURL(_ sender: Any?, forEvent event: OpenURLEvent?) {
guard let event else { return }
if tab.url == nil {
tab.beginLoadingURL(event.url)
if currentTab.url == nil {
currentTab.beginLoadingURL(event.url)
} else {
createNewTab(withURL: event.url)
}