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

Menu: don't remove the title properties

Browse source 
Let further pass materialize them, and most likely remove them anyway.
That way, they can be properly set and read from the rest of the .slint
code.

Fixes #8080
This commit is contained in:
Olivier Goffart 2025-04-08 12:50:01 +02:00
parent 40e32a4c36
commit ca0c75bfe1
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
internal/compiler/passes/lower_menus.rs
View file

@ -632,16 +632,6 @@ fn generate_menu_entries(
assert!(borrow_mut.repeated.is_none());
let mut values = HashMap::<SmolStr, Expression>::new();
if !is_separator {
for prop in ["title"] {
if let Some(binding) = borrow_mut.bindings.remove(prop) {
values.insert(SmolStr::new_static(prop), binding.into_inner().expression);
}
}
} else {
values.insert(SmolStr::new_static("is_separator"), Expression::BoolLiteral(true));
}
state.id += 1;
let id_str = format_smolstr!("{}", state.id);
values.insert(SmolStr::new_static("id"), Expression::StringLiteral(id_str.clone()));
@ -662,6 +652,21 @@ fn generate_menu_entries(
.insert(SmolStr::new_static("has-sub-menu"), Expression::BoolLiteral(true).into());
}
drop(borrow_mut);
if !is_separator {
for prop in ["title"] {
if item.borrow().bindings.contains_key(prop) {
let n = SmolStr::new_static(prop);
values.insert(
n.clone(),
Expression::PropertyReference(NamedReference::new(&item, n)),
);
}
}
} else {
values.insert(SmolStr::new_static("is_separator"), Expression::BoolLiteral(true));
}
entries.push(mk_struct(state.menu_entry.clone(), values));
}
if last_is_separator {

21
tests/cases/elements/menubar_for.slint
View file

@ -14,7 +14,7 @@ export component TestCase inherits Window {
title: "File";
MenuItem {
title: "New";
activated => { debug("New"); }
activated => { result += self.title; debug("New"); }
}
MenuItem {
title: "Open";
@ -84,6 +84,13 @@ slint_testing::send_keyboard_string_sequence(&instance, &SharedString::from(Key:
assert_eq!(instance.get_result(), "");
slint_testing::send_keyboard_string_sequence(&instance, &SharedString::from("\n"));
assert_eq!(instance.get_result(), "Recent 43");
instance.set_result("".into());
slint_testing::send_mouse_click(&instance, 10., 10.);
slint_testing::send_keyboard_string_sequence(&instance, &SharedString::from(Key::DownArrow));
slint_testing::send_keyboard_string_sequence(&instance, &SharedString::from("\n"));
assert_eq!(instance.get_result(), "New");
```
```cpp
@ -102,6 +109,12 @@ slint_testing::send_keyboard_string_sequence(&instance, slint::platform::key_cod
assert_eq(instance.get_result(), "");
slint_testing::send_keyboard_string_sequence(&instance, "\n");
assert_eq(instance.get_result(), "Recent 43");
instance.set_result("");
slint_testing::send_mouse_click(&instance, 10., 10.);
slint_testing::send_keyboard_string_sequence(&instance, slint::platform::key_codes::DownArrow);
slint_testing::send_keyboard_string_sequence(&instance, "\n");
assert_eq(instance.get_result(), "New");
```
```js
@ -120,4 +133,10 @@ assert.equal(instance.result, "");
slintlib.private_api.send_keyboard_string_sequence(instance, "\n");
assert.equal(instance.result, "Recent 44");
instance.result = "";
slintlib.private_api.send_mouse_click(instance, 10., 10.);
slintlib.private_api.send_keyboard_string_sequence(instance, "\u{F701}");
slintlib.private_api.send_keyboard_string_sequence(instance, "\n");
assert.equal(instance.result, "New");
*/

2
tests/cases/widgets/menubar.slint
View file

@ -16,7 +16,7 @@ export component TestCase inherits Window {
MenuSeparator {} // should be hidden
MenuItem {
title: "New";
activated => { result += "New"; debug("New"); }
activated => { result += self.title; debug("New"); }
}
MenuItem {
title: "Open";