From d52c969948354254436f55f34ee3acf30eabbd15 Mon Sep 17 00:00:00 2001
From: Sabrina Tardio <stardio@duckduckgo.com>
Date: Tue, 7 May 2024 11:40:03 +0200
Subject: [PATCH] remove zoom button on hover, fix bar button treatment

---
 .../View/AddressBarButtonsViewController.swift         |  3 +--
 DuckDuckGo/NavigationBar/View/NavigationBar.storyboard | 10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 975217aa58..84ee662d4c 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -164,7 +164,6 @@ final class AddressBarButtonsViewController: NSViewController {
         didSet {
             if isMouseOverNavigationBar != oldValue {
                 updateBookmarkButtonVisibility()
-                updateZoomButtonVisibility()
             }
         }
     }
@@ -320,7 +319,7 @@ final class AddressBarButtonsViewController: NSViewController {
         && !isTextFieldEditorFirstResponder
         && !isAnyTrackerAnimationPlaying
         && !isAnyShieldAnimationPlaying
-        && (hasNonDefaultZoom || isMouseOverNavigationBar || zoomPopover?.isShown == true)
+        && (hasNonDefaultZoom || zoomPopover?.isShown == true)
 
         zoomButton.isHidden = !shouldShowZoom
     }
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index 20efa231aa..4c40900c02 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -699,7 +699,7 @@
                                             <constraint firstAttribute="height" constant="32" id="fQf-sl-KYI"/>
                                         </constraints>
                                     </customView>
-                                    <button id="b30-aJ-fvG" userLabel="ZoomButton">
+                                    <button id="b30-aJ-fvG" userLabel="ZoomButton" customClass="AddressBarButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                         <rect key="frame" x="84" y="1.5" width="24.5" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="plus.magnifyingglass" catalog="system" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="Rfs-eh-Yrh">
@@ -710,6 +710,14 @@
                                             <constraint firstAttribute="height" constant="24" id="6TS-h0-8pK"/>
                                             <constraint firstAttribute="width" constant="24" id="JvZ-46-TUe"/>
                                         </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
+                                                <color key="value" name="ButtonMouseOverColor"/>
+                                            </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
+                                                <color key="value" name="ButtonMouseDownColor"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
                                         <connections>
                                             <action selector="zoomButtonAction:" target="mcr-nj-GmC" id="xCK-4c-baX"/>
                                         </connections>