FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Stepanov
2025-03-21 22:04:59 +03:00
parent cabd1f72bd a538901835
commit 80172b7c4f
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-ui/src/menu.rs
+23 -8
View File
@@ -586,14 +586,29 @@ impl Control for MenuItem {
WidgetMessage::MouseDown { .. } => {
let menu = find_menu(self.parent(), ui);
if menu.is_some() {
// Activate menu so it user will be able to open submenus by
// mouse hover.
ui.send_message(MenuMessage::activate(menu, MessageDirection::ToWidget));
if self.is_opened(ui) {
ui.send_message(MenuItemMessage::close(
self.handle(),
MessageDirection::ToWidget,
true,
));
ui.send_message(MenuMessage::deactivate(
menu,
MessageDirection::ToWidget,
));
} else {
// Activate menu so it user will be able to open submenus by
// mouse hover.
ui.send_message(MenuMessage::activate(
menu,
MessageDirection::ToWidget,
));
ui.send_message(MenuItemMessage::open(
self.handle(),
MessageDirection::ToWidget,
));
ui.send_message(MenuItemMessage::open(
self.handle(),
MessageDirection::ToWidget,
));
}
}
}
WidgetMessage::MouseUp { .. } => {
@@ -686,7 +701,7 @@ impl Control for MenuItem {
}
}
MenuItemMessage::Open => {
if !self.items_container.is_empty() {
if !self.items_container.is_empty() && !self.is_opened(ui) {
let placement = match *self.placement {
MenuItemPlacement::Bottom => Placement::LeftBottom(self.handle),
MenuItemPlacement::Right => Placement::RightTop(self.handle),