From ccd8f12469001f7c0f9f88c2892b6c840f7fc4d1 Mon Sep 17 00:00:00 2001 From: Manuel Simon Hirsig Date: Mon, 8 Aug 2016 13:09:10 +0200 Subject: [PATCH] filter input bugfix --- tabs/search/frames.lua | 8 +++++++- util/filter.lua | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tabs/search/frames.lua b/tabs/search/frames.lua index e9dd7b9..24b025e 100644 --- a/tabs/search/frames.lua +++ b/tabs/search/frames.lua @@ -531,6 +531,12 @@ do scroll_frame:SetHeight(270) scroll_frame:SetPoint('TOPLEFT', 348, -50) scroll_frame:EnableMouse(true) + scroll_frame:EnableMouseWheel(true) + scroll_frame:SetScript('OnMouseWheel', function() + local child = this:GetScrollChild() + child:SetScale(max(.3, min(1, child:GetScale() + arg1/10))) + aux.log(child:GetEffectiveScale()) + end) scroll_frame:RegisterForDrag('LeftButton') scroll_frame:SetScript('OnDragStart', function() this.x, this.y = GetCursorPosition() @@ -554,7 +560,7 @@ do scroll_child:SetWidth(1) scroll_child:SetHeight(1) scroll_frame:SetScrollChild(scroll_child) - local display = aux.gui.label(scroll_child, aux.gui.config.large_font_size2) + local display = aux.gui.label(scroll_child, 24) display:SetPoint('TOPLEFT', 0, 0) display:SetJustifyH('LEFT') display:SetJustifyV('TOP') diff --git a/util/filter.lua b/util/filter.lua index 7b7d963..a248d1a 100644 --- a/util/filter.lua +++ b/util/filter.lua @@ -540,9 +540,8 @@ function public.indented_post_query_string(components) str = str..' ' end end - + no_line_break = component[1] == 'operator' and component[2] == 'not' if component[1] == 'operator' and component[2] then - no_line_break = component[2] == 'not' str = str..'|cffffff00'..component[2]..(component[2] ~= 'not' and tonumber(component[3]) or '')..FONT_COLOR_CODE_CLOSE tinsert(stack, component[3] or '*') elseif component[1] == 'filter' then