some buy improvements

This commit is contained in:
Manuel Simon Hirsig
2015-10-20 02:59:06 +02:00
parent 9bf0895491
commit 863511ad5d
4 changed files with 68 additions and 68 deletions
+54 -53
View File
@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3c1af1d3-ae57-470d-8daa-a9295703c6fc" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/buy.lua" afterPath="$PROJECT_DIR$/buy.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.lua" afterPath="$PROJECT_DIR$/core.lua" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.xml" afterPath="$PROJECT_DIR$/core.xml" />
</list>
@@ -69,28 +70,28 @@
<file leaf-file-name="core.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.392857" vertical-offset="5114" max-vertical-offset="8942">
<caret line="313" column="50" selection-start-line="313" selection-start-column="50" selection-end-line="313" selection-end-column="50" />
<state vertical-scroll-proportion="0.0" vertical-offset="1448" max-vertical-offset="8806">
<caret line="101" column="27" selection-start-line="101" selection-start-column="27" selection-end-line="101" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="scan.lua" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="scan.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scan.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.0516667" vertical-offset="1831" max-vertical-offset="2737">
<state vertical-scroll-proportion="0.0" vertical-offset="1831" max-vertical-offset="2737">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="buy.lua" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="buy.lua" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6785714" vertical-offset="1855" max-vertical-offset="15895">
<caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
<state vertical-scroll-proportion="0.39177102" vertical-offset="529" max-vertical-offset="15895">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
<folding />
</state>
</provider>
@@ -119,7 +120,7 @@
<file leaf-file-name="sell.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2863" max-vertical-offset="10336">
<state vertical-scroll-proportion="0.0" vertical-offset="2608" max-vertical-offset="10336">
<caret line="181" column="11" selection-start-line="181" selection-start-column="11" selection-end-line="181" selection-end-column="11" />
<folding />
</state>
@@ -146,16 +147,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="core.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="2142">
<caret line="18" column="44" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="list.lua" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/list.lua">
<provider selected="true" editor-type-id="text-editor">
@@ -166,6 +157,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="core.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="2261">
<caret line="74" column="29" selection-start-line="74" selection-start-column="29" selection-end-line="74" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
@@ -185,10 +186,10 @@
<option value="$PROJECT_DIR$/buy.xml" />
<option value="$PROJECT_DIR$/sell.lua" />
<option value="$PROJECT_DIR$/sell.xml" />
<option value="$PROJECT_DIR$/buy.lua" />
<option value="$PROJECT_DIR$/util.lua" />
<option value="$PROJECT_DIR$/core.xml" />
<option value="$PROJECT_DIR$/core.lua" />
<option value="$PROJECT_DIR$/core.xml" />
<option value="$PROJECT_DIR$/buy.lua" />
</list>
</option>
</component>
@@ -370,7 +371,7 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1066" extended-state="7" />
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -434,22 +435,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="7670" max-vertical-offset="9588">
<caret line="469" column="55" selection-start-line="469" selection-start-column="55" selection-end-line="469" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2863" max-vertical-offset="10336">
<caret line="181" column="11" selection-start-line="181" selection-start-column="11" selection-end-line="181" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/info.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="172" max-vertical-offset="2992">
@@ -466,14 +451,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6785714" vertical-offset="1855" max-vertical-offset="15895">
<caret line="108" column="27" selection-start-line="108" selection-start-column="27" selection-end-line="108" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/list.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1007" max-vertical-offset="4743">
@@ -490,26 +467,50 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.xml">
<entry file="file://$PROJECT_DIR$/scan.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="2142">
<caret line="18" column="44" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="44" />
<state vertical-scroll-proportion="0.0" vertical-offset="1831" max-vertical-offset="2737">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.392857" vertical-offset="5114" max-vertical-offset="8942">
<caret line="313" column="50" selection-start-line="313" selection-start-column="50" selection-end-line="313" selection-end-column="50" />
<state vertical-scroll-proportion="0.0" vertical-offset="1448" max-vertical-offset="8806">
<caret line="101" column="27" selection-start-line="101" selection-start-column="27" selection-end-line="101" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scan.lua">
<entry file="file://$PROJECT_DIR$/core.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.0516667" vertical-offset="1831" max-vertical-offset="2737">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="2261">
<caret line="74" column="29" selection-start-line="74" selection-start-column="29" selection-end-line="74" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2863" max-vertical-offset="10336">
<caret line="181" column="11" selection-start-line="181" selection-start-column="11" selection-end-line="181" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sell.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="7670" max-vertical-offset="9588">
<caret line="469" column="55" selection-start-line="469" selection-start-column="55" selection-end-line="469" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/buy.lua">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.39177102" vertical-offset="529" max-vertical-offset="15895">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
<folding />
</state>
</provider>
+5 -5
View File
@@ -42,7 +42,7 @@ Aux.buy.modes = {
},
{
title = 'Auction Item',
width = 214,
width = 274,
comparator = function(group1, group2) return Aux.util.compare(group1[1].name, group2[1].name, Aux.util.GT) end,
cell_initializer = function(cell)
local icon = CreateFrame('Button', nil, cell)
@@ -106,8 +106,8 @@ Aux.buy.modes = {
end,
},
{
title = 'No',
width = 43,
title = 'Auctions',
width = 83,
comparator = function(group1, group2) return Aux.util.compare(getn(group1), getn(group2), Aux.util.LT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, group)
@@ -117,7 +117,7 @@ Aux.buy.modes = {
},
{
title = 'Buy/ea',
width = 140,
width = 90,
comparator = function(group1, group2) return Aux.util.compare(group1[1].buyout_price_per_unit, group2[1].buyout_price_per_unit, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, group)
@@ -127,7 +127,7 @@ Aux.buy.modes = {
},
{
title = 'Buy',
width = 140,
width = 90,
comparator = function(group1, group2) return Aux.util.compare(group1[1].buyout_price, group2[1].buyout_price, Aux.util.GT) end,
cell_initializer = Aux.sheet.default_cell_initializer('RIGHT'),
cell_setter = function(cell, group)
+1 -9
View File
@@ -98,17 +98,9 @@ function Aux_OnAddonLoaded()
end
end
function Aux.log_scroll(direction)
if direction == 1 then
this:ScrollUp()
elseif direction == -1 then
this:ScrollDown()
end
end
function Aux.log_frame_load()
this:EnableMouseWheel()
this.flashTimer = 0
-- this.flashTimer = 0 TODO remove
end
function Aux.log_frame_update(elapsedSec)
+8 -1
View File
@@ -65,8 +65,15 @@
ChatFrame_OnHyperlinkHide()
</OnHyperlinkLeave>
<OnMouseWheel>
Aux.log_scroll(arg1)
if arg1 == 1 then
this:ScrollUp()
elseif arg1 == -1 then
this:ScrollDown()
end
</OnMouseWheel>
<OnMouseUp>
this:ScrollToBottom()
</OnMouseUp>
</Scripts>
<FontString inherits="ChatFontNormal" justifyH="CENTER"/>
</ScrollingMessageFrame>