language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MenuBar: C++/Rust native menubar implementation

Browse source 
introduce a SetupMenuBar builtin function to ease C++/Rust lowering
This commit is contained in:
Olivier Goffart 2025-01-08 16:33:55 +01:00
parent f645492240
commit 6b4c822a4a
18 changed files with 248 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/compiler/generator/cpp.rs
View file

@ -3602,6 +3602,20 @@ fn compile_builtin_function_call(
BuiltinFunction::SupportsNativeMenuBar => {
format!("{}.supports_native_menu_bar()", access_window_field(ctx))
}
BuiltinFunction::SetupNativeMenuBar => {
let window = access_window_field(ctx);
let [entries, llr::Expression::PropertyReference(sub_menu), llr::Expression::PropertyReference(activated)] =
arguments
else {
panic!("internal error: incorrect arguments to SetupNativeMenuBar")
};
let entries = compile_expression(entries, ctx);
let sub_menu = access_member(sub_menu, ctx);
let activated = access_member(activated, ctx);
format!("{window}.setup_native_menu_bar(self,
[](auto &self, const slint::cbindgen_private::MenuEntry *parent){{ return parent ? {sub_menu}.call(*parent) : {entries}; }},
[](auto &self, const slint::cbindgen_private::MenuEntry &entry){{ {activated}.call(entry); }})")
}
BuiltinFunction::Use24HourFormat => {
format!("slint::cbindgen_private::slint_date_time_use_24_hour_format()")
}

39
internal/compiler/generator/rust.rs
View file

@ -2995,6 +2995,45 @@ fn compile_builtin_function_call(
let window_adapter_tokens = access_window_adapter_field(ctx);
quote!(sp::WindowInner::from_pub(#window_adapter_tokens.window()).supports_native_menu_bar())
}
BuiltinFunction::SetupNativeMenuBar => {
let window_adapter_tokens = access_window_adapter_field(ctx);
let [entries, Expression::PropertyReference(sub_menu), Expression::PropertyReference(activated)] =
arguments
else {
panic!("internal error: incorrect arguments to SetupNativeMenuBar")
};
let entries = compile_expression(entries, ctx);
let sub_menu = access_member(sub_menu, ctx).unwrap();
let activated = access_member(activated, ctx).unwrap();
let inner_component_id = self::inner_component_id(ctx.current_sub_component.unwrap());
quote! {
if sp::WindowInner::from_pub(#window_adapter_tokens.window()).supports_native_menu_bar() {
// May seem overkill to have an instance of the struct for each call, but there should only be one call per component anyway
struct MenuBarWrapper(sp::VWeakMapped<sp::ItemTreeVTable, #inner_component_id>);
const _ : () = {
use slint::private_unstable_api::re_exports::*;
MenuVTable_static!(static VT for MenuBarWrapper);
};
impl sp::Menu for MenuBarWrapper {
fn sub_menu(&self, parent: sp::Option<&sp::MenuEntry>, result: &mut sp::SharedVector<sp::MenuEntry>) {
let Some(self_rc) = self.0.upgrade() else { return };
let _self = self_rc.as_pin_ref();
let model = match parent {
None => #entries,
Some(parent) => #sub_menu.call(&(parent.clone(),))
};
*result = model.iter().map(|v| v.try_into().unwrap()).collect();
}
fn activate(&self, entry: &sp::MenuEntry) {
let Some(self_rc) = self.0.upgrade() else { return };
let _self = self_rc.as_pin_ref();
#activated.call(&(entry.clone(),))
}
}
sp::WindowInner::from_pub(#window_adapter_tokens.window()).setup_menubar(sp::VBox::new(MenuBarWrapper(_self.self_weak.get().unwrap().clone())));
}
}
}
BuiltinFunction::MonthDayCount => {
let (m, y) = (a.next().unwrap(), a.next().unwrap());
quote!(sp::month_day_count(#m as u32, #y as i32).unwrap_or(0))