Merge branch 'dev'

ls- · Mar 14, 2019 · fa57e51 · fa57e51
2 parents a819dfd + cd22f73
commit fa57e51
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## Version 80100.04
+
+- Added 8.1.5 support;
+- Adjusted custom character frame so it doesn't interfere with Pawn's and DejaCharacterStats'  
+  buttons;
+- Updated embedded oUF.
+
 ## Version 80100.03
 
 - Reworked the character frame. It now shows info on gems and enchants. Enabled by default, can be  

diff --git a/ls_UI.toc b/ls_UI.toc
@@ -1,6 +1,6 @@
 ## Interface: 80100
 ## Author: lightspark
-## Version: 80100.03
+## Version: 80100.04
 ## Title: ls: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## SavedVariablesPerCharacter: LS_UI_CHAR_CONFIG

diff --git a/modules/blizzard/characterframe.lua b/modules/blizzard/characterframe.lua
@@ -181,7 +181,9 @@ function MODULE:SetUpCharacterFrame()
 		CharacterSecondaryHandSlot:SetPoint("BOTTOMRIGHT", CharacterFrame.Inset, "BOTTOMRIGHT", -176, 5)
 
 		CharacterModelFrame:SetSize(0, 0)
-		CharacterModelFrame:SetAllPoints(CharacterFrame.Inset)
+		CharacterModelFrame:ClearAllPoints()
+		CharacterModelFrame:SetPoint("TOPLEFT", CharacterFrame.Inset, 0, 0)
+		CharacterModelFrame:SetPoint("BOTTOMRIGHT", CharacterFrame.Inset, 0, 44)
 
 		for _, texture in next, TEXTURES_TO_REMOVE do
 			texture:SetTexture(nil)