bugfix
This commit is contained in:
@@ -265,7 +265,7 @@ function private.SetItemRef(...)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function private.PickupContainerItem(...)
|
function private.PickupContainerItem(...)
|
||||||
if m.modified() or not m.index(m.active_tab.module[1], 'PICKUP_ITEM') then
|
if m.modified() or not m.index(m.active_tab, 'module', 1, 'PICKUP_ITEM') then
|
||||||
return m.orig.PickupContainerItem(unpack(arg))
|
return m.orig.PickupContainerItem(unpack(arg))
|
||||||
end
|
end
|
||||||
local item_info = m.info.container_item(arg[1], arg[2])
|
local item_info = m.info.container_item(arg[1], arg[2])
|
||||||
@@ -275,7 +275,7 @@ function private.PickupContainerItem(...)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function private.UseContainerItem(...)
|
function private.UseContainerItem(...)
|
||||||
if m.modified() or not m.index(m.active_tab.module[1], 'USE_ITEM') then
|
if m.modified() or not m.index(m.active_tab, 'module', 1, 'USE_ITEM') then
|
||||||
return m.orig.UseContainerItem(unpack(arg))
|
return m.orig.UseContainerItem(unpack(arg))
|
||||||
end
|
end
|
||||||
local item_info = m.info.container_item(arg[1], arg[2])
|
local item_info = m.info.container_item(arg[1], arg[2])
|
||||||
|
|||||||
+11
-2
@@ -910,8 +910,17 @@ function private.remove_post_filter()
|
|||||||
m.update_filter_display()
|
m.update_filter_display()
|
||||||
end
|
end
|
||||||
|
|
||||||
function private.update_filter_display()
|
do
|
||||||
m.filter_display:SetText(aux.filter.indented_post_query_string(m.post_components))
|
function private.update_filter_display()
|
||||||
|
local text = aux.filter.indented_post_query_string(m.post_components)
|
||||||
|
local widest_line = 0
|
||||||
|
for line in string.gfind(text, '<p>(.-)</p>') do
|
||||||
|
m.filter_display.measure:SetText(line)
|
||||||
|
widest_line = max(widest_line, m.filter_display.measure:GetStringWidth())
|
||||||
|
end
|
||||||
|
m.filter_display:SetWidth(widest_line)
|
||||||
|
m.filter_display:SetText(text)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function private.new_recent_search(filter_string, prettified)
|
function private.new_recent_search(filter_string, prettified)
|
||||||
|
|||||||
@@ -535,6 +535,7 @@ do
|
|||||||
scroll_frame:SetScript('OnMouseWheel', function()
|
scroll_frame:SetScript('OnMouseWheel', function()
|
||||||
local child = this:GetScrollChild()
|
local child = this:GetScrollChild()
|
||||||
child:SetScale(max(.3, min(1, child:GetScale() + arg1/10)))
|
child:SetScale(max(.3, min(1, child:GetScale() + arg1/10)))
|
||||||
|
m.update_filter_display()
|
||||||
end)
|
end)
|
||||||
scroll_frame:RegisterForDrag('LeftButton')
|
scroll_frame:RegisterForDrag('LeftButton')
|
||||||
scroll_frame:SetScript('OnDragStart', function()
|
scroll_frame:SetScript('OnDragStart', function()
|
||||||
@@ -555,16 +556,16 @@ do
|
|||||||
this:SetScript('OnUpdate', nil)
|
this:SetScript('OnUpdate', nil)
|
||||||
end)
|
end)
|
||||||
aux.gui.set_content_style(scroll_frame)
|
aux.gui.set_content_style(scroll_frame)
|
||||||
local scroll_child = CreateFrame('Frame', nil, scroll_frame)
|
local scroll_child = CreateFrame('SimpleHTML', nil, scroll_frame)
|
||||||
|
scroll_frame:SetScrollChild(scroll_child)
|
||||||
|
scroll_child:SetFont('p', [[Fonts\ARIALN.TTF]], 26)
|
||||||
scroll_child:SetWidth(1)
|
scroll_child:SetWidth(1)
|
||||||
scroll_child:SetHeight(1)
|
scroll_child:SetHeight(1)
|
||||||
scroll_frame:SetScrollChild(scroll_child)
|
scroll_child:SetScript('OnHyperlinkClick', function()
|
||||||
local display = aux.gui.label(scroll_child, 24)
|
end)
|
||||||
display:SetPoint('TOPLEFT', 0, 0)
|
scroll_child.measure = scroll_child:CreateFontString()
|
||||||
display:SetJustifyH('LEFT')
|
scroll_child.measure:SetFont([[Fonts\ARIALN.TTF]], 26)
|
||||||
display:SetJustifyV('TOP')
|
private.filter_display = scroll_child
|
||||||
display.scale_frame = scale_frame
|
|
||||||
private.filter_display = display
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private.status_bars = {}
|
private.status_bars = {}
|
||||||
|
|||||||
+3
-3
@@ -535,9 +535,9 @@ function public.indented_post_query_string(components)
|
|||||||
if no_line_break then
|
if no_line_break then
|
||||||
str = str..' '
|
str = str..' '
|
||||||
elseif i > 1 then
|
elseif i > 1 then
|
||||||
str = str..'|n'
|
str = str..'</p><p>'
|
||||||
for _=1,getn(stack) do
|
for _=1,getn(stack) do
|
||||||
str = str..' '
|
str = str..aux.gui.inline_color.content.backdrop..'----'..FONT_COLOR_CODE_CLOSE
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
no_line_break = component[1] == 'operator' and component[2] == 'not'
|
no_line_break = component[1] == 'operator' and component[2] == 'not'
|
||||||
@@ -559,7 +559,7 @@ function public.indented_post_query_string(components)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return str
|
return '<html><body><p>'..str..'</p></body></html>'
|
||||||
end
|
end
|
||||||
|
|
||||||
function private.prettified_query_string(components)
|
function private.prettified_query_string(components)
|
||||||
|
|||||||
Reference in New Issue
Block a user