Skip to content

Fixed color settings #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laytya wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed color settings #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f624ad7
Fixed color settings
laytya Nov 5, 2022
2cabb99
Update GuideTable.lua
laytya Nov 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Frame_SettingsFrame.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ function objSettingsFrame:new(fParent, tTexture, oSettings)
na = 1 - OpacitySliderFrame:GetValue()
end
r1, g1, b1, a1 = nr, ng, nb, na
btn.artwork:SetVertexColor(r1, g1, b1, a1)
--btn.background:SetVertexColor(r1, g1, b1, a1)
if sText == "VG_MainFrame" then
frame:SetBackdropColor(r1, g1, b1, a1)
Expand All @@ -269,23 +269,24 @@ function objSettingsFrame:new(fParent, tTexture, oSettings)
a1 = .99
frame:SetTextColor(r1, g1, b1, a1)
--VGuide.db.char.UIoptions.StepFrameTextColor = {
tUI.ScrollFrameColor = {
tUI.StepFrameTextColor = {
nR = r1, nG = g1, nB = b1, nA = a1,
}
oSettings:SetSettingsUI(tUI)
elseif sText == "VG_MainFrame_ScrollFrameLabels" then
local frame = getglobal("VG_MainFrame_ScrollFrameChild")
local shEH = frame.Entries
a1 = .71
a1 = .99
for _,v in pairs(shEH) do
v:SetTextColor(r1, g1, b1, a1)
end
--VGuide.db.char.UIoptions.ScrollFrameTextColor = {
tUI.ScrollFrameColor = {
tUI.ScrollFrameTextColor = {
nR = r1, nG = g1, nB = b1, nA = a1,
}
oSettings:SetSettingsUI(tUI)
end
btn.artwork:SetVertexColor(r1, g1, b1, a1)
end
ColorPickerFrame.cancelFunc = ColorPickerFrame.func
ColorPickerFrame.opacityFunc = ColorPickerFrame.func
Expand Down
4 changes: 2 additions & 2 deletions GuideTable.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function objGuideTable:new(oSettings)
{ "v", "40-41 Badlands", id = nil },
{ "v", "41-41 Swamp of Sorrows", id = nil },
{ "v", "41-42 Desolace", id = nil },
{ "v", "42-43 Stranglethron Vale", id = nil },
{ "v", "42-43 Stranglethorn Vale", id = nil },
{ "v", "43-43 Tanaris", id = nil },
{ "v", "43-45 Feralas", id = nil },
{ "v", "45-46 Uldaman", id = nil },
Expand Down Expand Up @@ -645,7 +645,7 @@ do
[4041] = { title = "40-41 Badlands" },
[4141] = { title = "41-41 Swamp of Sorrows" },
[4142] = { title = "41-42 Desolace" },
[4243] = { title = "42-43 Stranglethron Vale" },
[4243] = { title = "42-43 Stranglethorn Vale" },
[4343] = { title = "43-43 Tanaris" },
[4345] = { title = "43-45 Feralas" },
[4546] = { title = "45-46 Uldaman" },
Expand Down
2 changes: 1 addition & 1 deletion Settings.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function objSettings:new()
nR = .59,
nG = .59,
nB = .59,
nA = .71,
nA = .99,
},
},
CharInfo = {
Expand Down