From 0e7c958bd593e555df5c718335d2179f53cb44cf Mon Sep 17 00:00:00 2001
From: Atbrakhi <atbrakhi@igalia.com>
Date: Fri, 18 Aug 2023 10:20:53 +0200
Subject: [PATCH] Cmd or Ctrl+L should focus on location bar in minibrowser
 mode (#30105)

* cmd or ctrl+L should focus on location bar

* review fix: rename response to location_field
---
 ports/winit/browser.rs     | 24 +++++++++++++-----------
 ports/winit/minibrowser.rs | 11 ++++++++---
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ports/winit/browser.rs b/ports/winit/browser.rs
index e46c51e5e9f..d1ea764af9b 100644
--- a/ports/winit/browser.rs
+++ b/ports/winit/browser.rs
@@ -113,17 +113,19 @@ where
                 }
             })
             .shortcut(CMD_OR_CONTROL, 'L', || {
-                let url: String = if let Some(ref current_url) = self.current_url {
-                    current_url.to_string()
-                } else {
-                    String::from("")
-                };
-                let title = "URL or search query";
-                let input = tinyfiledialogs::input_box(title, title, &tiny_dialog_escape(&url));
-                if let Some(input) = input {
-                    if let Some(url) = sanitize_url(&input) {
-                        if let Some(id) = self.browser_id {
-                            self.event_queue.push(EmbedderEvent::LoadUrl(id, url));
+                if !opts::get().minibrowser {
+                    let url: String = if let Some(ref current_url) = self.current_url {
+                        current_url.to_string()
+                    } else {
+                        String::from("")
+                    };
+                    let title = "URL or search query";
+                    let input = tinyfiledialogs::input_box(title, title, &tiny_dialog_escape(&url));
+                    if let Some(input) = input {
+                        if let Some(url) = sanitize_url(&input) {
+                            if let Some(id) = self.browser_id {
+                                self.event_queue.push(EmbedderEvent::LoadUrl(id, url));
+                            }
                         }
                     }
                 }
diff --git a/ports/winit/minibrowser.rs b/ports/winit/minibrowser.rs
index 48afc9d5936..4fe9a6c4b12 100644
--- a/ports/winit/minibrowser.rs
+++ b/ports/winit/minibrowser.rs
@@ -4,7 +4,7 @@
 
  use std::{cell::{RefCell, Cell}, sync::Arc};
 
-use egui::TopBottomPanel;
+use egui::{TopBottomPanel, Modifiers, Key};
 use servo::{servo_url::ServoUrl, compositing::windowing::EmbedderEvent};
 use servo::webrender_surfman::WebrenderSurfman;
 
@@ -55,12 +55,17 @@ impl Minibrowser {
                             event_queue.borrow_mut().push(MinibrowserEvent::Go);
                             location_dirty.set(false);
                         }
-                        if ui.add_sized(
+
+                        let location_field = ui.add_sized(
                             ui.available_size(),
                             egui::TextEdit::singleline(&mut *location.borrow_mut()),
-                        ).changed() {
+                        );
+                        if location_field.changed() {
                             location_dirty.set(true);
                         }
+                        if ui.input(|i| i.clone().consume_key(Modifiers::COMMAND, Key::L)) {
+                            location_field.request_focus();
+                        }
                     },
                 );
             });