From be7271ac8c8830fb27e142aa4ea520650c0c21ba Mon Sep 17 00:00:00 2001 From: Manuel Simon Hirsig Date: Thu, 13 Oct 2016 17:50:58 +0200 Subject: [PATCH] search controls change --- gui/core.lua | 1 - tabs/search/frame.lua | 19 +++++++------------ tabs/search/results.lua | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/gui/core.lua b/gui/core.lua index c86e046..5f400df 100644 --- a/gui/core.lua +++ b/gui/core.lua @@ -9,7 +9,6 @@ public.font_size = { small = 13, medium = 15, large = 18, - huge = 23, } function LOAD() diff --git a/tabs/search/frame.lua b/tabs/search/frame.lua index 1b94f7b..698a2e3 100644 --- a/tabs/search/frame.lua +++ b/tabs/search/frame.lua @@ -69,11 +69,9 @@ do private.next_button = btn end do - local btn = gui.button(frame, gui.font_size.huge) + local btn = gui.button(frame) btn:SetPoint('TOPRIGHT', -5, -8) - btn:SetWidth(70) - btn:SetHeight(25) - btn:SetText'Start' + btn:SetText'Search' btn:RegisterForClicks('LeftButtonUp', 'RightButtonUp') btn:SetScript('OnClick', function() if arg1 == 'RightButton' then @@ -84,22 +82,19 @@ do private.start_button = btn end do - local btn = gui.button(frame, gui.font_size.huge) + local btn = gui.button(frame) btn:SetPoint('TOPRIGHT', -5, -8) - btn:SetWidth(70) - btn:SetHeight(25) - btn:SetText'Stop' + btn:SetText'Pause' btn:SetScript('OnClick', function() scan.abort(search_scan_id) end) private.stop_button = btn end do - local btn = gui.button(frame, gui.font_size.huge) + local btn = gui.button(frame) btn:SetPoint('RIGHT', start_button, 'LEFT', -4, 0) - btn:SetWidth(70) - btn:SetHeight(25) - btn:SetText(color.green 'Resume') + btn:SetBackdropColor(color.state.enabled()) + btn:SetText'Resume' btn:SetScript('OnClick', function() execute(true) end) diff --git a/tabs/search/results.lua b/tabs/search/results.lua index b667555..30b03ce 100644 --- a/tabs/search/results.lua +++ b/tabs/search/results.lua @@ -300,7 +300,7 @@ function public.execute(resume, real_time) if resume then current_search.table:SetSelectedRecord() else - if filter_string ~= current_search.filter_string or current_search.first_page ~= first_page or current_search.last_page ~= last_page then + if filter_string ~= current_search.filter_string then if current_search.filter_string then new_search(filter_string, first_page, last_page) else