diff --git a/crates/benilla-app/assets/ui/MacroFrame.xml b/crates/benilla-app/assets/ui/MacroFrame.xml deleted file mode 100644 index 91d6e608..00000000 --- a/crates/benilla-app/assets/ui/MacroFrame.xml +++ /dev/null @@ -1,972 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - self:RegisterForDrag("LeftButton") - BenillaMacroButton_OnClick(self) - PickupMacro(getglobal("BenillaMacroFrame").macroBase + self:GetID()) - - - - - - - BenillaMacroPopupButton_OnClick(self) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - self:SetChecked(nil) - PickupMacro(getglobal("BenillaMacroFrame").selectedMacro) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - self:SetBackdropBorderColor(TOOLTIP_DEFAULT_COLOR.r, TOOLTIP_DEFAULT_COLOR.g, TOOLTIP_DEFAULT_COLOR.b) - self:SetBackdropColor(TOOLTIP_DEFAULT_BACKGROUND_COLOR.r, TOOLTIP_DEFAULT_BACKGROUND_COLOR.g, TOOLTIP_DEFAULT_BACKGROUND_COLOR.b) - - - - - - - - - - - - - - - - - - - - - BenillaScrollBar_OnValueChanged(self, arg1) - - - - - - - - BenillaMacroFrameText_OnTextChanged(self) - self:ClearFocus() - - - - - BenillaMacroFrameScrollFrame_OnLoad(self) - - - - - - - - - - - - - - - - - - - - BenillaMacroFrame_OnLoad(self) - self:RegisterEvent("UPDATE_MACROS") - - BenillaMacroFrame_OnEvent(self, event) - - getglobal("BenillaMacroFrameTab2"):SetText(BenillaMacroFrame_TabTwoLabel()) - BenillaMacroFrame_OnShow() - UpdateMicroButtons() - - - BenillaMacroFrame_OnHide() - UpdateMicroButtons() - - BenillaScroll_OnMouseWheel(getglobal("BenillaMacroFrameScrollFrame"), arg1) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BenillaMacroPopupOkayButton_Update() - getglobal("BenillaMacroFrameSelectedMacroName"):SetText(self:GetText()) - - getglobal("BenillaMacroPopupFrame"):Hide() - - -- The ref's own spelling, and now literally ours: IsEnabled answers the - -- NUMBER 1 or 0 (button.rs, wow-re button-enabled-state.md). Plain - -- truthiness would be WRONG here — 0 is truthy in Lua. - if getglobal("BenillaMacroPopupOkayButton"):IsEnabled() ~= 0 then - BenillaMacroPopupOkayButton_OnClick() - end - - - - - - - - - - - - - - ScrollFrame_OnLoad() - self.updateFunc = BenillaMacroPopupFrame_Update - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BenillaMacroPopupFrame_OnShow(self) - BenillaMacroPopupFrame_OnHide(self) - BenillaFauxScrollFrame_OnMouseWheel(getglobal("BenillaMacroPopupScrollFrame"), arg1) - - - diff --git a/crates/benilla-app/assets/ui/OptionsFrame.xml b/crates/benilla-app/assets/ui/OptionsFrame.xml index 7f9c6376..0fb88a6d 100644 --- a/crates/benilla-app/assets/ui/OptionsFrame.xml +++ b/crates/benilla-app/assets/ui/OptionsFrame.xml @@ -655,6 +655,17 @@ .. "Below 100% trades sharpness for frame rate; above 100% is supersampling, which " .. "smooths edges at the cost of frame rate. Applies when you click Apply." + -- Enable Sound in Background (1847). An era row: 1.12 hardcodes the behaviour and has no + -- checkbox, so there is no OPTION_TOOLTIP_* to resolve and the BENILLA_ prefix applies + -- for the same reason Render Scale's does -- the reference's namespace stays the + -- reference's. The last line is not padding: mute is not pause on either client, and a + -- player who expects a paused fight to resume where it stopped is owed the difference. + BENILLA_TOOLTIP_BACKGROUND_SOUND = + "Keeps the game's sound playing while you are working in another window.\n\n" + .. "With this off, switching away silences the game and switching back restores it. " + .. "Sounds keep running while they are silenced, so a long one may have finished by " + .. "the time you return." + -- Display Mode (1650). 1.12's own OPTION_TOOLTIP_WINDOWED_MODE cannot ride this row: it -- is written for the checkbox it belonged to ("Check to play in a non-fullscreen -- window..."), and its second half describes a desktop-gamma consequence of an exclusive @@ -674,6 +685,7 @@ Audio = { "RowEnableAll", "RowMaster", "RowSound", "RowMusic", "RowAmbience", "RowEnableMusic", "RowEnableAmbience", "RowEnableErrorSpeech", + "RowBackgroundSound", }, Graphics = { "RowUiScale", "RowFarclip", "RowWorldDetail", @@ -2356,6 +2368,26 @@ self.soundQuirk = 1 + + + + + + + + OptionsRow_OnLoad(self, "Sound_EnableSoundWhenGameIsInBG", + "Enable Sound in Background", + "BENILLA_TOOLTIP_BACKGROUND_SOUND") + self.soundQuirk = 1 + +