From 0d5f5557fcdd13f21be78383a0bbe2c37a0aea8c Mon Sep 17 00:00:00 2001 From: Darthpred Date: Mon, 21 Jul 2014 01:22:40 +0400 Subject: [PATCH] issue 5 and shit --- ElvUI_SLE/core/media.lua | 2 - ElvUI_SLE/core/modules.lua | 1 + ElvUI_SLE/core/test.lua | 46 ------------ ElvUI_SLE/core/toolkit.lua | 2 + ElvUI_SLE/defaults/profile.lua | 6 ++ ElvUI_SLE/modules/marks/load_marks.xml | 1 - ElvUI_SLE/modules/minimap/instance.lua | 83 +++++++++++++++++++++ ElvUI_SLE/modules/minimap/load_minimap.xml | 2 +- ElvUI_SLE/modules/sledatatexts/load_datatexts.xml | 1 - ElvUI_SLE/options/minimap_c.lua | 38 ++++++++++ 10 files changed, 131 insertions(+), 51 deletions(-) create mode 100644 ElvUI_SLE/modules/minimap/instance.lua diff --git a/ElvUI_SLE/core/media.lua b/ElvUI_SLE/core/media.lua index b05be59..48a98bd 100644 --- a/ElvUI_SLE/core/media.lua +++ b/ElvUI_SLE/core/media.lua @@ -47,8 +47,6 @@ local Colors = { [5] = {1.0, 0.9294, 0.7607}, --white } - - local function ZoneTextPos() if ( PVPInfoTextString:GetText() == "" ) then SubZoneTextString:SetPoint("TOP", "ZoneTextString", "BOTTOM", 0, -E.db.sle.media.fonts.subzone.offset); diff --git a/ElvUI_SLE/core/modules.lua b/ElvUI_SLE/core/modules.lua index 8dc28e2..2a246c7 100644 --- a/ElvUI_SLE/core/modules.lua +++ b/ElvUI_SLE/core/modules.lua @@ -20,6 +20,7 @@ local modules = { ['SLE_EnhancedVehicleBar'] = {}, ['SLE_Test'] = { 'AceHook-3.0', 'AceEvent-3.0'}, --Testing module in dev folder ['SLE_Media'] = { 'AceHook-3.0' }, + ['SLE_InstDif'] = { 'AceHook-3.0', 'AceEvent-3.0'}, ['SLE'] = { 'AceHook-3.0', 'AceEvent-3.0' }, } diff --git a/ElvUI_SLE/core/test.lua b/ElvUI_SLE/core/test.lua index b97c397..30f7ada 100644 --- a/ElvUI_SLE/core/test.lua +++ b/ElvUI_SLE/core/test.lua @@ -1,48 +1,2 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local T = E:GetModule('SLE_Test'); -local LSM = LibStub("LibSharedMedia-3.0") - --- local f1, f2, b1, b2 - --- function T:Load(event, addon) - -- if addon ~= "ElvUI_Config" then return end - -- T:UnregisterEvent("ADDON_LOADED") - - -- E.Options.args.actionbar.args.enable.name = '|cff30ee30'..L["Enable"]..'|r' - --- end - --- function T:Initialize() - -- self:RegisterEvent("ADDON_LOADED", "Load") - --[[f1 = CreateFrame("PlayerModel") - f1:SetPoint("TOPLEFT", LeftChatPanel,"TOPLEFT",0,0) - f1:SetHeight(E.db.chat.panelHeight) - f1:SetWidth(E.db.chat.panelWidth) - - f1:SetFrameStrata(LeftChatPanel:GetFrameStrata()) - f1:SetFrameLevel(LeftChatPanel:GetFrameLevel() - 2) - f1:SetScale(0.71) - f1:SetUnit("player") - - f1:SetPosition(2.5,0,-0.9) - f1:SetFacing(0.5)]] --- end - --- local function SetFont(obj, font, size, style, r, g, b, sr, sg, sb, sox, soy) - -- obj:SetFont(font, size, style) - -- if sr and sg and sb then obj:SetShadowColor(sr, sg, sb) end - -- if sox and soy then obj:SetShadowOffset(sox, soy) end - -- if r and g and b then obj:SetTextColor(r, g, b) - -- elseif r then obj:SetAlpha(r) end --- end - --- function T:Set() - -- local NORMAL = E["media"].normFont - -- local NUMBER = E["media"].normFont - -- SetFont(ZoneTextString, LSM:Fetch('font', 'ElvUI Pixel'), 36, 'MONOCHROMEOUTLINE') - -- SetFont(SubZoneTextString, NORMAL, 13, "OUTLINE") --- end - --- E:RegisterModule(T:GetName()) - --- hooksecurefunc(E, "UpdateBlizzardFonts", T.Set) \ No newline at end of file diff --git a/ElvUI_SLE/core/toolkit.lua b/ElvUI_SLE/core/toolkit.lua index 2a0b2a0..c3d196a 100644 --- a/ElvUI_SLE/core/toolkit.lua +++ b/ElvUI_SLE/core/toolkit.lua @@ -10,6 +10,7 @@ local F = E:GetModule('SLE_Farm') local LT = E:GetModule('SLE_Loot') local UF = E:GetModule('UnitFrames') local M = E:GetModule('SLE_Media') +local I = E:GetModule('SLE_InstDif') --test local GetContainerNumSlots, GetContainerItemID = GetContainerNumSlots, GetContainerItemID @@ -61,4 +62,5 @@ function E:UpdateAll() F:UpdateLayout() CH:GMIconUpdate() M:TextWidth() + I:UpdateFrame() end \ No newline at end of file diff --git a/ElvUI_SLE/defaults/profile.lua b/ElvUI_SLE/defaults/profile.lua index e56471e..ba9de58 100644 --- a/ElvUI_SLE/defaults/profile.lua +++ b/ElvUI_SLE/defaults/profile.lua @@ -262,6 +262,12 @@ P['sle'] = { ['pethide'] = false, ['skindungeon'] = false, }, + ['instance'] = { + ['enable'] = false, + ['flag'] = true, + ['xoffset'] = -10, + ['yoffset'] = 0, + }, }, --Nameplate Options diff --git a/ElvUI_SLE/modules/marks/load_marks.xml b/ElvUI_SLE/modules/marks/load_marks.xml index 248f4e3..289c801 100644 --- a/ElvUI_SLE/modules/marks/load_marks.xml +++ b/ElvUI_SLE/modules/marks/load_marks.xml @@ -1,5 +1,4 @@