From 13f22099ce9877a90caf376d626771beea7395c3 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Thu, 17 Jan 2013 01:18:27 +0100 Subject: Search is functional. --- atari/toolbar.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'atari/toolbar.c') diff --git a/atari/toolbar.c b/atari/toolbar.c index d4a9af4b3..349d2c5e6 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -410,7 +410,7 @@ void toolbar_redraw(struct s_toolbar *tb, GRECT *clip) .x1 = MAX(0,area.g_x - area_ro.g_x) + area.g_w, .y1 = MAX(0,area.g_y - area_ro.g_y) + area.g_h }; - dbg_rect("tb textarea clip: ", &r); + //dbg_rect("tb textarea clip: ", &r); textarea_redraw(tb->url.textarea, 0, 0, &r, &toolbar_rdrw_ctx); } } @@ -766,20 +766,10 @@ void toolbar_mouse_input(struct s_toolbar *tb, short obj, short button) else if (obj==TOOLBAR_BT_SEARCH_FWD) { gw = tb->owner->active_gui_window; toolbar_tree = get_tree(TOOLBAR); - if (gw->search == NULL) { - struct browser_window * bw = gw->browser->bw; - gw->search = nsatari_search_session_create(toolbar_tree, bw); - } assert(gw->search); nsatari_search_perform(gw->search, toolbar_tree, SEARCH_FLAG_FORWARDS); } else if (obj==TOOLBAR_BT_CLOSE_SEARCH) { - gw = tb->owner->active_gui_window; - toolbar_tree = get_tree(TOOLBAR); - if (gw->search != NULL) { - nsatari_search_session_destroy(gw->search); - gw->search = NULL; - } window_close_search(tb->owner); } else { -- cgit v1.2.3