- Fixed an issue when freeze text where getting out of instance space.
- Fixed an issue when resizing freeze text where not resizing too. - Added an extra parameter for Image Editor. - Added Archeology and Class Character Images for Instance backgrounds. - Fixen an issue when calling image editor throgh options panel where calling wrong instance.
This commit is contained in:
Tercio
parent
10246a41fb
commit
2be7a9f1f5
6 changed files with 72 additions and 7 deletions
|
|
@ -204,10 +204,13 @@ end
|
|||
|
||||
function combate:GetCombatTime()
|
||||
if (self.end_time) then
|
||||
--print ("tem end time")
|
||||
return self.end_time - self.start_time
|
||||
elseif (self.start_time and _detalhes.in_combat) then
|
||||
--print ("tem start time e esta em combate")
|
||||
return _tempo - self.start_time
|
||||
else
|
||||
--print ("retornando zero")
|
||||
return 0
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -925,8 +925,12 @@ function _detalhes:Freeze (instancia)
|
|||
gump:Fade (instancia, "in", nil, "barras")
|
||||
end
|
||||
|
||||
instancia.freeze_texto:Show()
|
||||
instancia.freeze_icon:Show()
|
||||
instancia.freeze_texto:Show()
|
||||
|
||||
local width = instancia:GetSize()
|
||||
instancia.freeze_texto:SetWidth (width-64)
|
||||
|
||||
instancia.freezed = true
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -323,6 +323,11 @@
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
if (self.freezed) then
|
||||
--> reajusta o freeze
|
||||
_detalhes:Freeze (self)
|
||||
end
|
||||
|
||||
-- -4 difere a precisão de quando a barra será adicionada ou apagada da barra
|
||||
self.baseframe.BoxBarrasAltura = self.baseframe:GetHeight()-4
|
||||
|
|
|
|||
|
|
@ -337,6 +337,8 @@ local g = _detalhes.gump
|
|||
end
|
||||
rightCoordTexture:Hide()
|
||||
leftCoordTexture:Hide()
|
||||
rightSlider:Hide()
|
||||
leftSlider:Hide()
|
||||
leftTexCoordButton:Disable()
|
||||
rightTexCoordButton:Disable()
|
||||
else
|
||||
|
|
@ -361,6 +363,8 @@ local g = _detalhes.gump
|
|||
end
|
||||
topCoordTexture:Hide()
|
||||
bottomCoordTexture:Hide()
|
||||
topSlider:Hide()
|
||||
bottomSlider:Hide()
|
||||
topTexCoordButton:Disable()
|
||||
bottomTexCoordButton:Disable()
|
||||
else
|
||||
|
|
@ -410,7 +414,7 @@ local g = _detalhes.gump
|
|||
coords [4] = bottomSlider.value/100
|
||||
end
|
||||
|
||||
return window.callback_func (edit_texture.width, edit_texture.height, {edit_texture:GetVertexColor()}, edit_texture:GetAlpha(), coords)
|
||||
return window.callback_func (edit_texture.width, edit_texture.height, {edit_texture:GetVertexColor()}, edit_texture:GetAlpha(), coords, window.extra_param)
|
||||
end
|
||||
|
||||
local acceptButton = g:NewButton (buttonsBackground, _, "$parentAcceptButton", _, 100, 20, accept, _, _, _, "DONE")
|
||||
|
|
@ -426,7 +430,7 @@ window:Hide()
|
|||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
local ttexcoord
|
||||
function g:ImageEditor (callback, texture, texcoord, colors)
|
||||
function g:ImageEditor (callback, texture, texcoord, colors, extraParam)
|
||||
|
||||
edit_texture:SetTexture (texture)
|
||||
|
||||
|
|
@ -442,6 +446,7 @@ window:Hide()
|
|||
|
||||
window:Show()
|
||||
window.callback_func = callback
|
||||
window.extra_param = extraParam
|
||||
buttonsBackground:Show()
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -256,12 +256,55 @@ function _detalhes:OpenOptionsWindow (instance)
|
|||
end
|
||||
|
||||
local subMenu = {
|
||||
|
||||
["ARCHEOLOGY"] = {
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-BookCompletedLeft]], label = "Book Wallpaper", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-BookCompletedLeft]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-BookItemLeft]], label = "Book Wallpaper 2", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-BookItemLeft]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-Race-DraeneiBIG]], label = "Draenei", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-Race-DraeneiBIG]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-Race-DwarfBIG]], label = "Dwarf", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-Race-DwarfBIG]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-Race-NightElfBIG]], label = "Night Elf", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-Race-NightElfBIG]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-Race-OrcBIG]], label = "Orc", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-Race-OrcBIG]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-Race-PandarenBIG]], label = "Pandaren", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-Race-PandarenBIG]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-Race-TrollBIG]], label = "Troll", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-Race-TrollBIG]], texcoord = nil},
|
||||
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-AncientShamanHeaddress]], label = "Ancient Shaman", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-AncientShamanHeaddress]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-BabyPterrodax]], label = "Baby Pterrodax", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-BabyPterrodax]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-ChaliceMountainKings]], label = "Chalice Mountain Kings", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-ChaliceMountainKings]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-ClockworkGnome]], label = "Clockwork Gnomes", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-ClockworkGnome]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-QueenAzsharaGown]], label = "Queen Azshara Gown", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-QueenAzsharaGown]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-QuilinStatue]], label = "Quilin Statue", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-QuilinStatue]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\Arch-TempRareSketch]], label = "Rare Sketch", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\Arch-TempRareSketch]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-ScepterofAzAqir]], label = "Scepter of Az Aqir", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-ScepterofAzAqir]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-ShriveledMonkeyPaw]], label = "Shriveled Monkey Paw", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-ShriveledMonkeyPaw]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-StaffofAmmunrae]], label = "Staff of Ammunrae", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-StaffofAmmunrae]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-TinyDinosaurSkeleton]], label = "Tiny Dinosaur", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-TinyDinosaurSkeleton]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-TyrandesFavoriteDoll]], label = "Tyrandes Favorite Doll", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-TyrandesFavoriteDoll]], texcoord = nil},
|
||||
{value = [[Interface\ARCHEOLOGY\ArchRare-ZinRokhDestroyer]], label = "ZinRokh Destroyer", onclick = onSelectSecTexture, icon = [[Interface\ARCHEOLOGY\ArchRare-ZinRokhDestroyer]], texcoord = nil},
|
||||
},
|
||||
|
||||
["DEATHKNIGHT"] = {
|
||||
{value = [[Interface\TALENTFRAME\bg-deathknight-blood]], label = "Blood", onclick = onSelectSecTexture, icon = [[Interface\ICONS\Spell_Deathknight_BloodPresence]], texcoord = nil},
|
||||
{value = [[Interface\TALENTFRAME\bg-deathknight-frost]], label = "Frost", onclick = onSelectSecTexture, icon = [[Interface\ICONS\Spell_Deathknight_FrostPresence]], texcoord = nil},
|
||||
{value = [[Interface\TALENTFRAME\bg-deathknight-unholy]], label = "Unholy", onclick = onSelectSecTexture, icon = [[Interface\ICONS\Spell_Deathknight_UnholyPresence]], texcoord = nil}
|
||||
},
|
||||
|
||||
["DRESSUP"] = {
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-BloodElf1]], label = "Blood Elf", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.5, 0.625, 0.75, 1}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-DeathKnight1]], label = "Death Knight", onclick = onSelectSecTexture, icon = _detalhes.class_icons_small, texcoord = _detalhes.class_coords ["DEATHKNIGHT"]},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Draenei1]], label = "Draenei", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.5, 0.625, 0.5, 0.75}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Dwarf1]], label = "Dwarf", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.125, 0.25, 0, 0.25}},
|
||||
{value = [[Interface\DRESSUPFRAME\DRESSUPBACKGROUND-GNOME1]], label = "Gnome", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.25, 0.375, 0, 0.25}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Goblin1]], label = "Goblin", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.625, 0.75, 0.75, 1}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Human1]], label = "Human", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0, 0.125, 0.75, 1}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-NightElf1]], label = "Night Elf", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.375, 0.5, 0, 0.25}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Orc1]], label = "Orc", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.375, 0.5, 0.25, 0.5}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Pandaren1]], label = "Pandaren", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.75, 0.875, 0.5, 0.75}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Tauren1]], label = "Tauren", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0, 0.125, 0.25, 0.5}},
|
||||
{value = [[Interface\DRESSUPFRAME\DRESSUPBACKGROUND-TROLL1]], label = "Troll", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.25, 0.375, 0.75, 1}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Scourge1]], label = "Undead", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.125, 0.25, 0.75, 1}},
|
||||
{value = [[Interface\DRESSUPFRAME\DressUpBackground-Worgen1]], label = "Worgen", onclick = onSelectSecTexture, icon = [[Interface\Glues\CHARACTERCREATE\UI-CHARACTERCREATE-RACES]], texcoord = {0.625, 0.75, 0, 0.25}},
|
||||
},
|
||||
|
||||
["DRUID"] = {
|
||||
{value = [[Interface\TALENTFRAME\bg-druid-bear]], label = "Guardian", onclick = onSelectSecTexture, icon = [[Interface\ICONS\ability_racial_bearform]], texcoord = nil},
|
||||
{value = [[Interface\TALENTFRAME\bg-druid-restoration]], label = "Restoration", onclick = onSelectSecTexture, icon = [[Interface\ICONS\spell_nature_healingtouch]], texcoord = nil},
|
||||
|
|
@ -332,7 +375,9 @@ function _detalhes:OpenOptionsWindow (instance)
|
|||
end
|
||||
|
||||
local backgroundTable = {
|
||||
{value = "ARCHEOLOGY", label = "Archeology", onclick = onSelectMainTexture, icon = [[Interface\ARCHEOLOGY\Arch-Icon-Marker]]},
|
||||
{value = "DEATHKNIGHT", label = "Death Knight", onclick = onSelectMainTexture, icon = _detalhes.class_icons_small, texcoord = _detalhes.class_coords ["DEATHKNIGHT"]},
|
||||
{value = "DRESSUP", label = "Class Background", onclick = onSelectMainTexture, icon = [[Interface\ICONS\INV_Chest_Cloth_17]]},
|
||||
{value = "DRUID", label = "Druid", onclick = onSelectMainTexture, icon = _detalhes.class_icons_small, texcoord = _detalhes.class_coords ["DRUID"]},
|
||||
{value = "HUNTER", label = "Hunter", onclick = onSelectMainTexture, icon = _detalhes.class_icons_small, texcoord = _detalhes.class_coords ["HUNTER"]},
|
||||
{value = "MAGE", label = "Mage", onclick = onSelectMainTexture, icon = _detalhes.class_icons_small, texcoord = _detalhes.class_coords ["MAGE"]},
|
||||
|
|
@ -390,11 +435,13 @@ function _detalhes:OpenOptionsWindow (instance)
|
|||
end
|
||||
|
||||
local callmeback = function (width, height, overlayColor, alpha, texCoords)
|
||||
instance:InstanceWallpaper (nil, nil, alpha, texCoords, width, height, overlayColor)
|
||||
local tinstance = _G ["DetailsOptionsWindow"].MyObject.instance
|
||||
tinstance:InstanceWallpaper (nil, nil, alpha, texCoords, width, height, overlayColor)
|
||||
end
|
||||
|
||||
local startImageEdit = function()
|
||||
g:ImageEditor (callmeback, instance.wallpaper.texture, instance.wallpaper.texcoord, instance.wallpaper.overlay)
|
||||
local tinstance = _G ["DetailsOptionsWindow"].MyObject.instance
|
||||
g:ImageEditor (callmeback, tinstance.wallpaper.texture, tinstance.wallpaper.texcoord, tinstance.wallpaper.overlay)
|
||||
end
|
||||
|
||||
g:NewLabel (window, _, "$parentAnchorLabel", "anchorLabel", "align")
|
||||
|
|
@ -557,7 +604,7 @@ function _detalhes:OpenOptionsWindow (instance)
|
|||
--
|
||||
GameCooltip:SetFixedParameter (_G.DetailsOptionsWindowLoadStyleButton, instance)
|
||||
|
||||
window.instance = instance
|
||||
_G.DetailsOptionsWindow.MyObject.instance = instance
|
||||
window:Show()
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1679,7 +1679,8 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
|
|||
instancia.freeze_icon:Hide()
|
||||
|
||||
instancia.freeze_texto = BaseFrame:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
instancia.freeze_texto:SetPoint ("left", instancia.freeze_icon, "right", 0, 0)
|
||||
instancia.freeze_texto:SetHeight (64)
|
||||
instancia.freeze_texto:SetPoint ("left", instancia.freeze_icon, "right", -18, 0)
|
||||
instancia.freeze_texto:SetTextColor (1, 1, 1)
|
||||
instancia.freeze_texto:SetText (Loc ["STRING_FREEZE"])
|
||||
instancia.freeze_texto:Hide()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue