diff --git a/uidev/assets/gui/various_widgets.xml b/uidev/assets/gui/various_widgets.xml
index df05894d..3d06e4b1 100644
--- a/uidev/assets/gui/various_widgets.xml
+++ b/uidev/assets/gui/various_widgets.xml
@@ -18,6 +18,51 @@
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
@@ -91,6 +136,7 @@
+
diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs
index a18c460f..0444e24f 100644
--- a/uidev/src/testbed/testbed_generic.rs
+++ b/uidev/src/testbed/testbed_generic.rs
@@ -8,10 +8,11 @@ use glam::Vec2;
use wgui::{
components::{
Component,
- button::{ButtonClickCallback, ComponentButton},
+ button::{ButtonClickCallback, ButtonClickEvent, ComponentButton},
checkbox::ComponentCheckbox,
},
drawing::Color,
+ event::CallbackDataCommon,
font_config::WguiFontConfig,
globals::WguiGlobals,
i18n::Translation,
@@ -32,7 +33,10 @@ use wlx_common::locale::WayVRLangProvider;
#[derive(Clone)]
pub enum TestbedTask {
ShowPopup,
- ShowContextMenu(context_menu::Position),
+ ShowContextMenu {
+ pos: context_menu::Position,
+ large: bool, /* large */
+ },
}
struct Data {
@@ -142,6 +146,8 @@ impl TestbedGeneric {
let button_context_menu =
parser_state.fetch_component_as::("button_context_menu")?;
+ let button_context_menu_large =
+ parser_state.fetch_component_as::("button_context_menu_large")?;
let button_click_me = parser_state.fetch_component_as::("button_click_me")?;
let button = button_click_me.clone();
button_click_me.on_click(Rc::new(move |common, _e| {
@@ -189,13 +195,21 @@ impl TestbedGeneric {
})
});
- button_context_menu.on_click({
+ let get_callback = |large: bool| {
let tasks = testbed.tasks.clone();
- Rc::new(move |_common, m| {
- tasks.push(TestbedTask::ShowContextMenu(m.boundary.into()));
- Ok(())
- })
- });
+ Rc::new(
+ move |_common: &mut CallbackDataCommon, m: ButtonClickEvent| -> anyhow::Result<()> {
+ tasks.push(TestbedTask::ShowContextMenu {
+ pos: m.boundary.into(),
+ large,
+ });
+ Ok(())
+ },
+ )
+ };
+
+ button_context_menu.on_click(get_callback(false));
+ button_context_menu_large.on_click(get_callback(true));
Ok(testbed)
}
@@ -208,8 +222,8 @@ impl TestbedGeneric {
) -> anyhow::Result<()> {
match task {
TestbedTask::ShowPopup => self.show_popup(params, data)?,
- TestbedTask::ShowContextMenu(position) => {
- self.show_context_menu(params, data, position.clone())
+ TestbedTask::ShowContextMenu { pos, large } => {
+ self.show_context_menu(params, data, *pos, *large)
}
}
@@ -250,13 +264,19 @@ impl TestbedGeneric {
_params: &mut TestbedUpdateParams,
data: &mut Data,
position: context_menu::Position,
+ large: bool,
) {
data.context_menu.open(context_menu::OpenParams {
on_custom_attribs: Some(Rc::new(move |custom_attribs| {
log::info!("custom attribs {:?}", custom_attribs.pairs);
})),
blueprint: context_menu::Blueprint::Template {
- template_name: "my_context_menu".into(),
+ template_name: (if large {
+ "my_context_menu_large"
+ } else {
+ "my_context_menu"
+ })
+ .into(),
template_params: Default::default(),
},
position,
diff --git a/wgui/assets/wgui/context_menu.xml b/wgui/assets/wgui/context_menu.xml
index 8c303b0a..478694a0 100644
--- a/wgui/assets/wgui/context_menu.xml
+++ b/wgui/assets/wgui/context_menu.xml
@@ -23,8 +23,10 @@
-
-
+
+
+
+
diff --git a/wgui/src/windowing/context_menu.rs b/wgui/src/windowing/context_menu.rs
index 59b79dc2..4b8d09dc 100644
--- a/wgui/src/windowing/context_menu.rs
+++ b/wgui/src/windowing/context_menu.rs
@@ -34,7 +34,7 @@ pub enum Blueprint {
},
}
-#[derive(Clone)]
+#[derive(Copy, Clone)]
pub enum Position {
Unspecified,
Absolute(Vec2),
diff --git a/wgui/src/windowing/window.rs b/wgui/src/windowing/window.rs
index 63461df2..6e9012ae 100644
--- a/wgui/src/windowing/window.rs
+++ b/wgui/src/windowing/window.rs
@@ -349,9 +349,17 @@ impl WguiWindow {
content.id
} else {
// without decorations
- let (content, _) = params
- .layout
- .add_child(topmost_widget.id, WidgetDiv::create(), Default::default())?;
+ let (content, _) = params.layout.add_child(
+ topmost_widget.id,
+ WidgetDiv::create(),
+ taffy::Style {
+ max_size: taffy::Size {
+ width: percent(1.0_f32),
+ height: percent(1.0_f32),
+ },
+ ..Default::default()
+ },
+ )?;
self.0.borrow_mut().opened_window = Some(OpenedWindow {
widget: topmost_widget,