Added toggle for hovering mode Command + Shift + P

curzel-it · Mar 10, 2023 · 62cc14b · 62cc14b
1 parent 5e39d95
commit 62cc14b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/Pipper.xcodeproj/project.pbxproj b/Pipper.xcodeproj/project.pbxproj
@@ -112,13 +112,13 @@
 		1E61D7A1290BE53E006C4015 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				1EC926B6289F98BD0056E42C /* URLUtils.swift */,
-				1E6FD79628A0F38100021336 /* NavigationRequest.swift */,
 				1E2EBC3E289282180008ECB3 /* AppState.swift */,
-				1E6FD79A28A0F39000021336 /* SearchEngine.swift */,
 				1E6FD79428A0F36100021336 /* Bookmark.swift */,
-				1E61D7A2290BE5AD006C4015 /* UserMessage.swift */,
+				1E6FD79628A0F38100021336 /* NavigationRequest.swift */,
+				1E6FD79A28A0F39000021336 /* SearchEngine.swift */,
+				1EC926B6289F98BD0056E42C /* URLUtils.swift */,
 				1E6FD79828A0F38800021336 /* UserAgent.swift */,
+				1E61D7A2290BE5AD006C4015 /* UserMessage.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";

diff --git a/Pipper/Sources/App/SettingsView.swift b/Pipper/Sources/App/SettingsView.swift
@@ -9,7 +9,6 @@ struct SettingsView: View {
             HomepageSelection()
             SearchEngineSection()
             UserAgentSection()
-            // SizeSection()
             WindowSection()
             LaunchAtLoginSection()
             Footer().padding(.top)

diff --git a/Pipper/Sources/App/Toolbar.swift b/Pipper/Sources/App/Toolbar.swift
@@ -2,13 +2,14 @@ import SwiftUI
 
 extension View {
     func browsingToolbar() -> some View {
-        self.toolbar {
+        toolbar {
             ToolbarItem { SearchFromClipboardTool() }
             ToolbarItem { WebHomeToggle() }
             ToolbarItem { ShareTool() }
             ToolbarItem { SearchTool() }
             ToolbarItem { ReloadTool() }
             ToolbarItem { SettingsTool() }
+            ToolbarItem { FloatingTool() }
         }
     }
 }
@@ -31,7 +32,7 @@ private struct WebHomeToggle: View {
 
     var body: some View {
         Tool(icon: appState.showHome ? "network" : "house.fill") {
-            appState.showHome = !appState.showHome
+            appState.showHome.toggle()
             appState.showSearch = false
             appState.showSettings = false
         }
@@ -43,6 +44,22 @@ private struct WebHomeToggle: View {
 private struct SearchTool: View {
     @EnvironmentObject var appState: AppState
 
+    var iconName: String {
+        appState.isHovering ? "pip.fill" : "pip"
+    }
+
+    var body: some View {
+        Tool(icon: iconName) {
+            appState.isHovering.toggle()
+        }
+        .keyboardShortcut(.init("P"), modifiers: [.command, .shift])
+        .onHover(hint: "Cmd + Shift + P\nToggle floating behavior")
+    }
+}
+
+private struct FloatingTool: View {
+    @EnvironmentObject var appState: AppState
+
     var body: some View {
         Tool(icon: "magnifyingglass") {
             appState.showSearch = true