This reverts e0895013. Two things were wrong with taking it.
**It was resolved by taking upstream's whole file.** `git checkout --theirs` on a
conflicted path takes that file's entire other side, not the conflicting hunk, so
the commit quietly cut 1454 lines out of this fork's own `OptionsFrame.xml`
(4586 → 3132) and replaced `ScriptLogFrame.xml` wholesale. That is what the 180
new test failures were: `BenillaKeyBindings_String` and `OptionsFrameSliders`
undefined, because the `<Script>` blocks defining them were gone.
**And the change itself is a regression here.** Its premise is that
`BenillaScrollBarTemplate`'s `OnValueChanged` is a faux-list handler every
instance has to override. In this fork it is not: our
`BenillaFauxScrollBar_OnValueChanged` (`ScrollTemplates.xml:33`) does the
faux-list `offset`/`updateFunc` step *and* `frame:SetVerticalScroll(value)` when
the parent is a ScrollFrame — a superset of upstream's
`BenillaScrollBar_OnValueChanged`. Swapping the template onto the plain handler
and deleting the faux one would take the faux-list path away from every bar built
from the template.
The earlier claim in e0895013's message — that
`BenillaFauxScrollBar_OnValueChanged` was "defined nowhere in the repo" — was
also wrong. It is defined at `ScrollTemplates.xml:33`. The grep behind that claim
ran against the conflicted working copy, where upstream's *non-conflicting*
deletion of the definition had already been applied, so only the call site showed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SgstFWtn1RxEJ5kVrpgYwn
174 lines
6.5 KiB
Rust
174 lines
6.5 KiB
Rust
//! `CreateFrame`'s fourth argument against real FrameXML templates, loaded the way the client
|
|
//! loads them: the addon idiom `CreateFrame("Button", "MyTab", UIParent, "TabButtonTemplate")`
|
|
//! then `getglobal("MyTab".."Text")`.
|
|
|
|
mod common;
|
|
|
|
use benilla_ui::script::UiScript;
|
|
|
|
/// The prefix of `benilla.toc`'s load order these templates need. `FauxScrollFrameTemplate` and
|
|
/// `TabButtonTemplate` are the stock ones, from `UIPanelTemplates.xml` on the player's chain.
|
|
const FILES: &[&str] = &[
|
|
"Interface\\FrameXML\\Fonts.xml",
|
|
// A guard, not a dependency: its whole body is `<Script file="FadingFrame.lua"/>`, which loads
|
|
// only if resolved against the document's own directory. It has no `inherits=` and its Lua
|
|
// has no file-scope statements, so it needs nothing before it.
|
|
"Interface\\FrameXML\\FadingFrame.xml",
|
|
r"Interface\FrameXML\MoneyFrame.lua",
|
|
r"Interface\FrameXML\MoneyFrame.xml",
|
|
r"Interface\FrameXML\UIParent.xml",
|
|
r"Interface\FrameXML\UIPanelTemplates.lua",
|
|
r"Interface\FrameXML\UIPanelTemplates.xml",
|
|
"Interface\\FrameXML\\GlobalStrings.lua",
|
|
"Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which StaticPopup.lua reads at file scope
|
|
"Interface\\FrameXML\\LocaleProperties.lua",
|
|
"Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
|
|
"ScrollTemplates.xml",
|
|
];
|
|
|
|
fn load_ui(script: &UiScript) {
|
|
for file in FILES {
|
|
common::load_ui(script, file);
|
|
}
|
|
}
|
|
|
|
/// `TabButtonTemplate` (`UIPanelTemplates.xml:303`) exercises every decoration pass at once; an
|
|
/// instance publishes its parts under its own name and nothing under the template's.
|
|
#[test]
|
|
fn a_real_template_reaches_an_addon_through_create_frame() {
|
|
let _data = benilla_formats::wow_data_or_skip!();
|
|
let mut s = UiScript::new().unwrap();
|
|
s.set_screen_size(1024.0, 768.0);
|
|
load_ui(&s);
|
|
// Clear what the UI load itself reported.
|
|
let _ = s.take_warnings();
|
|
let _ = s.take_errors();
|
|
|
|
s.run(
|
|
r#"ProbeTab = CreateFrame("Button", "BenillaTemplateProbeTab", UIParent, "TabButtonTemplate")"#,
|
|
)
|
|
.expect("the corpus idiom must not error");
|
|
|
|
// The authored `<Size>` is 115x32, but the `<OnLoad>` calls `PanelTemplates_TabResize(0)`
|
|
// (`UIPanelTemplates.xml:371`), fitting an empty tab to its end caps; the height is untouched.
|
|
let (w, h) = s
|
|
.eval::<(f32, f32)>("return ProbeTab:GetWidth(), ProbeTab:GetHeight()")
|
|
.unwrap();
|
|
assert_eq!(h, 32.0, "the template's own <Size> height");
|
|
let caps = s
|
|
.eval::<f32>("return 2 * BenillaTemplateProbeTabLeft:GetWidth()")
|
|
.unwrap();
|
|
// `caps` plus the empty label's one-unit floor (`FONTSTRING_MIN_SPAN`).
|
|
assert!(
|
|
w >= caps && w <= caps + 1.5,
|
|
"an unlabelled tab fits down to its two end caps: {w} vs {caps}"
|
|
);
|
|
assert_eq!(
|
|
s.eval::<String>("return ProbeTab:GetParent():GetName()")
|
|
.unwrap(),
|
|
"UIParent",
|
|
"the parent argument, not the template's idea of one"
|
|
);
|
|
|
|
// The part globals, named for the instance, as `UIPanelTemplates.lua:42` reads them.
|
|
for suffix in [
|
|
"Text", // <ButtonText name="$parentText">
|
|
"HighlightTexture", // <HighlightTexture name="$parentHighlightTexture">
|
|
"Left", // <Layers> slices
|
|
"Middle",
|
|
"Right",
|
|
"LeftDisabled",
|
|
] {
|
|
assert!(
|
|
s.eval::<bool>(&format!(
|
|
r#"return getglobal("BenillaTemplateProbeTab{suffix}") ~= nil"#
|
|
))
|
|
.unwrap(),
|
|
"BenillaTemplateProbeTab{suffix} must exist"
|
|
);
|
|
assert!(
|
|
s.eval::<bool>(&format!(
|
|
r#"return getglobal("TabButtonTemplate{suffix}") == nil"#
|
|
))
|
|
.unwrap(),
|
|
"nothing may be published under the TEMPLATE's name (TabButtonTemplate{suffix})"
|
|
);
|
|
}
|
|
|
|
// The label is a real FontString the addon can drive.
|
|
s.run(r#"getglobal("BenillaTemplateProbeTabText"):SetText("Hi")"#)
|
|
.unwrap();
|
|
assert_eq!(
|
|
s.eval::<String>(r#"return getglobal("BenillaTemplateProbeTabText"):GetText()"#)
|
|
.unwrap(),
|
|
"Hi"
|
|
);
|
|
|
|
// The stock template declares one handler, the `<OnLoad>`.
|
|
assert!(
|
|
s.eval::<bool>(r#"return ProbeTab:GetScript("OnLoad") ~= nil"#)
|
|
.unwrap(),
|
|
"the template's OnLoad is installed"
|
|
);
|
|
|
|
assert!(s.take_errors().is_empty());
|
|
assert_eq!(
|
|
s.take_warnings(),
|
|
Vec::<String>::new(),
|
|
"a template that resolves cleanly has nothing to report"
|
|
);
|
|
}
|
|
|
|
/// `FauxScrollFrameTemplate`, the addon corpus's most-instantiated template, runs
|
|
/// `ScrollFrame_OnLoad` (`UIPanelTemplates.lua:244`), which indexes
|
|
/// `<name>ScrollBarScrollDownButton` first: two levels of `$parent` through a runtime template.
|
|
#[test]
|
|
fn the_corpus_favourite_template_composes_parent_two_levels_deep() {
|
|
let _data = benilla_formats::wow_data_or_skip!();
|
|
let mut s = UiScript::new().unwrap();
|
|
s.set_screen_size(1024.0, 768.0);
|
|
load_ui(&s);
|
|
let _ = s.take_warnings();
|
|
let _ = s.take_errors();
|
|
|
|
s.run(
|
|
// The stock template is a `<ScrollFrame>` with a `<ScrollChild>`, and `framexml::merge`
|
|
// takes the overriding node's tag, so a "Frame" would drop the scroll-only parts.
|
|
r#"Scroller = CreateFrame("ScrollFrame", "BenillaTemplateProbeScroll", UIParent, "FauxScrollFrameTemplate")"#,
|
|
)
|
|
.expect("the corpus's most-used template must not error");
|
|
|
|
// `this.offset` is `ScrollFrame_OnLoad`'s last statement.
|
|
assert_eq!(
|
|
s.eval::<f32>("return Scroller.offset").unwrap(),
|
|
0.0,
|
|
"the template's OnLoad ran to its last line"
|
|
);
|
|
for suffix in [
|
|
"ScrollBar",
|
|
"ScrollBarScrollUpButton",
|
|
"ScrollBarScrollDownButton",
|
|
] {
|
|
assert!(
|
|
s.eval::<bool>(&format!(
|
|
r#"return getglobal("BenillaTemplateProbeScroll{suffix}") ~= nil"#
|
|
))
|
|
.unwrap(),
|
|
"BenillaTemplateProbeScroll{suffix} must exist"
|
|
);
|
|
}
|
|
assert_eq!(
|
|
s.eval::<String>("return BenillaTemplateProbeScrollScrollBar:GetParent():GetName()")
|
|
.unwrap(),
|
|
"BenillaTemplateProbeScroll"
|
|
);
|
|
assert!(
|
|
s.eval::<bool>(r#"return getglobal("FauxScrollFrameTemplateScrollBar") == nil"#)
|
|
.unwrap(),
|
|
"nothing may be published under the template's own name"
|
|
);
|
|
|
|
assert!(s.take_errors().is_empty());
|
|
assert_eq!(s.take_warnings(), Vec::<String>::new());
|
|
}
|