diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 18:34:34 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 18:34:34 +0100 |
commit | 3a9fa29ee53bef70a0e643847acc2fb374501f70 (patch) | |
tree | e9a8946c7655e03e4c9a9d702bbf36b1952a92df /gtk | |
parent | caf918d2f28f600184036aef3f096024d3af62a7 (diff) | |
download | netsurf-3a9fa29ee53bef70a0e643847acc2fb374501f70.tar.gz netsurf-3a9fa29ee53bef70a0e643847acc2fb374501f70.tar.bz2 |
try and improve usage of browser window internals
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/scaffolding.c | 5 | ||||
-rw-r--r-- | gtk/window.c | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index c2dc0fdc9..ee2d46227 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -2444,9 +2444,8 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw) nsgtk_scaffolding_set_icon(gw); /* Ensure the window's title bar is updated */ - if (bw->current_content != NULL) { - gui_window_set_title(gw, content_get_title(bw->current_content)); - } + gui_window_set_title(gw, browser_window_get_title(bw)); + } /* exported interface documented in scaffolding.h */ diff --git a/gtk/window.c b/gtk/window.c index d1cd6b1a5..9c4b668b9 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -34,7 +34,7 @@ #include "gtk/window.h" #include "gtk/selection.h" #include "desktop/gui.h" -#include "desktop/browser_private.h" +#include "desktop/browser.h" #include "desktop/mouse.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" @@ -728,12 +728,6 @@ gui_window_create(struct browser_window *bw, g->bw = bw; g->mouse.state = 0; g->current_pointer = GUI_POINTER_DEFAULT; - if (flags & GW_CREATE_CLONE) { - assert(existing != NULL); - bw->scale = existing->bw->scale; - } else { - bw->scale = nsoption_int(scale) / 100; - } /* attach scaffold */ if (flags & GW_CREATE_TAB) { |