From 4f8deae24d6af31d5da9f16b24bcca6d3c0d6da5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Sep 2009 21:06:33 +0200 Subject: [PATCH] Do not put statusbar text in the location entry if it's focussed This prevents overwriting what the user may be typing while accidentally moving the mouse. --- midori/midori-browser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e4d3faff..720b18ba 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -352,9 +352,13 @@ static void _midori_browser_set_statusbar_text (MidoriBrowser* browser, const gchar* text) { + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + gboolean is_location = widget ? + MIDORI_IS_LOCATION_ENTRY (gtk_widget_get_parent (widget)) : FALSE; + katze_assign (browser->statusbar_text, g_strdup (text)); - if (!GTK_WIDGET_VISIBLE (browser->statusbar)) + if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !is_location) { GtkAction* action = _action_by_name (browser, "Location"); MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);