aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2010-02-27 17:28:37 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2010-02-27 17:28:37 +0100
commit4b35289e115cc981b237765ef9a4d65c46a2fa1c (patch)
treecc1b54b7fc455c1489d2a7d5d4e8bd92ae75f6e1 /src
parenta1117acbcd9dc695a30f8e527a42cd59fae7be78 (diff)
hide temporarily shown panel on a_UIcmd_open_url()
Also use a_UIcmd_open_url() in some edge cases to get the same bahaviour there. This is an alternative to fix 1d38bc37ae03. Submitted by: Jorge Arellano Cid <jcid@dillo.org>
Diffstat (limited to 'src')
-rw-r--r--src/uicmd.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 81133863..a4e1f372 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -471,8 +471,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh,
win->callback(win_cb, DilloTabs);
- if (new_ui->get_panelmode() != UI_HIDDEN)
- new_ui->focus_location();
+ new_ui->focus_location();
return new_bw;
}
@@ -606,9 +605,6 @@ void a_UIcmd_open_urlstr(void *vbw, const char *urlstr)
a_Url_free(url);
}
}
-
- /* let the rendered area have focus */
- //gtk_widget_grab_focus(GTK_BIN(bw->render_main_scroll)->child);
}
/*
@@ -617,6 +613,8 @@ void a_UIcmd_open_urlstr(void *vbw, const char *urlstr)
void a_UIcmd_open_url(BrowserWindow *bw, const DilloUrl *url)
{
a_Nav_push(bw, url);
+ if (BW2UI(bw)->get_panelmode() == UI_TEMPORARILY_SHOW_PANELS)
+ BW2UI(bw)->set_panelmode(UI_HIDDEN);
a_UIcmd_focus_main_area(bw);
}
@@ -697,7 +695,7 @@ void a_UIcmd_forw_popup(void *vbw)
*/
void a_UIcmd_home(void *vbw)
{
- a_Nav_home((BrowserWindow*)vbw);
+ a_UIcmd_open_url((BrowserWindow*)vbw, prefs.home);
}
/*
@@ -840,7 +838,7 @@ void a_UIcmd_open_file(void *vbw)
if (name) {
url = a_Url_new(name, "file:");
- a_Nav_push((BrowserWindow*)vbw, url);
+ a_UIcmd_open_url((BrowserWindow*)vbw, url);
a_Url_free(url);
dFree(name);
}
@@ -931,7 +929,7 @@ void a_UIcmd_save_link(BrowserWindow *bw, const DilloUrl *url)
void a_UIcmd_book(void *vbw)
{
DilloUrl *url = a_Url_new("dpi:/bm/", NULL);
- a_Nav_push((BrowserWindow*)vbw, url);
+ a_UIcmd_open_url((BrowserWindow*)vbw, url);
a_Url_free(url);
}