From 43acd87402dc72c7a0a04bc03896e038e974ca43 Mon Sep 17 00:00:00 2001 From: Jennifer Date: Sat, 14 Sep 2019 12:50:29 +0100 Subject: [PATCH] 0134 --- Modules/DisplayTeam.lua | 18 ++++++++++++++++++ Modules/Guild.lua | 2 +- Modules/ItemUse.lua | 2 +- Modules/Mail.lua | 2 +- Modules/Purchase.lua | 2 +- Modules/Trade.lua | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Modules/DisplayTeam.lua b/Modules/DisplayTeam.lua index b84af82..ce04289 100644 --- a/Modules/DisplayTeam.lua +++ b/Modules/DisplayTeam.lua @@ -345,6 +345,7 @@ local function CreateEMATeamListFrame() } ) -- Create the title for the team list frame. local titleName = frame:CreateFontString( "EMADisplayTeamListWindowFrameTitleText", "OVERLAY", "GameFontNormal" ) + titleName:ClearAllPoints() titleName:SetPoint( "TOP", frame, "TOP", 0, -5 ) titleName:SetTextColor( 1.00, 1.00, 1.00 ) titleName:SetText( L["EMA_TEAM"] ) @@ -895,9 +896,11 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) portraitButton:SetPosition( 0, 0, 0 ) portraitButton:SetWidth( EMA.db.characterPortraitWidth ) portraitButton:SetHeight( EMA.db.characterPortraitWidth ) + portraitButton:ClearAllPoints() portraitButton:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) portraitButtonClick:SetWidth( EMA.db.characterPortraitWidth ) portraitButtonClick:SetHeight( EMA.db.characterPortraitWidth ) + portraitButtonClick:ClearAllPoints() portraitButtonClick:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) portraitButton:Show() portraitButtonClick:Show() @@ -913,9 +916,11 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) followBar.backgroundTexture:SetAllPoints() followBar:SetWidth( EMA.db.followStatusWidth ) followBar:SetHeight( EMA.db.followStatusHeight ) + followBar:ClearAllPoints() followBar:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) followBarClick:SetWidth( EMA.db.followStatusWidth ) followBarClick:SetHeight( EMA.db.followStatusHeight ) + followBarClick:ClearAllPoints() followBarClick:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) followBar:Show() followBarClick:Show() @@ -1019,9 +1024,11 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) experienceBar.backgroundTexture:SetAllPoints() experienceBar:SetWidth( EMA.db.experienceStatusWidth ) experienceBar:SetHeight( EMA.db.experienceStatusHeight / showBarCount ) + experienceBar:ClearAllPoints() experienceBar:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft , positionTop ) experienceBarClick:SetWidth( EMA.db.experienceStatusWidth ) experienceBarClick:SetHeight( EMA.db.experienceStatusHeight / showBarCount ) + experienceBarClick:ClearAllPoints() experienceBarClick:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) if EMA.db.showXpStatus == true then experienceBar:Show() @@ -1034,7 +1041,9 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) experienceArtBar.backgroundTexture:SetAllPoints() experienceArtBar:SetWidth( EMA.db.experienceStatusWidth ) experienceArtBar:SetHeight( EMA.db.experienceStatusHeight / showBarCount ) + experienceArtBar:ClearAllPoints() experienceArtBar:SetPoint( "TOPLEFT", showArtBeforeBar, setArtPoint, setArtLeft , setArtTop ) + experienceArtBarClick:ClearAllPoints() experienceArtBarClick:SetPoint( "TOPLEFT", showArtBeforeBar, setArtPoint, setArtLeft , setArtTop ) experienceArtBarClick:SetWidth( EMA.db.experienceStatusWidth ) experienceArtBarClick:SetHeight( EMA.db.experienceStatusHeight / showBarCount ) @@ -1064,7 +1073,9 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) reputationBar.backgroundTexture:SetAllPoints() reputationBar:SetWidth( EMA.db.experienceStatusWidth ) reputationBar:SetHeight( EMA.db.experienceStatusHeight / showBarCount ) + reputationBar:ClearAllPoints() reputationBar:SetPoint( "TOPLEFT", showRepBeforeBar , setRepPoint, setRepLeft, setRepTop ) + reputationBarClick:ClearAllPoints() reputationBarClick:SetPoint( "TOPLEFT", showRepBeforeBar , setRepPoint, setRepLeft, setRepTop ) reputationBarClick:SetWidth( EMA.db.experienceStatusWidth ) reputationBarClick:SetHeight( EMA.db.experienceStatusHeight / showBarCount ) @@ -1098,9 +1109,11 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) healthBar.backgroundTexture:SetAllPoints() healthBar:SetWidth( EMA.db.healthStatusWidth ) healthBar:SetHeight( EMA.db.healthStatusHeight ) + healthBar:ClearAllPoints() healthBar:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) healthBarClick:SetWidth( EMA.db.healthStatusWidth ) healthBarClick:SetHeight( EMA.db.healthStatusHeight ) + healthBarClick:ClearAllPoints() healthBarClick:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) healthBar:Show() healthBarClick:Show() @@ -1118,6 +1131,7 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) healthIncomingBar.backgroundTexture:SetAllPoints() healthIncomingBar:SetWidth( EMA.db.healthStatusWidth ) healthIncomingBar:SetHeight( EMA.db.healthStatusHeight ) + healthIncomingBar:ClearAllPoints() healthIncomingBar:SetPoint( "TOPLEFT", healthBar, "TOPLEFT", 0, 0 ) healthIncomingBar:Show() else @@ -1131,9 +1145,11 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) powerBar.backgroundTexture:SetAllPoints() powerBar:SetWidth( EMA.db.powerStatusWidth ) powerBar:SetHeight( EMA.db.powerStatusHeight ) + powerBar:ClearAllPoints() powerBar:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) powerBarClick:SetWidth( EMA.db.powerStatusWidth ) powerBarClick:SetHeight( EMA.db.powerStatusHeight ) + powerBarClick:ClearAllPoints() powerBarClick:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) powerBar:Show() powerBarClick:Show() @@ -1153,9 +1169,11 @@ function EMA:UpdateEMATeamStatusBar( characterName, characterPosition ) comboBar.backgroundTexture:SetAllPoints() comboBar:SetWidth( EMA.db.comboStatusWidth ) comboBar:SetHeight( EMA.db.comboStatusHeight ) + comboBar:ClearAllPoints() comboBar:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) comboBarClick:SetWidth( EMA.db.comboStatusWidth ) comboBarClick:SetHeight( EMA.db.comboStatusHeight ) + comboBarClick:ClearAllPoints() comboBarClick:SetPoint( "TOPLEFT", parentFrame, "TOPLEFT", positionLeft, positionTop ) comboBar:Show() comboBarClick:Show() diff --git a/Modules/Guild.lua b/Modules/Guild.lua index 1c9c8e9..5bdf93d 100644 --- a/Modules/Guild.lua +++ b/Modules/Guild.lua @@ -807,7 +807,7 @@ end function EMA:RemoveItem() if EMA.db.globalGuildList == true then - table.remove( EMA.db.global.autoGuildItemsListGlobal, EMA.settingsControl.listHighlightRow ) + table.remove( EMA.db.global.autoGuildItemsListGlobal, EMA.settingsControl.GuildItemsHighlightRow ) else table.remove( EMA.db.autoGuildItemsList, EMA.settingsControl.GuildItemsHighlightRow ) end diff --git a/Modules/ItemUse.lua b/Modules/ItemUse.lua index ce683fc..b64b615 100644 --- a/Modules/ItemUse.lua +++ b/Modules/ItemUse.lua @@ -244,8 +244,8 @@ local function CreateEMAItemUseFrame() tile = true, tileSize = 10, edgeSize = 10, insets = { left = 3, right = 3, top = 3, bottom = 3 } } ) - frame:SetPoint( EMA.db.framePoint, nil, EMA.db.frameRelativePoint, EMA.db.frameXOffset, EMA.db.frameYOffset ) frame:ClearAllPoints() + frame:SetPoint( EMA.db.framePoint, nil, EMA.db.frameRelativePoint, EMA.db.frameXOffset, EMA.db.frameYOffset ) -- Clear Button local updateButton = CreateFrame( "Button", "ButtonUpdate", frame, "UIPanelButtonTemplate" ) updateButton:SetScript( "OnClick", function() EMA.ClearButton() end ) diff --git a/Modules/Mail.lua b/Modules/Mail.lua index f9aeecd..3d1f620 100644 --- a/Modules/Mail.lua +++ b/Modules/Mail.lua @@ -821,7 +821,7 @@ end function EMA:RemoveItem() if EMA.db.globalMailList == true then - table.remove( EMA.db.global.autoMailItemsListGlobal, EMA.settingsControl.listHighlightRow ) + table.remove( EMA.db.global.autoMailItemsListGlobal, EMA.settingsControl.MailItemsHighlightRow ) else table.remove( EMA.db.autoMailItemsList, EMA.settingsControl.MailItemsHighlightRow ) end diff --git a/Modules/Purchase.lua b/Modules/Purchase.lua index 697cb84..227be6b 100644 --- a/Modules/Purchase.lua +++ b/Modules/Purchase.lua @@ -542,7 +542,7 @@ end function EMA:RemoveItem() if EMA.db.globalBuyList == true then - table.remove( EMA.db.global.autoBuyItemsListGlobal, EMA.settingsControl.listHighlightRow ) + table.remove( EMA.db.global.autoBuyItemsListGlobal, EMA.settingsControl.highlightRow ) else table.remove( EMA.db.autoBuyItems, EMA.settingsControl.highlightRow ) end diff --git a/Modules/Trade.lua b/Modules/Trade.lua index d15cdb1..146b631 100644 --- a/Modules/Trade.lua +++ b/Modules/Trade.lua @@ -690,7 +690,7 @@ end function EMA:RemoveItem() if EMA.db.globalTradeList == true then - table.remove( EMA.db.global.autoTradeItemsListGlobal, EMA.settingsControl.listHighlightRow ) + table.remove( EMA.db.global.autoTradeItemsListGlobal, EMA.settingsControl.tradeItemsHighlightRow ) else table.remove( EMA.db.autoTradeItemsList, EMA.settingsControl.tradeItemsHighlightRow ) end -- 1.7.9.5