Merge branch 'dev'

.luacheckrc

@@ -60,12 +60,14 @@ read_globals = {
 	"GetCursorPosition",
 	"GetCVarBool",
 	"GetDetailedItemLevelInfo",
+	"GetDifficultyInfo",
 	"GetFlyoutInfo",
 	"GetFriendshipReputation",
 	"GetGameTime",
 	"GetGuildInfo",
 	"GetInboxHeaderInfo",
 	"GetInboxNumItems",
+	"GetInstanceInfo",
 	"GetInventoryItemDurability",
 	"GetInventoryItemLink",
 	"GetInventoryItemTexture",
@@ -109,6 +111,7 @@ read_globals = {
 	"GetZonePVPInfo",
 	"HasArtifactEquipped",
 	"InCombatLockdown",
+	"InGuildParty",
 	"IsAddOnLoaded",
 	"IsAltKeyDown",
 	"IsControlKeyDown",

CHANGELOG.md

@@ -1,5 +1,35 @@
 # CHANGELOG
 
+## Version 100000.03
+
+### Action Bars
+
+- Fixed a bug where the extra action button would stay hidden despite being enabled.
+- Fixed a bug where an action bar anchored to another frame would appear in a different spot from
+  its mover. I had to rework movers for DF, so there might be more of these, please, continue to
+  report them.
+
+### Minimap
+
+- Added custom difficulty flags. LFR, normal, heroic, mythic, and M+ difficulties will now have
+  unique flags. There's also an option to show the tooltip with the difficulty info, it's disabled
+  by default.
+
+### Unit Frames
+
+- Added an option to use Blizzard castbar. When you disable the player castbar, the new "Enable
+  Blizzard Castbar" option will appear next to it.
+
+### Known Issues
+
+- Spell flyouts don't work. It's not a bug in my UI, it's a Blizz bug that affects all addons.
+  I feel your pain, I have a mage alt, but for the time being either place frequently used spells
+  on your action bars or use them directly from your spellbook.
+- Tooltips don't work. Just to reiterate, Blizz chose to delay the new tooltip system until 10.0.2,
+  the rewritten tooltip module relies on it to work, so I had to disable it for the time being.
+
+![Imgur](https://i.imgur.com/kYQnCzY.png)
+
 ## Version 100000.02
 
 ### Action Bars

ls_UI/core/changelog.lua

@@ -8,20 +8,21 @@ local _G = getfenv(0)
 E.CHANGELOG = [[
 ### Action Bars
 
-- Added mouseover casting to action bars.
-- Added an option to scale the main action bar artwork.
+- Fixed a bug where the extra action button would stay hidden despite being enabled.
+- Fixed a bug where an action bar anchored to another frame would appear in a different spot from
+  its mover. I had to rework movers for DF, so there might be more of these, please, continue to
+  report them.
 
-### Blizzard
+### Minimap
 
-- Fixed the option to hide the talking head.
-
-### Buffs and Debuffs
-
-- Fixed an issue where it's impossible to cancel an aura by right-clicking it.
+- Added custom difficulty flags. LFR, normal, heroic, mythic, and M+ difficulties will now have
+  unique flags. There's also an option to show the tooltip with the difficulty info, it's disabled
+  by default.
 
 ### Unit Frames
 
-- Fixed an issue where disabling the player castbar would result in an error.
+- Added an option to use Blizzard castbar. When you disable the player castbar, the new "Enable
+  Blizzard Castbar" option will appear next to it.
 
 ### Known Issues
 

ls_UI/core/defaults.lua

@@ -621,6 +621,7 @@ D.profile = {
 			},
 			castbar = {
 				enabled = true,
+				blizz_enabled = false,
 				latency = true,
 				detached = true,
 				width_override = 226,
@@ -1874,6 +1875,10 @@ D.profile = {
 		color = {
 			border = false,
 		},
+		flag = {
+			enabled = true,
+			tooltip = false,
+		},
 		fade = {
 			enabled = false,
 			combat = false,

ls_UI/locales/deDE.lua

@@ -67,6 +67,7 @@ L["DEBUFF"] = "Schwächungszauber"
 L["DEBUFFS"] = "Debuffs"
 L["DIFFICULT"] = "Schwierig"
 L["DIFFICULTY"] = "Schwierigkeit"
+L["DIFFICULTY_FLAG"] = "Schwierigskeitsflagge"
 L["DISABLE_MOUSE"] = "Maus deaktivieren"
 L["DISABLE_MOUSE_DESC"] = "Ignoriere Mausklicks."
 L["DISEASE"] = "Krankheit"

ls_UI/locales/enUS.lua

@@ -196,6 +196,7 @@ L["DESCENDING"] = "Descending"
 L["DETACH_FROM_FRAME"] = "Detach from Frame"
 L["DIFFICULT"] = "Difficult"
 L["DIFFICULTY"] = "Difficulty"
+L["DIFFICULTY_FLAG"] = "Difficulty Flag"
 L["DIGSITE_BAR"] = "Digsite Progress Bar"
 L["DISABLE_MOUSE"] = "Disable Mouse"
 L["DISABLE_MOUSE_DESC"] = "Ignore mouse events."
@@ -210,6 +211,7 @@ L["DOWNLOADS"] = "Downloads"
 L["DRAG_KEY"] = "Drag Key"
 L["DUNGEONS_BUTTON_DESC"] = "Show 'Call to Arms' information."
 L["DURABILITY_FRAME"] = "Durability Frame"
+L["ENABLE_BLIZZARD_CASTBAR"] = "Enable Blizzard Castbar"
 L["ENDCAPS"] = "Artwork"
 L["ENDCAPS_BOTH"] = "Both"
 L["ENDCAPS_LEFT"] = "Left"
@@ -464,6 +466,7 @@ L["THREAT_GLOW"] = "Threat Glow"
 L["TIME"] = "Time"
 L["TOF_FRAME"] = "Target of Focus Frame"
 L["TOGGLE_ANCHORS"] = "Toggle Anchors"
+L["TOOLTIP"] = "Tooltip"
 L["TOOLTIP_IDS"] = "Spell and Item IDs"
 L["TOOLTIPS"] = "Tooltips"
 L["TOP_INSET_SIZE"] = "Top Inset Size"

ls_UI/locales/esES.lua

@@ -99,6 +99,7 @@ L["DESCENDING"] = "Descendiente"
 L["DETACH_FROM_FRAME"] = "Despegar del cuadro."
 L["DIFFICULT"] = "Difícil"
 L["DIFFICULTY"] = "Dificultad"
+L["DIFFICULTY_FLAG"] = "Bandera de dificultad"
 L["DIGSITE_BAR"] = "Barra de progreso de excavaciones"
 L["DISABLE_MOUSE"] = "Desactivar ratón"
 L["DISABLE_MOUSE_DESC"] = "Ignorar eventos de ratón."

ls_UI/locales/frFR.lua

@@ -98,6 +98,7 @@ L["DESCENDING"] = "Descendant"
 L["DETACH_FROM_FRAME"] = "Détacher du cadre"
 L["DIFFICULT"] = "Difficile"
 L["DIFFICULTY"] = "Difficulté"
+L["DIFFICULTY_FLAG"] = "Drapeau de difficulté"
 L["DIGSITE_BAR"] = "Barre de progression de la fouille"
 L["DISABLE_MOUSE"] = "Désactiver la souris"
 L["DISABLE_MOUSE_DESC"] = "Ignorer les évènements de souris."

ls_UI/locales/ruRU.lua

@@ -109,6 +109,7 @@ L["DESCENDING"] = "По убыванию"
 L["DETACH_FROM_FRAME"] = "Отсоединить от рамки"
 L["DIFFICULT"] = "Сложный"
 L["DIFFICULTY"] = "Сложность"
+L["DIFFICULTY_FLAG"] = "Флаг режима сложности"
 L["DIGSITE_BAR"] = "Полоса прогресса раскопок"
 L["DISABLE_MOUSE"] = "Отключить мышь"
 L["DISABLE_MOUSE_DESC"] = "Игнорировать мышь."
@@ -123,6 +124,7 @@ L["DOWNLOADS"] = "Загрузки"
 L["DRAG_KEY"] = "Кнопка для перетаскивания"
 L["DUNGEONS_BUTTON_DESC"] = "Показывать информацию о 'Призыве к оружию'."
 L["DURABILITY_FRAME"] = "Рамка прочности"
+L["ENABLE_BLIZZARD_CASTBAR"] = "Включить полосу заклинаний от Blizzard"
 L["ENDCAPS"] = "Текстуры"
 L["ENDCAPS_BOTH"] = "Обе"
 L["ENDCAPS_LEFT"] = "Левая"
@@ -377,6 +379,7 @@ L["THREAT_GLOW"] = "Подсветка уровня угрозы"
 L["TIME"] = "Время"
 L["TOF_FRAME"] = "Рамка цели фокуса"
 L["TOGGLE_ANCHORS"] = "Показать/скрыть фреймы крепления"
+L["TOOLTIP"] = "Подсказка"
 L["TOOLTIP_IDS"] = "ID способностей и предметов"
 L["TOOLTIPS"] = "Подсказки"
 L["TOP_INSET_SIZE"] = "Размер верхней вставки"

ls_UI/locales/zhCN.lua

@@ -126,6 +126,7 @@ L["DESCENDING"] = "降序"
 L["DETACH_FROM_FRAME"] = "从框架脱离"
 L["DIFFICULT"] = "困难"
 L["DIFFICULTY"] = "难度"
+L["DIFFICULTY_FLAG"] = "难度标记"
 L["DIGSITE_BAR"] = "考古进度条"
 L["DISABLE_MOUSE"] = "禁用鼠标"
 L["DISABLE_MOUSE_DESC"] = "忽略鼠标事件"

ls_UI/ls_UI.toc

@@ -1,6 +1,6 @@
 ## Interface: 100000
 ## Author: lightspark
-## Version: 100000.02
+## Version: 100000.03
 ## Title: LS: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## SavedVariables: LS_UI_GLOBAL_CONFIG, LS_UI_PRIVATE_CONFIG

ls_UI/modules/auras/auras.lua

@@ -98,7 +98,6 @@ do
 	function button_proto:OnEnter()
 		local p, rP, x, y = E:GetTooltipPoint(self)
 
-
 		GameTooltip:SetOwner(self, "ANCHOR_NONE")
 		GameTooltip:SetPoint(p, self, rP, x, y)
 		GameTooltip:SetFrameLevel(self:GetFrameLevel() + 2)

ls_UI/modules/bars/core.lua

@@ -92,6 +92,7 @@ end
 
 function MODULE:Create(id, name, isInsecure)
 	local bar = Mixin(CreateFrame("Frame", name, UIParent, isInsecure and nil or "SecureHandlerStateTemplate"), bar_proto)
+	bar:SetSize(0, 0)
 	bar._id = id
 	bar._buttons = {}
 	bars[id] = bar

ls_UI/modules/bars/extra.lua

@@ -4,6 +4,7 @@ local MODULE = P:GetModule("Bars")
 
 -- Lua
 local _G = getfenv(0)
+local hooksecurefunc = _G.hooksecurefunc
 local unpack = _G.unpack
 
 -- Mine
@@ -80,6 +81,12 @@ function MODULE:CreateExtraButton()
 		ExtraActionBarFrame:SetParent(bar)
 		ExtraActionBarFrame.ignoreInLayout = true
 
+		hooksecurefunc(ExtraActionBarFrame, "SetParent", function(self, parent)
+			if parent ~= bar then
+				self:SetParent(bar)
+			end
+		end)
+
 		-- ExtraAbilityContainer.ignoreFramePositionManager = true
 		-- ExtraAbilityContainer:SetScript("OnShow", nil)
 		-- ExtraAbilityContainer:SetScript("OnHide", nil)