diff options
| author | Ole Loots <ole@monochrom.net> | 2013-04-15 21:02:34 +0200 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-04-15 21:02:34 +0200 |
| commit | 1dd92203df2d97398332940c2bc891ea3721ccf1 (patch) | |
| tree | d01bef34157dae198cbdf5e44a554e9de6889905 | |
| parent | 6675aa62dc01f84f5ad29035a9ce551f13296571 (diff) | |
| download | netsurf-1dd92203df2d97398332940c2bc891ea3721ccf1.tar.gz netsurf-1dd92203df2d97398332940c2bc891ea3721ccf1.tar.bz2 | |
Slightly improved intial hiding of toolbar search area.
| -rwxr-xr-x | atari/rootwin.c | 6 | ||||
| -rw-r--r-- | atari/toolbar.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/atari/rootwin.c b/atari/rootwin.c index 03df72723..4b66510bc 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -403,13 +403,13 @@ void window_open(ROOTWIN *rootwin, struct gui_window *gw, GRECT pos) toolbar_set_dimensions(rootwin->toolbar, &g); /* initially hide the search area of the toolbar: */ - toolbar_set_visible(rootwin->toolbar, TOOLBAR_AREA_SEARCH, false); - window_get_grect(rootwin, BROWSER_AREA_TOOLBAR, &g); - gemtk_wm_set_toolbar_size(rootwin->win, g.g_h); + window_close_search(rootwin); window_update_back_forward(rootwin); window_set_focus(rootwin, BROWSER, rootwin->active_gui_window->browser); + + } void window_restore_active_gui_window(ROOTWIN *rootwin) diff --git a/atari/toolbar.c b/atari/toolbar.c index ade5ca3fc..18d8a456a 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -634,6 +634,12 @@ void toolbar_set_visible(struct s_toolbar *tb, short area, bool visible) else if (area == TOOLBAR_AREA_SEARCH) { tb->search_visible = visible; tb->reflow = true; + OBJECT *frm = toolbar_get_form(tb); + if(visible == false){ + frm[TOOLBAR_AREA_SEARCH].ob_flags |= OF_HIDETREE; + } else { + frm[TOOLBAR_AREA_SEARCH].ob_flags &= ~OF_HIDETREE; + } } } |