From 8d71209456c1d6ad1b6f93554b013f80dbe49a0b Mon Sep 17 00:00:00 2001 From: Gethe Date: Mon, 30 May 2022 17:00:52 -0500 Subject: [PATCH] [classic] Update interface options skin --- .../FrameXML/InterfaceOptionsPanels.lua | 25 +++++++++++-- .../Interface_TBC/FrameXML/UIParent.lua | 5 --- .../FrameXML/InterfaceOptionsPanels.lua | 37 +++++++------------ .../Interface_Vanilla/FrameXML/UIParent.lua | 5 --- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/Skin/Classic/Interface_TBC/FrameXML/InterfaceOptionsPanels.lua b/Skin/Classic/Interface_TBC/FrameXML/InterfaceOptionsPanels.lua index fb39b6ad..e0ed0912 100644 --- a/Skin/Classic/Interface_TBC/FrameXML/InterfaceOptionsPanels.lua +++ b/Skin/Classic/Interface_TBC/FrameXML/InterfaceOptionsPanels.lua @@ -173,9 +173,26 @@ function private.FrameXML.InterfaceOptionsPanels() local Accessibility = _G.InterfaceOptionsAccessibilityPanel Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.MovePad) Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelCinematicSubtitles) - Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.ColorblindMode) + --Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.OverrideFadeOut) + --Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelQuestTextContrast) + Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.SpeechToTextCheckbox) + Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelTextToSpeech) + Skin.UIPanelButtonTemplate(_G.InterfaceOptionsAccessibilityPanelConfigureTextToSpeech) + Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelRemoteTextToSpeech) + + Skin.UIDropDownMenuTemplate(Accessibility.RemoteTextToSpeechVoiceDropdown) + Skin.UIPanelButtonTemplate(Accessibility.RemoteTextToSpeechVoicePlaySample) + Skin.UIDropDownMenuTemplate(Accessibility.MotionSicknessDropdown) + Skin.UIDropDownMenuTemplate(Accessibility.ShakeIntensityDropdown) + Skin.UIDropDownMenuTemplate(Accessibility.CursorSizeDropdown) - local FilterExamples = Accessibility.ColorblindFilterExamples + ---------------- + -- Colorblind -- + ---------------- + local Colorblind = _G.InterfaceOptionsColorblindPanel + --Skin.InterfaceOptionsCheckButtonTemplate(Colorblind.ColorblindMode) + + local FilterExamples = private.hasAPI and Colorblind.ColorblindFilterExamples or Accessibility.ColorblindFilterExamples FilterExamples.Hostile:SetTexCoord(0.2, 0.8, 0.4, 0.6) FilterExamples.Hostile:SetPoint("BOTTOMLEFT", 9, 158) FilterExamples.Hostile:SetSize(103, 10) @@ -191,8 +208,8 @@ function private.FrameXML.InterfaceOptionsPanels() FilterExamples.Friendly:SetSize(103, 10) FilterExamples.FriendlyLabel:SetPoint("BOTTOMLEFT", FilterExamples.Friendly, "TOPLEFT", 1, 7) - Skin.UIDropDownMenuTemplate(Accessibility.ColorblindFilterDropDown) - Skin.OptionsSliderTemplate(_G.InterfaceOptionsAccessibilityPanelColorblindStrengthSlider) + Skin.UIDropDownMenuTemplate(Colorblind.ColorblindFilterDropDown) + Skin.OptionsSliderTemplate(_G.InterfaceOptionsColorblindPanelColorblindStrengthSlider) ------------- -- Section -- diff --git a/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua b/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua index 7d21bbe9..95e0d653 100644 --- a/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua +++ b/Skin/Classic/Interface_TBC/FrameXML/UIParent.lua @@ -27,10 +27,5 @@ end function private.FrameXML.UIParent() _G.hooksecurefunc("SetPortraitToTexture", Hook.SetPortraitToTexture) _G.hooksecurefunc("BuildIconArray", Hook.BuildIconArray) - - -- Blizzard doesn't create the chat bubbles in lua, so we're calling it here - if private.FrameXML.ChatBubbles then - private.FrameXML.ChatBubbles() - end end print("UIParent", private.FrameXML.UIParent) diff --git a/Skin/Classic/Interface_Vanilla/FrameXML/InterfaceOptionsPanels.lua b/Skin/Classic/Interface_Vanilla/FrameXML/InterfaceOptionsPanels.lua index b44bfa4e..6f82ebf3 100644 --- a/Skin/Classic/Interface_Vanilla/FrameXML/InterfaceOptionsPanels.lua +++ b/Skin/Classic/Interface_Vanilla/FrameXML/InterfaceOptionsPanels.lua @@ -169,22 +169,18 @@ function private.FrameXML.InterfaceOptionsPanels() local Accessibility = _G.InterfaceOptionsAccessibilityPanel Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.MovePad) Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelCinematicSubtitles) - if private.hasAPI then - --Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.OverrideFadeOut) - --Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelQuestTextContrast) - Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.SpeechToTextCheckbox) - Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelTextToSpeech) - Skin.UIPanelButtonTemplate(_G.InterfaceOptionsAccessibilityPanelConfigureTextToSpeech) - Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelRemoteTextToSpeech) - - Skin.UIDropDownMenuTemplate(Accessibility.RemoteTextToSpeechVoiceDropdown) - Skin.UIPanelButtonTemplate(Accessibility.RemoteTextToSpeechVoicePlaySample) - Skin.UIDropDownMenuTemplate(Accessibility.MotionSicknessDropdown) - Skin.UIDropDownMenuTemplate(Accessibility.ShakeIntensityDropdown) - Skin.UIDropDownMenuTemplate(Accessibility.CursorSizeDropdown) - else - Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.ColorblindMode) - end + --Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.OverrideFadeOut) + --Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelQuestTextContrast) + Skin.InterfaceOptionsCheckButtonTemplate(Accessibility.SpeechToTextCheckbox) + Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelTextToSpeech) + Skin.UIPanelButtonTemplate(_G.InterfaceOptionsAccessibilityPanelConfigureTextToSpeech) + Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsAccessibilityPanelRemoteTextToSpeech) + + Skin.UIDropDownMenuTemplate(Accessibility.RemoteTextToSpeechVoiceDropdown) + Skin.UIPanelButtonTemplate(Accessibility.RemoteTextToSpeechVoicePlaySample) + Skin.UIDropDownMenuTemplate(Accessibility.MotionSicknessDropdown) + Skin.UIDropDownMenuTemplate(Accessibility.ShakeIntensityDropdown) + Skin.UIDropDownMenuTemplate(Accessibility.CursorSizeDropdown) ---------------- -- Colorblind -- @@ -208,13 +204,8 @@ function private.FrameXML.InterfaceOptionsPanels() FilterExamples.Friendly:SetSize(103, 10) FilterExamples.FriendlyLabel:SetPoint("BOTTOMLEFT", FilterExamples.Friendly, "TOPLEFT", 1, 7) - if private.hasAPI then - Skin.UIDropDownMenuTemplate(Colorblind.ColorblindFilterDropDown) - Skin.OptionsSliderTemplate(_G.InterfaceOptionsColorblindPanelColorblindStrengthSlider) - else - Skin.UIDropDownMenuTemplate(Accessibility.ColorblindFilterDropDown) - Skin.OptionsSliderTemplate(_G.InterfaceOptionsAccessibilityPanelColorblindStrengthSlider) - end + Skin.UIDropDownMenuTemplate(Colorblind.ColorblindFilterDropDown) + Skin.OptionsSliderTemplate(_G.InterfaceOptionsColorblindPanelColorblindStrengthSlider) ------------- -- Section -- diff --git a/Skin/Classic/Interface_Vanilla/FrameXML/UIParent.lua b/Skin/Classic/Interface_Vanilla/FrameXML/UIParent.lua index 12ba1da6..3ec2b184 100644 --- a/Skin/Classic/Interface_Vanilla/FrameXML/UIParent.lua +++ b/Skin/Classic/Interface_Vanilla/FrameXML/UIParent.lua @@ -27,9 +27,4 @@ end function private.FrameXML.UIParent() _G.hooksecurefunc("SetPortraitToTexture", Hook.SetPortraitToTexture) _G.hooksecurefunc("BuildIconArray", Hook.BuildIconArray) - - -- Blizzard doesn't create the chat bubbles in lua, so we're calling it here - if private.FrameXML.ChatBubbles then - private.FrameXML.ChatBubbles() - end end