From c4e8651b27d2e1ea508164ea432d43286bd67924 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 18 Jan 2013 21:16:47 +0000 Subject: Activate the find window's string gadget on open --- amiga/search.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'amiga/search.c') diff --git a/amiga/search.c b/amiga/search.c index 1148f6d77..6d5e658f7 100755 --- a/amiga/search.c +++ b/amiga/search.c @@ -174,6 +174,9 @@ void ami_search_open(struct gui_window *gwin) fwin->node = AddObject(window_list,AMINS_FINDWINDOW); fwin->node->objstruct = fwin; gwin->shared->searchwin = fwin; + + ActivateLayoutGadget((struct Gadget *)fwin->objects[GID_MAIN], fwin->win, + NULL, fwin->objects[GID_SEARCHSTRING]); } void ami_search_close(void) -- cgit v1.2.3 From f16229552a06e64df579a1133c5efe571e401748 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 18 Jan 2013 21:20:10 +0000 Subject: Entering the search string now find the first occurence immediately --- amiga/search.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'amiga/search.c') diff --git a/amiga/search.c b/amiga/search.c index 6d5e658f7..f1fad600b 100755 --- a/amiga/search.c +++ b/amiga/search.c @@ -205,6 +205,26 @@ BOOL ami_search_event(void) case WMHI_GADGETUP: switch(result & WMHI_GADGETMASK) { + case GID_SEARCHSTRING: + browser_window_search_destroy_context( + fwin->gwin->shared->bw); + ami_search_set_forward_state( + true, NULL); + ami_search_set_back_state( + true, NULL); + + RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_PREV], + fwin->win, NULL, + GA_Disabled, FALSE, + TAG_DONE); + + RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_NEXT], + fwin->win, NULL, + GA_Disabled, FALSE, + TAG_DONE); + + /* fall through */ + case GID_NEXT: search_insert = true; flags = SEARCH_FLAG_FORWARDS | @@ -231,25 +251,6 @@ BOOL ami_search_event(void) flags, ami_search_string()); ActivateWindow(fwin->gwin->shared->win); - break; - - case GID_SEARCHSTRING: - browser_window_search_destroy_context( - fwin->gwin->shared->bw); - ami_search_set_forward_state( - true, NULL); - ami_search_set_back_state( - true, NULL); - - RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_PREV], - fwin->win, NULL, - GA_Disabled, FALSE, - TAG_DONE); - - RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_NEXT], - fwin->win, NULL, - GA_Disabled, FALSE, - TAG_DONE); break; } break; -- cgit v1.2.3