Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Oct 29, 2022
2 parents 3004846 + 4eb80ad commit 16c5fda
Show file tree
Hide file tree
Showing 16 changed files with 134 additions and 82 deletions.
1 change: 1 addition & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ read_globals = {
"GetAverageItemLevel",
"GetCurrentBindingSet",
"GetCursorPosition",
"GetCVarBool",
"GetDetailedItemLevelInfo",
"GetFlyoutInfo",
"GetFriendshipReputation",
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
# CHANGELOG

## Version 100000.02

### Action Bars

- Added mouseover casting to action bars.
- Added an option to scale the main action bar artwork.

### Blizzard

- 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.

### Unit Frames

- Fixed an issue where disabling the player castbar would result in an error.

### 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.

## Version 100000.01

- Added 10.0.0 support.
Expand Down
64 changes: 13 additions & 51 deletions ls_UI/core/changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,66 +6,28 @@ local _G = getfenv(0)

-- Mine
E.CHANGELOG = [[
- Added 10.0.0 support.
- Despite the overall lack of visual changes, practically the entire UI was rewritten due to how
extensive DF changes were.
- The "Round" layout is gone. I'm really sorry :(
### Action Bars
- Added support for the new extra action bars.
- Added an option to toggle wyverns/gryphons. You can now choose between one, two, or no endcaps.
- Removed an option to split the micromenu into two parts.
- Removed the custom bag bar in favour of the new bag bar from Blizz.
- Removed the "Inventory" microbutton, the new backpack button will host the currency tooltip.
- Added mouseover casting to action bars.
- Added an option to scale the main action bar artwork.
### Blizzard
- Removed customisation options and movers for a bunch of the default UI widgets because they're
reworked by Blizzard. Affected widgets are castbars, the objective tracker, mirror timers (breath,
fatigue), and the alternative player power bar (the dragon riding bar, various widgets for boss
encounters, etc).
- I left in an option to auto-hide the talking head.
- From now on use Blizz layout manager to move the talking head and objective tracker, I removed
movers for these two because I wanted to avoid breaking anything in the layout manager, it's
really easy. And on top of that the objective tracker itself is a very, let's say, sensitive
widget.
- If in the future Blizz add an option to safely remove things from their layout manager, I'll
gladly readd objective tracker and talking head movers.
- Temporarily disabled gem and enchant texts in the character frame. Both rely on the new tooltip
system that's not available in the pre-patch, more on that later.
### Filters
- Turned "Blacklist" and "M+ Affixes" filters into curated read-only filters. I hope folks in our
Discord server will help me to maintain the M+ filter. If you added anything to these two filters,
don't worry, you'll find all the extra auras in new "Blacklist.bak" and "M+ Affixes.bak" filters.
### Loot
- Fixed the option to hide the talking head.
- Removed the custom loot frame.
### Buffs and Debuffs
### Minimap
- Both round and square minimaps now use fixed size textures. The 125% size option may come back in
the future, but I feel like the current size is big enough for everyone.
- Removed minimap button collecting and skinning. By default, there's no need to collect buttons
anymore, Blizz removed practically everything. I'll most likely release it as a separate addon.
- While the minimap has both my and Blizz (Edit Mode) movers, Blizz mover does nothing, it can't
move the minimap, it can't change its settings. Unfortunately, Blizz didn't give addon devs a way
to safely remove things from their layout manager.
### Tooltips
- While the module was rewritten from the ground up, it'll be disabled during 10.0.0 because Blizz
for some reason decided to release their new tooltip system with 10.0.2.
- Fixed an issue where it's impossible to cancel an aura by right-clicking it.
### Unit Frames
- Added support for evokers.
- Fixed an issue where disabling the player castbar would result in an error.
### Known Issues
NOTE: Unfortunately, due to all the changes in DF is became impossible to maintain the round layout
within the UI. To maintain it, I'd basically have to turn it one a separate addon, for this reasons
I chose to retire it for good. It's been with me for almost 15 years, from way before this addon
became publicly available, it's heartbreaking to see it gone :(
- 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.
]]
4 changes: 1 addition & 3 deletions ls_UI/core/defaults.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1891,6 +1891,7 @@ D.profile = {
range_indicator = "button", -- hotkey
rightclick_selfcast = false,
blizz_vehicle = false,
scale = 1,
endcaps = "BOTH", -- "LEFT", "RIGHT", "NONE"
cooldown = {
exp_threshold = 5,
Expand Down Expand Up @@ -2729,9 +2730,6 @@ PrD.profile = {
maw_buffs = { -- MawBuffsBelowMinimapFrame
enabled = true,
},
talking_head = { -- TalkingHeadFrame
enabled = true
},
vehicle_seat = { -- VehicleSeatIndicator
enabled = true
},
Expand Down
1 change: 0 additions & 1 deletion ls_UI/core/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,6 @@ function E:ForceHide(object, skipEvents)

if object.EnableMouse then
object:EnableMouse(false)

end

if object.UnregisterAllEvents then
Expand Down
2 changes: 1 addition & 1 deletion ls_UI/embeds/oUF
Submodule oUF updated 3 files
+1 −1 .luacheckrc
+21 −15 blizzard.lua
+1 −1 elements/castbar.lua
10 changes: 7 additions & 3 deletions ls_UI/locales/enUS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ L["FACTION_HORDE"] = _G.FACTION_HORDE
L["FEATURE_BECOMES_AVAILABLE_AT_LEVEL"] = _G.FEATURE_BECOMES_AVAILABLE_AT_LEVEL
L["FEATURE_NOT_AVAILBLE_NEUTRAL"] = _G.FEATURE_NOT_AVAILBLE_PANDAREN
L["FOCUS"] = _G.FOCUS
L["FOCUS_CAST"] = _G.FOCUS_CAST_KEY_TEXT
L["FOCUS_CAST_KEY"] = _G.FOCUS_CAST_KEY_TEXT
L["FOREIGN_SERVER_LABEL"] = _G.FOREIGN_SERVER_LABEL:gsub("%s", "")
L["FURY"] = _G.FURY
L["GENERAL"] = _G.GENERAL_LABEL
Expand All @@ -62,6 +62,9 @@ L["MAW_BUFFS"] = _G.MAW_POWER_DESCRIPTION
L["MINIMAP"] = _G.MINIMAP_LABEL
L["MINIMAP_HEADER_UNDERNEATH"] = _G.HUD_EDIT_MODE_SETTING_MINIMAP_HEADER_UNDERNEATH
L["MISC"] = _G.MISCELLANEOUS
L["MOUSEOVER_CAST"] = _G.ENABLE_MOUSEOVER_CAST
L["MOUSEOVER_CAST_KEY"] = _G.MOUSEOVER_CAST_KEY
L["MOUSEOVER_CAST_KEY_DESC"] = _G.OPTION_TOOLTIP_ENABLE_MOUSEOVER_CAST_KEY_TEXT
L["NEW"] = _G.NEW
L["NONE"] = _G.NONE
L["OFFLINE"] = _G.PLAYER_OFFLINE
Expand All @@ -77,8 +80,8 @@ L["ROTATE_MINIMAP"] = _G.HUD_EDIT_MODE_SETTING_MINIMAP_ROTATE_MINIMAP
L["RUNES"] = _G.RUNES
L["RUNIC_POWER"] = _G.RUNIC_POWER
L["SANCTUARY"] = _G.SANCTUARY_TERRITORY:gsub("[()]", "")
L["SELF_CAST"] = _G.AUTO_SELF_CAST_KEY_TEXT
L["SELF_CAST_DESC"] = _G.OPTION_TOOLTIP_AUTO_SELF_CAST_KEY_TEXT
L["SELF_CAST_KEY"] = _G.AUTO_SELF_CAST_KEY_TEXT
L["SELF_CAST_KEY_DESC"] = _G.OPTION_TOOLTIP_AUTO_SELF_CAST_KEY_TEXT
L["SHIFT"] = _G.SHIFT_KEY_TEXT
L["SHOW"] = _G.SHOW
L["SOUL_SHARDS"] = _G.SOUL_SHARDS_POWER
Expand Down Expand Up @@ -407,6 +410,7 @@ L["RUNES_FROST"] = "Frost Runes"
L["RUNES_UNHOLY"] = "Unholy Runes"
L["S_MS_THRESHOLD"] = "S:MS Threshold"
L["S_MS_THRESHOLD_DESC"] = "The threshold (in seconds) below which the remaining time will be shown in the S:MS format."
L["SCALE"] = "Scale"
L["SECOND_ANCHOR"] = "Second Anchor"
L["SECONDS"] = "Seconds"
L["SELF_BUFFS"] = "Self Buffs"
Expand Down
1 change: 1 addition & 0 deletions ls_UI/locales/ruRU.lua
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ L["RUNES_FROST"] = "Руны льда"
L["RUNES_UNHOLY"] = "Руны нечестивости"
L["S_MS_THRESHOLD"] = "Порог С:МС"
L["S_MS_THRESHOLD_DESC"] = "Если оставшееся время восстановления ниже данного значения (в секундах), то оно будет показано в формате С:МС"
L["SCALE"] = "Масштаб"
L["SECOND_ANCHOR"] = "Вторая точка привязки"
L["SECONDS"] = "Секунды"
L["SELF_BUFFS"] = "Собственные баффы"
Expand Down
2 changes: 1 addition & 1 deletion ls_UI/ls_UI.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 100000
## Author: lightspark
## Version: 100000.01
## Version: 100000.02
## Title: LS: |cff1a9fc0UI|r
## Notes: Yet another UI, but this one is a bit special...
## SavedVariables: LS_UI_GLOBAL_CONFIG, LS_UI_PRIVATE_CONFIG
Expand Down
2 changes: 1 addition & 1 deletion ls_UI/modules/auras/auras.lua
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ local function handleButton(button, header)
button:SetScript("OnEnter", button.OnEnter)
button:SetScript("OnLeave", button.OnLeave)
button:SetScript("OnSizeChanged", button.OnSizeChanged)
button:RegisterForClicks("LeftButtonUp", "RightButtonUp")
button:RegisterForClicks("RightButtonDown", "RightButtonUp")

button.Icon = E:SetIcon(button, [[Interface\ICONS\INV_Misc_QuestionMark]])

Expand Down
3 changes: 2 additions & 1 deletion ls_UI/modules/bars/actionbars.lua
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,9 @@ function bar_proto:UpdateButtonConfig()

button:UpdateConfig(self.buttonConfig)
button:SetAttribute("buttonlock", true)
button:SetAttribute("checkselfcast", true)
button:SetAttribute('checkmouseovercast', true)
button:SetAttribute("checkfocuscast", true)
button:SetAttribute("checkselfcast", true)
button:SetAttribute("*unit2", self._config.rightclick_selfcast and "player" or nil)
end
end
Expand Down
8 changes: 8 additions & 0 deletions ls_UI/modules/bars/controller.lua
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ function MODULE:SetupActionBarController()
anim:SetDuration(0.15)

self:UpdateEndcaps()
self:UpdateScale()

isInit = true
end
Expand All @@ -357,3 +358,10 @@ function MODULE:UpdateEndcaps()
animController.RightCap:Hide()
end
end

function MODULE:UpdateScale()
local scale = C.db.profile.bars.scale

barController:SetScale(scale)
animController:SetScale(scale)
end
6 changes: 5 additions & 1 deletion ls_UI/modules/bars/extra.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ function bar_proto:Update()

local width, height = ExtraActionButton1:GetSize()
self:SetSize((width > 0 and width or 52) + 4, (height > 0 and height or 52) + 4)
E.Movers:Get(self):UpdateSize()

local mover = E.Movers:Get(self)
if mover then
mover:UpdateSize()
end
end

function bar_proto:UpdateArtwork()
Expand Down
6 changes: 5 additions & 1 deletion ls_UI/modules/bars/zone.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ function bar_proto:Update()
end

self:SetSize(width + 4, height + 4)
E.Movers:Get(self):UpdateSize()

local mover = E.Movers:Get(self)
if mover then
mover:UpdateSize()
end
end

function bar_proto:UpdateArtwork()
Expand Down
13 changes: 3 additions & 10 deletions ls_UI/modules/blizzard/talkinghead.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,9 @@ function MODULE:HasTalkingHead()
end

function MODULE:SetUpTalkingHead()
if not isInit and PrC.db.profile.blizzard.talking_head.enabled then
local isLoaded = true
if not IsAddOnLoaded("Blizzard_TalkingHeadUI") then
isLoaded = LoadAddOn("Blizzard_TalkingHeadUI")
end
if not isInit then
hooksecurefunc(TalkingHeadFrame, "PlayCurrent", closeTalkingHead)

if isLoaded then
hooksecurefunc(TalkingHeadFrame, "PlayCurrent", closeTalkingHead)

isInit = true
end
isInit = true
end
end
Loading

0 comments on commit 16c5fda

Please sign in to comment.