diff --git a/boot.lua b/boot.lua index 24c885cf..73ec3d58 100644 --- a/boot.lua +++ b/boot.lua @@ -4,7 +4,7 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") _detalhes.build_counter = 489 --it's 489 for release - _detalhes.userversion = "v3.9.2" + _detalhes.userversion = "v3.9.3" _detalhes.realversion = 58 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -20,7 +20,9 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v3.9.2 (|cFFFFCC00Jan 30, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00v3.9.3 (|cFFFFCC00Jan 31, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Fixed title bar icon for all skins (almost all skins has it disabled by default).\n\n +|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n |cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n |cFFFFFF00-|r Added slash command 'toggle'.\n\n |cFFFFFF00-|r More tweaks and fixes on skins.\n\n @@ -30,10 +32,10 @@ do |cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n --]] ---|cFFFFFF00v3.9.2 (|cFFFFCC00Jan 30, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n +--|cFFFFFF00v3.9.3 (|cFFFFCC00Jan 31, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed title bar icon for all skins (almost all skins has it disabled by default).\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.9.2 (|cFFFFCC00Jan 30, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use.\n\n|cFFFFFF00-|r Plugin TimeAttack: fixed problem where sometimes required a reload to start a new time.\n\n|cFFFFFF00-|r Plugin Damage the Game!: fixed a problem where sometimes the time didn't started after level 2.\n\n|cFFFFFF00-|r Added specialization icons.\n\n|cFFFFFF00-|r Fixed Auto-Hide where it wasn't hiding the wallpaper of the window.\n\n|cFFFFFF00-|r Added 'Editing Group' check box on option panel, when enabled, settings changed also are modified on all windows in the group.\n\n|cFFFFFF00-|r Changing window's skin, doesn't change any more settings not related with appearance, for example, Auto-Hide, Switches.\n\n|cFFFFFF00-|r Custom display 'Health Potion & Stone' now also track Healing Tonic.\n\n|cFFFFFF00-|r Custom display 'Damage Taken by Spell' now tracks more spells and also melee hits.\n\n|cFFFFFF00-|r Menus now uses 'Friz Quadrata TT' font as default, also added an option to change it on options panel -> miscellaneous.\n\n|cFFFFFF00-|r 'Switch to Current' feature now switches all windows which have this option enabled.\n\n|cFFFFFF00-|r The message telling to use '/details reinstall' now only shows if a problem happen during the addon load process.\n\n|cFFFFFF00-|r Segments Saved option now can be set to 25, up from 5.\n\n|cFFFFFF00-|r Attempt to fix the bug with the monk spell 'Storm, Earth, and Fire'.\n\n|cFFFFFF00-|r Fixed 'Icon Pick' panel.\n\n|cFFFFFF00-|r Fixed bug when reporting friendly fire through player detail window.\n\n|cFFFFFF00-|r Fixed bug with report window where sometimes it was reporting on a wrong channel.\n\n|cFFFFFF00v3.7.1 (|cFFFFCC00Jan 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its levels adjusted for WoD.\n\n|cFFFFFF00-|r Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': incoming heals now count shield amount on the player too.\n\n|cFFFFFF00-|r Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.\n\n|cFFFFFF00-|r Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).\n\n|cFFFFFF00-|r Added option panel for Raid Check plugin.\n\n|cFFFFFF00-|r Added key bindings for open a window, close a window and select a bookmark.\n\n|cFFFFFF00-|r Added 'CTRL + RightClick' closes a window.\n\n|cFFFFFF00-|r Fixed wallpaper transparency after releasing the window from a stretch.|cFFFFFF00-|r Fixed few issues when using class text colors.\n\n|cFFFFFF00-|r Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.\n\n|cFFFFFF00-|r Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.\n\n|cFFFFFF00-|r Fixed auto erase poping up when the player enters on its garrison.\n\n|cFFFFFF00-|r Fixed combat on garrison training dummies which was being marked as Trash Segment.\n\n|cFFFFFF00-|r Fixed command /details disable, wasn't disabling the capture of cooldowns.\n\n|cFFFFFF00-|r Fixed a problem with fast dps/hps when the window is in a empty segment.\n\n|cFFFFFF00-|r Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.\n\n|cFFFFFF00-|r Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.\n\n|cFFFFFF00-|r Fixed bar animations when 'Sort Direction' is set to bottom.\n\n|cFFFFFF00-|r Fixed the spam 'you are not in a guild' when checking for new versions.\n\n|cFFFFFF00-|r Fixed translations for Auto Hide Settings bracket under options panel.\n\n|cFFFFFF00-|r Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.\n\n|cFFFFFF00v3.6.14b (|cFFFFCC00Jan 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n|cFFFFFF00-|r Added overkill on death's tooltip.\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n|cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n|cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n|cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n|cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n|cFFFFFF00v3.6.8 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Fast (i mean, really fast) Dps/Hps update rate, its option is under Rows: Advanced -> Fast Updates.\n\n|cFFFFFF00-|r Created a custom spell for Mirror Image's Fireball and Frostbolt, with that Player Detail window distinguishes spells from the player and images.\n\n|cFFFFFF00-|r Added new skin: 'ElvUI Style II'." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.9.3 (|cFFFFCC00Jan 31, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed title bar icon for all skins (almost all skins has it disabled by default).\n\n|cFFFFFF00-|r Fixed the window ungroup button (above the resize one).\n\n|cFFFFFF00-|r Removed keybinds for Open and Close, added toggle instead.\n\n|cFFFFFF00-|r Added slash command 'toggle'.\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improved 'Align with right chat' tool, now it also supports Forced Square skin.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use.\n\n|cFFFFFF00-|r Plugin TimeAttack: fixed problem where sometimes required a reload to start a new time.\n\n|cFFFFFF00-|r Plugin Damage the Game!: fixed a problem where sometimes the time didn't started after level 2.\n\n|cFFFFFF00-|r Added specialization icons.\n\n|cFFFFFF00-|r Fixed Auto-Hide where it wasn't hiding the wallpaper of the window.\n\n|cFFFFFF00-|r Added 'Editing Group' check box on option panel, when enabled, settings changed also are modified on all windows in the group.\n\n|cFFFFFF00-|r Changing window's skin, doesn't change any more settings not related with appearance, for example, Auto-Hide, Switches.\n\n|cFFFFFF00-|r Custom display 'Health Potion & Stone' now also track Healing Tonic.\n\n|cFFFFFF00-|r Custom display 'Damage Taken by Spell' now tracks more spells and also melee hits.\n\n|cFFFFFF00-|r Menus now uses 'Friz Quadrata TT' font as default, also added an option to change it on options panel -> miscellaneous.\n\n|cFFFFFF00-|r 'Switch to Current' feature now switches all windows which have this option enabled.\n\n|cFFFFFF00-|r The message telling to use '/details reinstall' now only shows if a problem happen during the addon load process.\n\n|cFFFFFF00-|r Segments Saved option now can be set to 25, up from 5.\n\n|cFFFFFF00-|r Attempt to fix the bug with the monk spell 'Storm, Earth, and Fire'.\n\n|cFFFFFF00-|r Fixed 'Icon Pick' panel.\n\n|cFFFFFF00-|r Fixed bug when reporting friendly fire through player detail window.\n\n|cFFFFFF00-|r Fixed bug with report window where sometimes it was reporting on a wrong channel.\n\n|cFFFFFF00v3.7.1 (|cFFFFCC00Jan 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its levels adjusted for WoD.\n\n|cFFFFFF00-|r Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': incoming heals now count shield amount on the player too.\n\n|cFFFFFF00-|r Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.\n\n|cFFFFFF00-|r Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).\n\n|cFFFFFF00-|r Added option panel for Raid Check plugin.\n\n|cFFFFFF00-|r Added key bindings for open a window, close a window and select a bookmark.\n\n|cFFFFFF00-|r Added 'CTRL + RightClick' closes a window.\n\n|cFFFFFF00-|r Fixed wallpaper transparency after releasing the window from a stretch.|cFFFFFF00-|r Fixed few issues when using class text colors.\n\n|cFFFFFF00-|r Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.\n\n|cFFFFFF00-|r Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.\n\n|cFFFFFF00-|r Fixed auto erase poping up when the player enters on its garrison.\n\n|cFFFFFF00-|r Fixed combat on garrison training dummies which was being marked as Trash Segment.\n\n|cFFFFFF00-|r Fixed command /details disable, wasn't disabling the capture of cooldowns.\n\n|cFFFFFF00-|r Fixed a problem with fast dps/hps when the window is in a empty segment.\n\n|cFFFFFF00-|r Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.\n\n|cFFFFFF00-|r Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.\n\n|cFFFFFF00-|r Fixed bar animations when 'Sort Direction' is set to bottom.\n\n|cFFFFFF00-|r Fixed the spam 'you are not in a guild' when checking for new versions.\n\n|cFFFFFF00-|r Fixed translations for Auto Hide Settings bracket under options panel.\n\n|cFFFFFF00-|r Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.\n\n|cFFFFFF00v3.6.14b (|cFFFFCC00Jan 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n|cFFFFFF00-|r Added overkill on death's tooltip.\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n|cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n|cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n|cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n|cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n|cFFFFFF00v3.6.8 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Fast (i mean, really fast) Dps/Hps update rate, its option is under Rows: Advanced -> Fast Updates.\n\n|cFFFFFF00-|r Created a custom spell for Mirror Image's Fireball and Frostbolt, with that Player Detail window distinguishes spells from the player and images.\n\n|cFFFFFF00-|r Added new skin: 'ElvUI Style II'." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/classes/classe_instancia.lua b/classes/classe_instancia.lua index b51581d4..53229231 100644 --- a/classes/classe_instancia.lua +++ b/classes/classe_instancia.lua @@ -2392,6 +2392,14 @@ function _detalhes:ChangeIcon (icon) --print (debugstack()) + if (not self.hide_icon) then + if (skin.icon_on_top) then + self.baseframe.cabecalho.atributo_icon:SetParent (self.floatingframe) + else + self.baseframe.cabecalho.atributo_icon:SetParent (self.baseframe) + end + end + if (icon) then --> plugin chamou uma troca de icone diff --git a/core/windows.lua b/core/windows.lua index 7899f361..6bd928f6 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -455,11 +455,14 @@ local novo_x = self.posicao[self.mostrando].x*_UIscale/_scale local novo_y = self.posicao[self.mostrando].y*_UIscale/_scale - if (pre_defined) then --> overwrite + if (pre_defined and pre_defined.x) then --> overwrite novo_x = pre_defined.x*_UIscale/_scale novo_y = pre_defined.y*_UIscale/_scale self.posicao[self.mostrando].w = pre_defined.largura self.posicao[self.mostrando].h = pre_defined.altura + + elseif (pre_defined and not pre_defined.x) then + _detalhes:Msg ("invalid pre_defined table for resize, please rezise the window manually.") end self.baseframe:SetWidth (self.posicao[self.mostrando].w) diff --git a/framework/framework.lua b/framework/framework.lua index 39df189b..505f36a4 100644 --- a/framework/framework.lua +++ b/framework/framework.lua @@ -223,7 +223,12 @@ function gump:BuildMenu (parent, menu, x_offset, y_offset, height) end - cur_y = cur_y - 20 + if (widget_table.spacement) then + cur_y = cur_y - 30 + else + cur_y = cur_y - 20 + end + if (cur_y > height) then cur_y = y_offset cur_x = max_x diff --git a/functions/skins.lua b/functions/skins.lua index e2039d3f..fed2eafa 100644 --- a/functions/skins.lua +++ b/functions/skins.lua @@ -249,6 +249,30 @@ local _ } }) + local Minimalistic_Shadow = function() + + local instance = _G.DetailsOptionsWindow and _G.DetailsOptionsWindow.instance + + if (instance) then + instance:ToolbarMenuSetButtonsOptions (nil, true) + instance:AttributeMenu (nil, nil, nil, nil, nil, nil, nil, true) + instance:AttributeMenu (nil, nil, 3) + + if (_detalhes.options_group_edit) then + for _, this_instance in ipairs (instance:GetInstanceGroup()) do + if (this_instance ~= instance) then + this_instance:ToolbarMenuSetButtonsOptions (nil, true) + this_instance:AttributeMenu (nil, nil, nil, nil, nil, nil, nil, true) + this_instance:AttributeMenu (nil, nil, 3) + end + end + end + + _detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance) + end + + end + _detalhes:InstallSkin ("Minimalistic", { file = [[Interface\AddOns\Details\images\skins\classic_skin_v1]], author = "Details!", @@ -272,6 +296,9 @@ local _ left_corner_anchor_bottom = {-107, 0}, right_corner_anchor_bottom = {96, 0}, + icon_on_top = true, + icon_ignore_alpha = true, + --overwrites instance_cprops = { ["menu_icons_size"] = 0.850000023841858, @@ -445,7 +472,7 @@ local _ ["texture"] = "Details BarBorder 2", }, }, - ["bg_b"] = 0.0941176470588235, + ["bg_b"] = 0.0941176470588235, }, callback = function (skin, instance, just_updating) @@ -453,6 +480,7 @@ local _ end, skin_options = { + {spacement = true, type = "button", name = "Shadowy Title Bar", func = Minimalistic_Shadow, desc = "Adds shadow on title bar components."}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP"], func = reset_tooltip, desc = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3"], func = set_tooltip_elvui2, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3_DESC"]}, } @@ -482,6 +510,9 @@ local _ left_corner_anchor_bottom = {-107, 0}, right_corner_anchor_bottom = {96, 0}, + icon_on_top = true, + icon_ignore_alpha = true, + --overwrites instance_cprops = { ["color"] = { @@ -669,25 +700,12 @@ local _ }) - local dark_serenity = function() - local instance = _G.DetailsOptionsWindow.instance - if (instance) then - --> black color - instance:InstanceColor (0, 0, 0, 1) - --> flip wallpaper - local wtexc = instance.wallpaper.texcoord - wtexc[1], wtexc[2], wtexc[3], wtexc[4] = 0.04800000, 0.29800001, 0.75599998, 0.63099998 - --> reload skin - instance:ChangeSkin() - end - end - _detalhes:InstallSkin ("Serenity", { file = [[Interface\AddOns\Details\images\skins\flat_skin]], author = "Details!", version = "1.0", site = "unknown", - desc = "White with a gradient wallpaper, this skin fits on almost all interfaces.\n\nFor ElvUI interfaces, change the window color to black to get an compatible visual.", + desc = "Light blue, this skin fits on almost all interfaces.\n\nFor ElvUI interfaces, change the window color to black to get an compatible visual.", micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"}, @@ -705,6 +723,9 @@ local _ icon_point_anchor_bottom = {-37, 12}, left_corner_anchor_bottom = {-107, 0}, right_corner_anchor_bottom = {96, 0}, + + icon_on_top = true, + icon_ignore_alpha = true, instance_cprops = { ["show_statusbar"] = false, @@ -888,7 +909,6 @@ local _ skin_options = { {type = "button", name = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP"], func = reset_tooltip, desc = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3"], func = set_tooltip_elvui2, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3_DESC"]}, - {type = "button", name = "Serenity Dark Side", func = dark_serenity, desc = "Flip the colors showing the dark side of Serenity."}, } }) @@ -913,7 +933,7 @@ local _ instance2:ChangeSkin (instance1.skin) end - if (instance3) then + if (instance3 and instance3:IsEnabled() and instance3.baseframe) then instance3:ShutDown() end @@ -1001,6 +1021,8 @@ local _ control_script_on_start = nil, control_script = nil, + icon_ignore_alpha = true, + --instance overwrites --[[ when a skin is selected, all customized properties of the window is reseted and then the overwrites are applied]] --[[ for the complete cprop list see the file classe_instancia_include.lua]] @@ -1210,7 +1232,7 @@ local _ }, skin_options = { - {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]}, + {spacement = true, type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP"], func = reset_tooltip, desc = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3"], func = set_tooltip_elvui2, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3_DESC"]}, } @@ -1380,6 +1402,10 @@ local _ --instance overwrites --[[ when a skin is selected, all customized properties of the window is reseted and then the overwrites are applied]] --[[ for the complete cprop list see the file classe_instancia_include.lua]] + + icon_on_top = true, + icon_ignore_alpha = true, + instance_cprops = { ["menu_icons_size"] = 0.899999976158142, ["color"] = { @@ -1573,7 +1599,7 @@ local _ }, skin_options = { - {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]}, + {spacement = true, type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON2"], func = set_tooltip_elvui1, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON2_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3"], func = set_tooltip_elvui2, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3_DESC"]}, } @@ -1617,6 +1643,10 @@ local _ --instance overwrites --[[ when a skin is selected, all customized properties of the window is reseted and then the overwrites are applied]] --[[ for the complete cprop list see the file classe_instancia_include.lua]] + + icon_on_top = true, + icon_ignore_alpha = true, + instance_cprops = { ["show_statusbar"] = false, ["color"] = {1,1,1,1}, @@ -1741,7 +1771,7 @@ local _ }, skin_options = { - {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]}, + {spacement = true, type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON2"], func = set_tooltip_elvui1, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON2_DESC"]}, {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3"], func = set_tooltip_elvui2, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3_DESC"]}, } diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index fec75313..60bb8be6 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -377,6 +377,7 @@ local function OnEnterMainWindow (instancia, self) --> snaps for _, instancia_id in _pairs (instancia.snap) do if (instancia_id) then + instancia.break_snap_button:Show() instancia.break_snap_button:SetAlpha (1) break end @@ -2793,8 +2794,13 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) anti_menu_overlap:SetFrameStrata ("DIALOG") anti_menu_overlap:EnableMouse (true) anti_menu_overlap:Hide() - --anti_menu_overlap:SetBackdrop (gump_fundo_backdrop) + --anti_menu_overlap:SetBackdrop (gump_fundo_backdrop) --debug baseframe.anti_menu_overlap = anti_menu_overlap + + --> floating frame is an anchor for widgets which should be overlaying the window + local floatingframe = CreateFrame ("frame", "DetailsInstance"..ID.."BorderHolder", baseframe) + floatingframe:SetFrameLevel (baseframe:GetFrameLevel()+7) + instancia.floatingframe = floatingframe -- scroll bar ----------------------------------------------------------------------------------------------------------------------------------------------- --> create the scrollbar, almost not used. @@ -3040,9 +3046,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) -- left and right side bars ------------------------------------------------------------------------------------------------------------------------------------------------------------ -- ~barra ~bordas ~border - local floatingframe = CreateFrame ("frame", "DetailsInstance"..ID.."BorderHolder", baseframe) - floatingframe:SetFrameLevel (baseframe:GetFrameLevel()+7) - instancia.floatingframe = floatingframe + --> left baseframe.barra_esquerda = floatingframe:CreateTexture (nil, "artwork") baseframe.barra_esquerda:SetTexture (DEFAULT_SKIN) @@ -3070,7 +3074,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) -- break snap button ---------------------------------------------------------------------------------------------------------------------------------------------------------- - instancia.break_snap_button = CreateFrame ("button", "DetailsBreakSnapButton" .. ID, baseframe.cabecalho.fechar) + instancia.break_snap_button = CreateFrame ("button", "DetailsBreakSnapButton" .. ID, floatingframe) instancia.break_snap_button:SetPoint ("bottom", baseframe.resize_direita, "top", -1, 0) instancia.break_snap_button:SetFrameLevel (baseframe:GetFrameLevel() + 5) instancia.break_snap_button:SetSize (13, 13) @@ -3104,7 +3108,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) -- side bars highlights ------------------------------------------------------------------------------------------------------------------------------------------------------------ --> top - local fcima = CreateFrame ("frame", "DetailsTopSideBarHighlight" .. instancia.meu_id, baseframe.cabecalho.fechar) + local fcima = CreateFrame ("frame", "DetailsTopSideBarHighlight" .. instancia.meu_id, floatingframe) gump:CreateFlashAnimation (fcima) fcima:Hide() @@ -3118,7 +3122,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) instancia.h_cima = fcima --> bottom - local fbaixo = CreateFrame ("frame", "DetailsBottomSideBarHighlight" .. instancia.meu_id, baseframe.cabecalho.fechar) + local fbaixo = CreateFrame ("frame", "DetailsBottomSideBarHighlight" .. instancia.meu_id, floatingframe) gump:CreateFlashAnimation (fbaixo) fbaixo:Hide() @@ -3132,7 +3136,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) instancia.h_baixo = fbaixo --> left - local fesquerda = CreateFrame ("frame", "DetailsLeftSideBarHighlight" .. instancia.meu_id, baseframe.cabecalho.fechar) + local fesquerda = CreateFrame ("frame", "DetailsLeftSideBarHighlight" .. instancia.meu_id, floatingframe) gump:CreateFlashAnimation (fesquerda) fesquerda:Hide() @@ -3146,7 +3150,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) instancia.h_esquerda = fesquerda --> right - local fdireita = CreateFrame ("frame", "DetailsRightSideBarHighlight" .. instancia.meu_id, baseframe.cabecalho.fechar) + local fdireita = CreateFrame ("frame", "DetailsRightSideBarHighlight" .. instancia.meu_id, floatingframe) gump:CreateFlashAnimation (fdireita) fdireita:Hide() @@ -4218,7 +4222,12 @@ end function _detalhes:InstanceAlpha (alpha) self.baseframe.cabecalho.ball_r:SetAlpha (alpha) self.baseframe.cabecalho.ball:SetAlpha (alpha) - self.baseframe.cabecalho.atributo_icon:SetAlpha (alpha) + + local skin = _detalhes.skins [self.skin] + if (not skin.icon_ignore_alpha) then + self.baseframe.cabecalho.atributo_icon:SetAlpha (alpha) + end + self.baseframe.cabecalho.emenda:SetAlpha (alpha) self.baseframe.cabecalho.top_bg:SetAlpha (alpha) self.baseframe.barra_esquerda:SetAlpha (alpha) @@ -4269,7 +4278,9 @@ function _detalhes:InstanceColor (red, green, blue, alpha, no_save, change_statu self.baseframe.cabecalho.ball:SetVertexColor (red, green, blue) self.baseframe.cabecalho.ball:SetAlpha (alpha) - self.baseframe.cabecalho.atributo_icon:SetAlpha (alpha) + if (not skin.icon_ignore_alpha) then + self.baseframe.cabecalho.atributo_icon:SetAlpha (alpha) + end self.baseframe.cabecalho.emenda:SetVertexColor (red, green, blue) self.baseframe.cabecalho.emenda:SetAlpha (alpha) @@ -4361,7 +4372,7 @@ function gump:CriaRodape (baseframe, instancia) baseframe.rodape = {} --> esquerdo - baseframe.rodape.esquerdo = baseframe.cabecalho.fechar:CreateTexture (nil, "overlay") + baseframe.rodape.esquerdo = instancia.floatingframe:CreateTexture (nil, "overlay") baseframe.rodape.esquerdo:SetPoint ("topright", baseframe, "bottomleft", 16, 0) baseframe.rodape.esquerdo:SetTexture (DEFAULT_SKIN) baseframe.rodape.esquerdo:SetTexCoord (unpack (COORDS_PIN_LEFT)) @@ -4369,7 +4380,7 @@ function gump:CriaRodape (baseframe, instancia) baseframe.rodape.esquerdo:SetHeight (32) --> direito - baseframe.rodape.direita = baseframe.cabecalho.fechar:CreateTexture (nil, "overlay") + baseframe.rodape.direita = instancia.floatingframe:CreateTexture (nil, "overlay") baseframe.rodape.direita:SetPoint ("topleft", baseframe, "bottomright", -16, 0) baseframe.rodape.direita:SetTexture (DEFAULT_SKIN) baseframe.rodape.direita:SetTexCoord (unpack (COORDS_PIN_RIGHT)) @@ -4398,8 +4409,8 @@ function gump:CriaRodape (baseframe, instancia) baseframe.rodape.StatusBarCenterAnchor = StatusBarCenterAnchor --> display frame - baseframe.statusbar = CreateFrame ("frame", "DetailsStatusBar" .. instancia.meu_id, baseframe.cabecalho.fechar) - baseframe.statusbar:SetFrameLevel (baseframe.cabecalho.fechar:GetFrameLevel()+2) + baseframe.statusbar = CreateFrame ("frame", "DetailsStatusBar" .. instancia.meu_id, instancia.floatingframe) + baseframe.statusbar:SetFrameLevel (instancia.floatingframe:GetFrameLevel()+2) baseframe.statusbar:SetPoint ("left", baseframe.rodape.esquerdo, "right", -13, 10) baseframe.statusbar:SetPoint ("right", baseframe.rodape.direita, "left", 13, 10) baseframe.statusbar:SetHeight (14) @@ -6377,6 +6388,14 @@ function _detalhes:HideMainIcon (value) end + local skin = _detalhes.skins [self.skin] + + if (skin.icon_on_top) then + self.baseframe.cabecalho.atributo_icon:SetParent (self.floatingframe) + else + self.baseframe.cabecalho.atributo_icon:SetParent (self.baseframe) + end + else self.hide_icon = false gump:Fade (self.baseframe.cabecalho.atributo_icon, 0) @@ -6797,14 +6816,14 @@ function gump:CriaCabecalho (baseframe, instancia) baseframe.cabecalho.fechar:SetScript ("OnClick", close_button_onclick) --> bola do canto esquedo superior --> primeiro criar a armação para apoiar as texturas - baseframe.cabecalho.ball_point = baseframe.cabecalho.fechar:CreateTexture (nil, "overlay") + baseframe.cabecalho.ball_point = instancia.floatingframe:CreateTexture (nil, "overlay") baseframe.cabecalho.ball_point:SetPoint ("bottomleft", baseframe, "topleft", -37, 0) baseframe.cabecalho.ball_point:SetWidth (64) baseframe.cabecalho.ball_point:SetHeight (32) --> icone do atributo --baseframe.cabecalho.atributo_icon = _detalhes.listener:CreateTexture (nil, "artwork") - baseframe.cabecalho.atributo_icon = baseframe:CreateTexture (nil, "background") + baseframe.cabecalho.atributo_icon = baseframe:CreateTexture ("DetailsAttributeIcon" .. instancia.meu_id, "background") local icon_anchor = _detalhes.skins ["WoW Interface"].icon_anchor_main baseframe.cabecalho.atributo_icon:SetPoint ("topright", baseframe.cabecalho.ball_point, "topright", icon_anchor[1], icon_anchor[2]) baseframe.cabecalho.atributo_icon:SetTexture (DEFAULT_SKIN) diff --git a/gumps/switch.lua b/gumps/switch.lua index e821d057..046c5d44 100644 --- a/gumps/switch.lua +++ b/gumps/switch.lua @@ -108,7 +108,7 @@ do window_color:SetPoint ("bottomright", frame, "topright", -3, 2) local window_color_texture = gump:CreateImage (window_color, [[Interface\AddOns\Details\images\icons]], 14, 14, "artwork", {434/512, 466/512, 277/512, 307/512}) - window_color_texture:SetAlpha (0.25) + window_color_texture:SetAlpha (0.35) window_color_texture:SetAllPoints() window_color:SetHook ("OnEnter", function() @@ -121,7 +121,7 @@ do GameCooltip:Show() end) window_color:SetHook ("OnLeave", function() - window_color_texture:SetAlpha (0.25) + window_color_texture:SetAlpha (0.35) GameCooltip:Hide() end) @@ -135,7 +135,7 @@ do options_button:SetPoint ("right", window_color, "left", -2, 0) local options_button_texture = gump:CreateImage (options_button, [[Interface\AddOns\Details\images\modo_icones]], 14, 14, "artwork", {0.5, 0.625, 0, 1}) - options_button_texture:SetAlpha (0.25) + options_button_texture:SetAlpha (0.35) options_button_texture:SetAllPoints() options_button:SetHook ("OnEnter", function() @@ -148,7 +148,7 @@ do GameCooltip:Show() end) options_button:SetHook ("OnLeave", function() - options_button_texture:SetAlpha (0.25) + options_button_texture:SetAlpha (0.35) GameCooltip:Hide() end) diff --git a/images/skins/classic_skin.tga b/images/skins/classic_skin.tga index 69240137..a2d59809 100644 Binary files a/images/skins/classic_skin.tga and b/images/skins/classic_skin.tga differ diff --git a/images/skins/classic_skin_v1.tga b/images/skins/classic_skin_v1.tga index c43fa5e6..5e21d674 100644 Binary files a/images/skins/classic_skin_v1.tga and b/images/skins/classic_skin_v1.tga differ diff --git a/images/skins/elvui.tga b/images/skins/elvui.tga index 54626b61..6f1cddd3 100644 Binary files a/images/skins/elvui.tga and b/images/skins/elvui.tga differ diff --git a/images/skins/elvui_opaque.tga b/images/skins/elvui_opaque.tga index 49f5080a..a0a13507 100644 Binary files a/images/skins/elvui_opaque.tga and b/images/skins/elvui_opaque.tga differ diff --git a/images/skins/flat_skin.tga b/images/skins/flat_skin.tga index c5f7d69d..5ab7d9e1 100644 Binary files a/images/skins/flat_skin.tga and b/images/skins/flat_skin.tga differ diff --git a/images/skins/simplygray_skin.tga b/images/skins/simplygray_skin.tga index dae05a42..d5932ce8 100644 Binary files a/images/skins/simplygray_skin.tga and b/images/skins/simplygray_skin.tga differ