Hide page action icons when editing the Omnibox (#16243)

brave · Dec 7, 2022 · a0da9e3 · a0da9e3
1 parent 16e4b27
commit a0da9e3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc
@@ -138,13 +138,15 @@ void BraveLocationBarView::Update(content::WebContents* contents) {
   if (brave_actions_) {
     brave_actions_->Update();
   }
+
+  auto show_page_actions = !ShouldHidePageActionIcons();
 #if BUILDFLAG(ENABLE_TOR)
   if (onion_location_view_)
-    onion_location_view_->Update(contents);
+    onion_location_view_->Update(contents, show_page_actions);
 #endif
 #if BUILDFLAG(ENABLE_IPFS)
   if (ipfs_location_view_)
-    ipfs_location_view_->Update(contents);
+    ipfs_location_view_->Update(contents, show_page_actions);
 #endif
 
   LocationBarView::Update(contents);
@@ -172,23 +174,27 @@ ui::ImageModel BraveLocationBarView::GetLocationIcon(
 }
 
 void BraveLocationBarView::OnChanged() {
+  auto hide_page_actions = ShouldHidePageActionIcons();
   if (brave_actions_) {
-    // Do not show actions whilst omnibar is open or url is being edited
-    const bool should_hide =
-        ShouldHidePageActionIcons() && !omnibox_view_->GetText().empty();
-    brave_actions_->SetShouldHide(should_hide);
+    brave_actions_->SetShouldHide(hide_page_actions);
   }
 #if BUILDFLAG(ENABLE_TOR)
   if (onion_location_view_)
     onion_location_view_->Update(
-        browser_->tab_strip_model()->GetActiveWebContents());
+        browser_->tab_strip_model()->GetActiveWebContents(),
+        !hide_page_actions);
 #endif
 #if BUILDFLAG(ENABLE_IPFS)
   if (ipfs_location_view_)
     ipfs_location_view_->Update(
-        browser_->tab_strip_model()->GetActiveWebContents());
+        browser_->tab_strip_model()->GetActiveWebContents(),
+        !hide_page_actions);
 #endif
 
+  if (brave_news_location_view_) {
+    brave_news_location_view_->SetVisible(!hide_page_actions);
+  }
+
   // OnChanged calls Layout
   LocationBarView::OnChanged();
 }

diff --git a/browser/ui/views/location_bar/ipfs_location_view.cc b/browser/ui/views/location_bar/ipfs_location_view.cc
@@ -143,15 +143,16 @@ IPFSLocationView::IPFSLocationView(Profile* profile) {
 
 IPFSLocationView::~IPFSLocationView() = default;
 
-void IPFSLocationView::Update(content::WebContents* web_contents) {
+void IPFSLocationView::Update(content::WebContents* web_contents,
+                              bool show_page_actions) {
   if (!web_contents)
     return;
   ipfs::IPFSTabHelper* helper =
       ipfs::IPFSTabHelper::FromWebContents(web_contents);
   if (!helper)
     return;
   auto ipfs_resolved_url = helper->GetIPFSResolvedURL();
-  SetVisible(ipfs_resolved_url.is_valid());
+  SetVisible(ipfs_resolved_url.is_valid() && show_page_actions);
   reinterpret_cast<IPFSLocationButtonView*>(button_)->SetIPFSLocation(
       ipfs_resolved_url);
 }
diff --git a/browser/ui/views/location_bar/ipfs_location_view.h b/browser/ui/views/location_bar/ipfs_location_view.h
@@ -21,7 +21,7 @@ class IPFSLocationView : public views::View {
   explicit IPFSLocationView(Profile* profile);
   ~IPFSLocationView() override;
 
-  void Update(content::WebContents* web_contents);
+  void Update(content::WebContents* web_contents, bool show_page_actions);
 
   views::LabelButton* GetButton() { return button_; }
 

diff --git a/browser/ui/views/location_bar/onion_location_view.cc b/browser/ui/views/location_bar/onion_location_view.cc
@@ -159,14 +159,15 @@ OnionLocationView::OnionLocationView(Profile* profile) {
 
 OnionLocationView::~OnionLocationView() = default;
 
-void OnionLocationView::Update(content::WebContents* web_contents) {
+void OnionLocationView::Update(content::WebContents* web_contents,
+                               bool show_page_actions) {
   if (!web_contents)
     return;
   tor::OnionLocationTabHelper* helper =
       tor::OnionLocationTabHelper::FromWebContents(web_contents);
   if (!helper)
     return;
-  SetVisible(helper->should_show_icon());
+  SetVisible(helper->should_show_icon() && show_page_actions);
   reinterpret_cast<OnionLocationButtonView*>(button_)->SetOnionLocation(
       helper->onion_location());
 }
diff --git a/browser/ui/views/location_bar/onion_location_view.h b/browser/ui/views/location_bar/onion_location_view.h
@@ -21,7 +21,7 @@ class OnionLocationView : public views::View {
   explicit OnionLocationView(Profile* profile);
   ~OnionLocationView() override;
 
-  void Update(content::WebContents* web_contents);
+  void Update(content::WebContents* web_contents, bool show_page_actions);
 
   views::LabelButton* GetButton() { return button_; }