Merge release/1.107.0 into main

duckduckgo · Sep 20, 2024 · 83cfe9f · 83cfe9f
2 parents 05036ee + 57ce739
commit 83cfe9f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 66 deletions.
diff --git a/.github/actions/create-tag-and-github-release/action.yml b/.github/actions/create-tag-and-github-release/action.yml
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 267
+CURRENT_PROJECT_VERSION = 268
diff --git a/DuckDuckGo/HomePage/View/HomePageView.swift b/DuckDuckGo/HomePage/View/HomePageView.swift
@@ -82,9 +82,16 @@ extension HomePage.Views {
                     .animation(.easeInOut, value: settingsVisibilityModel.isSettingsVisible)
 
                     if !settingsVisibilityModel.isSettingsVisible {
-                        SettingsButtonView(isSettingsVisible: $settingsVisibilityModel.isSettingsVisible)
-                            .padding([.bottom, .trailing], 14)
-                            .fixedColorScheme(for: settingsModel.customBackground)
+                        VStack {
+                            Spacer()
+                            HStack {
+                                Spacer(minLength: Self.targetWidth + (geometry.size.width - Self.targetWidth)/2)
+                                SettingsButtonView(isSettingsVisible: $settingsVisibilityModel.isSettingsVisible)
+                                    .padding([.bottom, .trailing], 14)
+                            }
+                        }
+                        .frame(width: geometry.size.width, height: geometry.size.height)
+                        .fixedColorScheme(for: settingsModel.customBackground)
                     }
                 }
                 .background(

diff --git a/DuckDuckGo/TabPreview/TabPreviewWindowController.swift b/DuckDuckGo/TabPreview/TabPreviewWindowController.swift
@@ -132,6 +132,7 @@ final class TabPreviewWindowController: NSWindowController {
         if delay {
             // Set up a new timer to hide the preview after 0.05 seconds
             // It makes the transition from one preview to another more fluent
+            hideTimer?.invalidate()
             hideTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: false) { _ in
                 removePreview(allowQuickRedisplay: allowQuickRedisplay)
             }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 267
		CURRENT_PROJECT_VERSION = 268