Skip to content

Commit

Permalink
update:
Browse files Browse the repository at this point in the history
- finished new font template system
- fixed some minor issues

integrate:
- adding new unitframe layout (asphyxia5)

delete:
- removed new position template
  • Loading branch information
sinaris committed Sep 11, 2012
1 parent 2f31823 commit 46706d9
Show file tree
Hide file tree
Showing 34 changed files with 2,201 additions and 341 deletions.
12 changes: 0 additions & 12 deletions AsphyxiaUI/Core/Functions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ local S, C, L, G = unpack( Tukui )

S.ClassColor = RAID_CLASS_COLORS[S.myclass]

S.CreateFontString = function( normalfont )
if( normalfont ) then
return C["media"]["font"], 12, "THINOUTLINE"
else
if( S.client == "ruRU" ) then
return C["media"]["pixel_ru"], 10, "MONOCHROMEOUTLINE"
else
return C["media"]["asphyxia"], 10, "MONOCHROMEOUTLINE"
end
end
end

S.UTF = function( string, i, dots )
if( not string ) then return end

Expand Down
4 changes: 2 additions & 2 deletions AsphyxiaUI/Core/Install.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ AsphyxiaUIInstallFrameTitle:CreateShadow( "Default" )
AsphyxiaUIInstallFrameTitle:SetTemplate( "Transparent" )

local AsphyxiaUIInstallFrameTitleText = AsphyxiaUIInstallFrameTitle:CreateFontString( nil, "OVERLAY" )
AsphyxiaUIInstallFrameTitleText:SetFont( unpack( S.FontTemplate.ITFontString.BuildFont ) )
AsphyxiaUIInstallFrameTitleText:SetFont( unpack( S.FontTemplate.InstallationTitlte.BuildFont ) )
AsphyxiaUIInstallFrameTitleText:SetPoint( "CENTER", AsphyxiaUIInstallFrameTitle, 0, 0 )
AsphyxiaUIInstallFrameTitleText:SetText( L.Global_ADDON_TITLE .. " " .. S.GetAsphyxiaUIVersion )

Expand All @@ -71,7 +71,7 @@ AsphyxiaUIInstallFrameBottom:CreateShadow( "Default" )
AsphyxiaUIInstallFrameBottom:SetTemplate( "Transparent" )

local AsphyxiaUIInstallFrameBottomText = AsphyxiaUIInstallFrameBottom:CreateFontString( nil, "OVERLAY" )
AsphyxiaUIInstallFrameBottomText:SetFont( unpack( S.FontTemplate.ICFontString.BuildFont ) )
AsphyxiaUIInstallFrameBottomText:SetFont( unpack( S.FontTemplate.InstallationCopyright.BuildFont ) )
AsphyxiaUIInstallFrameBottomText:SetPoint( "CENTER", AsphyxiaUIInstallFrameBottom, 0, 0 )
AsphyxiaUIInstallFrameBottomText:SetText( L.Global_ADDON_COPYRIGHT )

Expand Down
12 changes: 6 additions & 6 deletions AsphyxiaUI/Core/PopUps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ S.CreatePopup["ASPHYXIAUI_DIFFERENT_ADDONSKINS_DETECTED"] = {
TukuiConfigPublic["addonskins"] = {}
end
TukuiConfigPublic["addonskins"]["embedright"] = ""
TukuiConfigPublic["addonskins"]["background"] = false,
TukuiConfigPublic["addonskins"]["combattoggle"] = false,
TukuiConfigPublic["addonskins"]["bigwigs"] = false,
TukuiConfigPublic["addonskins"]["dbm"] = false,
TukuiConfigPublic["addonskins"]["omen"] = false,
TukuiConfigPublic["addonskins"]["tinydps"] = false,
TukuiConfigPublic["addonskins"]["background"] = false
TukuiConfigPublic["addonskins"]["combattoggle"] = false
TukuiConfigPublic["addonskins"]["bigwigs"] = false
TukuiConfigPublic["addonskins"]["dbm"] = false
TukuiConfigPublic["addonskins"]["omen"] = false
TukuiConfigPublic["addonskins"]["tinydps"] = false
end
ReloadUI()
end,
Expand Down
152 changes: 84 additions & 68 deletions AsphyxiaUI/Core/System.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,32 @@ local DefaultFontTemplate = {
FontFamily = C["media"]["font"],
FontSize = 12,
FontStyle = "NONE",

StringFAnchor = "",
StringParent = "",
StringLAnchor = "",
StringYOffset = "",
StringXOffset = "",
}

local function CreateFontTemplate( FontFamily, FontSize, FontStyle, StringFAnchor, StringParent, StringLAnchor, StringYOffset, StringXOffset )
local function CreateFontTemplate( FontFamily, FontSize, FontStyle )
local BuildResultString = {
BuildFont = {
FontFamily or DefaultFontTemplate.FontFamily,
FontSize or DefaultFontTemplate.FontSize,
FontStyle or DefaultFontTemplate.FontStyle,
},

BuildStringValues = {
StringFAnchor or DefaultFontTemplate.StringFAnchor,
StringParent or DefaultFontTemplate.StringParent,
StringLAnchor or DefaultFontTemplate.StringLAnchor,
StringYOffset or DefaultFontTemplate.StringYOffset,
StringXOffset or DefaultFontTemplate.StringXOffset,
},
}
return BuildResultString
end

if( C["global"]["fonttemplate"] == "default" ) then
S.FontTemplate = {
-- Installation
ITFontString = CreateFontTemplate( C["media"]["font"], 14, "OUTLINE" ), -- title
ICFontString = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ), -- copyright
ButtonsDefault = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
ButtonsResetUIBtn = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
ButtonsReloadUIBtn = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

InstallationTitlte = CreateFontTemplate( C["media"]["font"], 14, "OUTLINE" ),
InstallationCopyright = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

-- Actionbars
ABHFontString = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ), -- Button HotKey Text
ABCFontString = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ), -- Button Count
ABMFontString = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ), -- Macro Text
ABCDFontString = CreateFontTemplate( C["media"]["font"], 20, "OUTLINE" ), -- Cooldown Text
ActionbarsHotKey = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
ActionbarsCount = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
ActionbarsMacro = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
ActionbarsCooldown = CreateFontTemplate( C["media"]["font"], 20, "OUTLINE" ),

BagsItemCount = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
BagsEditBox = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
Expand All @@ -71,8 +59,30 @@ if( C["global"]["fonttemplate"] == "default" ) then
DatabarsReputationName = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
DatabarsReputationTglBtn = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

-- Unitframes
DatatextPanels = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
DatatextPanelsTglBtn = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

MinimapCords = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
MinimapZone = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

NameplatesCount = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
NameplatesName = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
NameplatesHealth = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
NameplatesLevel = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

PanelsDefault = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

UFFontString = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
UnitframesHealth = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
UnitframesPower = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
UnitframesName = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
UnitframesCastbar = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
UnitframesDefault = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),

MoverDefault = CreateFontTemplate( C["media"]["uffont"], 12, nil ),

FAQTitle = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
FAQButtons = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
}
elseif( C["global"]["fonttemplate"] == "pixel" or C["global"]["fonttemplate"] == nil ) then
local PixelFont
Expand All @@ -84,52 +94,58 @@ elseif( C["global"]["fonttemplate"] == "pixel" or C["global"]["fonttemplate"] ==
end

S.FontTemplate = {
-- Installation
ITFontString = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ), -- title
ICFontString = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ), -- copyright

-- Actionbars
ABHFontString = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ), -- Button HotKey Text
ABCFontString = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ), -- Button Count
ABMFontString = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ), -- Macro Text
ABCDFontString = CreateFontTemplate( PixelFont, 20, "MONOCHROMEOUTLINE" ), -- Cooldown Text

-- Unitframes
UFFontString = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
}
end
ButtonsDefault = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
ButtonsResetUIBtn = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
ButtonsReloadUIBtn = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

------------------------------
-- Positions
------------------------------
S.SetFramePosition = {
["panels"] = {
["actionbars"] = {
["bar1"] = { "BOTTOM", UIParent, "BOTTOM", 0, 48 },
["splitleft"] = { "BOTTOMRIGHT", G.ActionBars.Bar1, "BOTTOMLEFT", -3, 0 },
["splitright"] = { "BOTTOMLEFT", G.ActionBars.Bar1, "BOTTOMRIGHT", 3, 0 },
["rightbar"] = { "BOTTOMRIGHT", G.Panels.RightChatBackground, "TOPRIGHT", 0, 3 },
["petbar"] = { "BOTTOM", AsphyxiaUIRightBar, "TOP", 0, 3 },
},
["chat"] = {
["leftbg"] = { "BOTTOMLEFT", UIParent, "BOTTOMLEFT", 2, 2 },
["rightbg"] = { "BOTTOMRIGHT", UIParent, "BOTTOMRIGHT", -2, 2 },
},
["datatext"] = {
["infoleft"] = { "BOTTOM", G.Panels.LeftChatBackground, "BOTTOM", 0, 5 },
["inforight"] = { "BOTTOM", G.Panels.RightChatBackground, "BOTTOM", 0, 5 },
},
},
["bags"] = {
["bank"] = { "BOTTOMLEFT", G.Panels.LeftChatBackground, "TOPLEFT", 0, 3 },
},
InstallationTitlte = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
InstallationCopyright = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

ActionbarsHotKey = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
ActionbarsCount = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
ActionbarsMacro = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
ActionbarsCooldown = CreateFontTemplate( PixelFont, 20, "MONOCHROMEOUTLINE" ),

BagsItemCount = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
BagsEditBox = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
BagsDetail = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
BagsGold = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

BuffsDuration = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
BuffsCount = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

ChatTabText = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

DatabarsPanels = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatabarsPanelsTglBtn = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatabarsCurrency = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatabarsCurrencyTglBtn = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatabarsReputationText = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatabarsReputationName = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatabarsReputationTglBtn = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

DatatextPanels = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
DatatextPanelsTglBtn = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

MinimapCords = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
MinimapZone = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

NameplatesCount = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
NameplatesName = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
NameplatesHealth = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
NameplatesLevel = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

PanelsDefault = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

UnitframesHealth = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
UnitframesPower = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
UnitframesName = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
UnitframesCastbar = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),
UnitframesDefault = CreateFontTemplate( PixelFont, 10, "MONOCHROMEOUTLINE" ),

MoverDefault = CreateFontTemplate( C["media"]["uffont"], 12, nil ),

["maps"] = {
["minimap"] = {},
},
["unitframes"] = {

FAQTitle = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
FAQButtons = CreateFontTemplate( C["media"]["font"], 12, "OUTLINE" ),
}
}
end
Binary file added AsphyxiaUI/Media/Textures/Glamour.tga
Binary file not shown.
8 changes: 4 additions & 4 deletions AsphyxiaUI/Modules/Actionbars/Buttons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ for i = 1, 6 do
Toggle[i]:SetAlpha( 1 )

Toggle[i].Text = Toggle[i]:CreateFontString( nil, "OVERLAY" )
Toggle[i].Text:SetFont( S.CreateFontString() )
Toggle[i].Text:Point( "CENTER", 2, 1 )
Toggle[i].Text:SetFont( unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
Toggle[i].Text:Point( "CENTER", 0, 0 )

if( i == 1 ) then
Toggle[i]:Size( AsphyxiaUIControlPanelActionbarBackground:GetWidth() - 8, 15 )
Expand Down Expand Up @@ -483,8 +483,8 @@ AsphyxiaUIExitVehicleButton:CreateOverlay( AsphyxiaUIExitVehicleButton )
AsphyxiaUIExitVehicleButton:RegisterForClicks( "AnyUp" )
AsphyxiaUIExitVehicleButton:SetScript( "OnClick", function() VehicleExit() end )

AsphyxiaUIExitVehicleButton.Text = S.SetFontString( AsphyxiaUIExitVehicleButton, S.CreateFontString() )
AsphyxiaUIExitVehicleButton.Text:Point( "CENTER", 1, 1 )
AsphyxiaUIExitVehicleButton.Text = S.SetFontString( AsphyxiaUIExitVehicleButton, unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
AsphyxiaUIExitVehicleButton.Text:Point( "CENTER", 0, 0 )
AsphyxiaUIExitVehicleButton.Text:SetText( S.RGBToHex( unpack( C["media"]["datatextcolor2"] ) ) .. EXIT )
RegisterStateDriver( AsphyxiaUIExitVehicleButton, "visibility", "[target=vehicle,exists] show;hide" )

Expand Down
10 changes: 5 additions & 5 deletions AsphyxiaUI/Modules/Actionbars/Style.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ local function ActionBarStyleButtons( self )

Count:ClearAllPoints()
Count:Point( "BOTTOMRIGHT", 0, 2 )
Count:SetFont( unpack( S.FontTemplate.ABCFontString.BuildFont ) )
Count:SetFont( unpack( S.FontTemplate.ActionbarsCount.BuildFont ) )

if( Btname and normal and C["actionbar"]["macro"] == true ) then
local query = GetActionText( action )
if( query ) then
local text = string.sub( query, 1, 5 )
Btname:SetText( text )
Btname:SetAlphaGradient( 0, Button:GetWidth() )
Btname:SetFont( unpack( S.FontTemplate.ABMFontString.BuildFont ) )
Btname:SetFont( unpack( S.FontTemplate.ActionbarsMacro.BuildFont ) )
end
end

HotKey:ClearAllPoints()
HotKey:Point( "TOPRIGHT", 0, -2 )
HotKey:SetFont( unpack( S.FontTemplate.ABHFontString.BuildFont ) )
HotKey:SetFont( unpack( S.FontTemplate.ActionbarsHotKey.BuildFont ) )
HotKey.ClearAllPoints = S.dummy
HotKey.SetPoint = S.dummy

Expand Down Expand Up @@ -70,5 +70,5 @@ end
hooksecurefunc( "ActionButton_ShowOverlayGlow", S.ShowHighlightActionButton )
hooksecurefunc( "ActionButton_HideOverlayGlow", S.HideHighlightActionButton )

S.SetDefaultActionButtonCooldownFont = select( 1, unpack( S.FontTemplate.ABCDFontString.BuildFont ) )
S.SetDefaultActionButtonCooldownFontSize = select( 2, unpack( S.FontTemplate.ABCDFontString.BuildFont ) )
S.SetDefaultActionButtonCooldownFont = select( 1, unpack( S.FontTemplate.ActionbarsCooldown.BuildFont ) )
S.SetDefaultActionButtonCooldownFontSize = select( 2, unpack( S.FontTemplate.ActionbarsCooldown.BuildFont ) )
2 changes: 1 addition & 1 deletion AsphyxiaUI/Modules/Bags/Bags.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ local function BagsUpdateBankPosition( self, value )
if( C["chat"]["background"] ~= true ) then
bag:SetPoint( "BOTTOMLEFT", G.Panels.DataTextLeft, "TOPLEFT", 0, 3 )
else
bag:SetPoint( unpack( S.SetFramePosition["bags"]["bank"] ) )
bag:SetPoint( "BOTTOMLEFT", G.Panels.LeftChatBackground, "TOPLEFT", 0, 3 )
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion AsphyxiaUI/Modules/Datatext/Datatext.lua
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ for _, data in pairs( HookDatatext ) do

if( frame and frame.Option ) then
DataTextPosition( frame, text, frame.Option )
text:SetFont( S.CreateFontString() )
text:SetFont( unpack( S.FontTemplate.DatatextPanels.BuildFont ) )
end
end

Expand Down
2 changes: 1 addition & 1 deletion AsphyxiaUI/Modules/Datatext/Layoutswitch.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ AsphyxiaUILayoutSwitchButton:SetScript( "OnLeave", function( self )
GameTooltip:Hide()
end )

AsphyxiaUILayoutSwitchButton.Text = S.SetFontString( AsphyxiaUILayoutSwitchButton, S.CreateFontString() )
AsphyxiaUILayoutSwitchButton.Text = S.SetFontString( AsphyxiaUILayoutSwitchButton, unpack( S.FontTemplate.ChatTabText.BuildFont ) )
AsphyxiaUILayoutSwitchButton.Text:Point( "RIGHT", AsphyxiaUILayoutSwitchButton, "RIGHT", -5, 1 )
AsphyxiaUILayoutSwitchButton.Text:SetText( S.RGBToHex( unpack( C["media"]["datatextcolor2"] ) ) .. "switch layout" )

Expand Down
12 changes: 6 additions & 6 deletions AsphyxiaUI/Modules/Extras/AddOnManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ AsphyxiaUIAddOnManagerHeader:Size( AsphyxiaUIAddOnManagerBackground:GetWidth(),
AsphyxiaUIAddOnManagerHeader:Point( "BOTTOM", AsphyxiaUIAddOnManagerBackground, "TOP", 0, 3 )
AsphyxiaUIAddOnManagerHeader:SetTemplate( "Transparent" )

AsphyxiaUIAddOnManagerHeader.Text = S.SetFontString( AsphyxiaUIAddOnManagerHeader, S.CreateFontString() )
AsphyxiaUIAddOnManagerHeader.Text = S.SetFontString( AsphyxiaUIAddOnManagerHeader, unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
AsphyxiaUIAddOnManagerHeader.Text:SetPoint( "LEFT", 5, 1 )
AsphyxiaUIAddOnManagerHeader.Text:SetText( ADDONS .. ": " .. S.myname )

Expand All @@ -48,8 +48,8 @@ AsphyxiaUIAddOnManagerSaveButton:Point( "BOTTOMLEFT", AsphyxiaUIAddOnManagerBack
AsphyxiaUIAddOnManagerSaveButton:SetTemplate( "Default" )
AsphyxiaUIAddOnManagerSaveButton:SetFrameStrata( "TOOLTIP" )

AsphyxiaUIAddOnManagerSaveButton.Text = S.SetFontString( AsphyxiaUIAddOnManagerSaveButton, S.CreateFontString() )
AsphyxiaUIAddOnManagerSaveButton.Text:Point( "CENTER", AsphyxiaUIAddOnManagerSaveButton, "CENTER", 0, 1 )
AsphyxiaUIAddOnManagerSaveButton.Text = S.SetFontString( AsphyxiaUIAddOnManagerSaveButton, unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
AsphyxiaUIAddOnManagerSaveButton.Text:Point( "CENTER", AsphyxiaUIAddOnManagerSaveButton, "CENTER", 0, 0 )
AsphyxiaUIAddOnManagerSaveButton.Text:SetText( SAVE_CHANGES )

AsphyxiaUIAddOnManagerSaveButton:SetScript( "OnClick", function() ReloadUI() end )
Expand All @@ -62,8 +62,8 @@ AsphyxiaUIAddOnManagerCloseButton:Point( "BOTTOMRIGHT", AsphyxiaUIAddOnManagerBa
AsphyxiaUIAddOnManagerCloseButton:SetTemplate( "Default" )
AsphyxiaUIAddOnManagerCloseButton:SetFrameStrata( "TOOLTIP" )

AsphyxiaUIAddOnManagerCloseButton.Text = S.SetFontString( AsphyxiaUIAddOnManagerCloseButton, S.CreateFontString() )
AsphyxiaUIAddOnManagerCloseButton.Text:Point( "CENTER", AsphyxiaUIAddOnManagerCloseButton, "CENTER", 0, 1 )
AsphyxiaUIAddOnManagerCloseButton.Text = S.SetFontString( AsphyxiaUIAddOnManagerCloseButton, unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
AsphyxiaUIAddOnManagerCloseButton.Text:Point( "CENTER", AsphyxiaUIAddOnManagerCloseButton, "CENTER", 0, 0 )
AsphyxiaUIAddOnManagerCloseButton.Text:SetText( CANCEL )

AsphyxiaUIAddOnManagerCloseButton:SetScript( "OnClick", function() AsphyxiaUIAddOnManagerBackground:Hide() end )
Expand Down Expand Up @@ -96,7 +96,7 @@ local function UpdateAddons()
else
button:Point( "TOP", oldb, "BOTTOM", 0, -7 )
end
local text = S.SetFontString( button, S.CreateFontString() )
local text = S.SetFontString( button, unpack( S.FontTemplate.ButtonsDefault.BuildFont ) )
text:Point( "LEFT", button, "RIGHT", 8, 0 )
text:SetText( title )

Expand Down
4 changes: 2 additions & 2 deletions AsphyxiaUI/Modules/Extras/ItemLevelOnGearAndSlots.lua
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ end

function makeText( frame )
local ilvlText = frame:CreateFontString( nil, "ARTWORK" )
isValid = ilvlText:SetFont( S.CreateFontString() )
isValid = ilvlText:SetFont( unpack( S.FontTemplate.PanelsDefault.BuildFont ) )

if( frame == CharacterHeadSlot or frame == CharacterNeckSlot or frame == CharacterShoulderSlot or frame == CharacterBackSlot or frame == CharacterChestSlot or frame == CharacterWristSlot or frame == CharacterShirtSlot or frame == CharacterTabardSlot ) then
ilvlText:SetPoint( "CENTER", frame, "CENTER", 42, 0 )
Expand Down Expand Up @@ -186,7 +186,7 @@ function makeDurability( frame, slot )
iDura:SetSize( 10, 10 )

local iDuraText = iDura:CreateFontString( nil, "ARTWORK" )
isValid = iDuraText:SetFont( S.CreateFontString() )
isValid = iDuraText:SetFont( unpack( S.FontTemplate.PanelsDefault.BuildFont ) )
iDuraText:SetPoint( "CENTER", iDura, "CENTER", 0, 0 )
iDura.text = iDuraText

Expand Down
Loading

0 comments on commit 46706d9

Please sign in to comment.