From 6b761c9fceaa721038b092ce2c0569ca5d823f03 Mon Sep 17 00:00:00 2001 From: Manuel Simon Hirsig Date: Wed, 21 Oct 2015 23:31:06 +0200 Subject: [PATCH] beginnings of new UI --- .idea/misc.xml | 3 + .idea/workspace.xml | 105 ++++++++++++------------- buy.xml | 188 +++++++++++++++++++++++++++++--------------- core.lua | 16 ++-- 4 files changed, 185 insertions(+), 127 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index fa5ca66..3551bb4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1b6c11c..8dae7d9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,9 @@ - + - - - - + @@ -73,8 +70,8 @@ - - + + @@ -100,10 +97,10 @@ - + - + @@ -130,21 +127,21 @@ - - + + - - + + - - + + - - + + @@ -188,12 +185,12 @@ @@ -229,7 +226,6 @@ - @@ -251,6 +247,7 @@ + @@ -380,27 +377,27 @@ - - + + - - + + - - + + + - + - - + @@ -447,14 +444,6 @@ - - - - - - - - @@ -471,14 +460,6 @@ - - - - - - - - @@ -503,14 +484,6 @@ - - - - - - - - @@ -529,12 +502,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buy.xml b/buy.xml index 1cf44b4..626e122 100644 --- a/buy.xml +++ b/buy.xml @@ -40,65 +40,123 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + this:RegisterForDrag('LeftButton') + this:StartMoving() + this:StopMovingOrSizing() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - local sort_order = Aux.util.map(Aux.buy.modes[1].sort_order, function(column_order) return { column = Aux.buy.modes[1].columns[column_order.column], sort_ascending = column_order.order == 'ascending' } end) - this.sheet = Aux.sheet.create(this, Aux.buy.modes[1].columns, sort_order, Aux.buy.modes[1].on_cell_click, Aux.buy.modes[1].on_cell_enter, Aux.buy.modes[1].on_cell_leave) + this:SetBackdropBorderColor(0.4, 0.4, 0.4) + this:SetBackdropColor(0.15, 0.15, 0.15) + getglobal(this:GetName().."Title"):SetText('Search Results') + + + + + + + + + local sort_order = Aux.util.map(Aux.buy.modes[1].sort_order, function(column_order) return { column = Aux.buy.modes[1].columns[column_order.column], sort_ascending = column_order.order == 'ascending' } end) + this.sheet = Aux.sheet.create(this, Aux.buy.modes[1].columns, sort_order, Aux.buy.modes[1].on_cell_click, Aux.buy.modes[1].on_cell_enter, Aux.buy.modes[1].on_cell_leave) + + + + + + + + + + + local sort_order = Aux.util.map(Aux.buy.modes[2].sort_order, function(column_order) return { column = Aux.buy.modes[2].columns[column_order.column], sort_ascending = column_order.order == 'ascending' } end) + this.sheet = Aux.sheet.create(this, Aux.buy.modes[2].columns, sort_order, Aux.buy.modes[2].on_cell_click, Aux.buy.modes[2].on_cell_enter, Aux.buy.modes[2].on_cell_leave) + + + + + + + + + + + local sort_order = Aux.util.map(Aux.buy.modes[3].sort_order, function(column_order) return { column = Aux.buy.modes[3].columns[column_order.column], sort_ascending = column_order.order == 'ascending' } end) + this.sheet = Aux.sheet.create(this, Aux.buy.modes[3].columns, sort_order, Aux.buy.modes[3].on_cell_click, Aux.buy.modes[3].on_cell_enter, Aux.buy.modes[3].on_cell_leave) + + + + - - - - - - local sort_order = Aux.util.map(Aux.buy.modes[2].sort_order, function(column_order) return { column = Aux.buy.modes[2].columns[column_order.column], sort_ascending = column_order.order == 'ascending' } end) - this.sheet = Aux.sheet.create(this, Aux.buy.modes[2].columns, sort_order, Aux.buy.modes[2].on_cell_click, Aux.buy.modes[2].on_cell_enter, Aux.buy.modes[2].on_cell_leave) - - - - - - - - - local sort_order = Aux.util.map(Aux.buy.modes[3].sort_order, function(column_order) return { column = Aux.buy.modes[3].columns[column_order.column], sort_ascending = column_order.order == 'ascending' } end) - this.sheet = Aux.sheet.create(this, Aux.buy.modes[3].columns, sort_order, Aux.buy.modes[3].on_cell_click, Aux.buy.modes[3].on_cell_enter, Aux.buy.modes[3].on_cell_leave) - - - - - - + + + + + + this:SetBackdropBorderColor(0.4, 0.4, 0.4) + this:SetBackdropColor(0.15, 0.15, 0.15) + getglobal(this:GetName().."Title"):SetText('Filters') + + - + UIDropDownMenu_SetWidth(140) @@ -120,7 +178,7 @@ - + @@ -159,7 +217,7 @@ - + @@ -170,7 +228,7 @@ - + @@ -190,7 +248,7 @@ - + UIDropDownMenu_SetWidth(140) @@ -212,7 +270,7 @@ - + @@ -245,7 +303,7 @@ - + @@ -257,7 +315,7 @@ - + @@ -307,7 +365,7 @@ diff --git a/core.lua b/core.lua index 8724c62..e482de9 100644 --- a/core.lua +++ b/core.lua @@ -83,7 +83,7 @@ function Aux_OnAddonLoaded() } Aux.tabs.buy.hiddenElements = { - AuctionFrameBrowse, +-- AuctionFrameBrowse, } Aux.tabs.sell.recommendationElements = { @@ -299,13 +299,13 @@ function Aux_AddPanels() relevel(sellFrame) sellFrame:Hide() - local buyFrame = CreateFrame("Frame", "AuxBuyPanel", AuctionFrame, "AuxBuyTemplate") - buyFrame:SetParent("AuctionFrame") - buyFrame:SetPoint("TOPLEFT", "AuctionFrame", "TOPLEFT") - AuxLogFrame:SetParent(buyFrame) - AuxLogFrame:SetPoint('TOP', buyFrame, 100, -43) - relevel(buyFrame) - buyFrame:Hide() + --local buyFrame = CreateFrame("Frame", "AuxBuyPanel", AuctionFrame, "AuxBuyTemplate") + --buyFrame:SetParent("AuctionFrame") + --buyFrame:SetPoint("TOPLEFT", "AuctionFrame", "TOPLEFT") + --AuxLogFrame:SetParent(buyFrame) + --AuxLogFrame:SetPoint('TOP', buyFrame, 100, -43) + --relevel(buyFrame) + --buyFrame:Hide() local optionsFrame = CreateFrame("Frame", "AuxOptionsButtonPanel", AuctionFrame, "AuxOptionsButtonTemplate") optionsFrame:SetParent("AuctionFrame")