dash-frontend: skymap browser ui improvements, wayvr: fix context menus not working

This commit is contained in:
Aleksander 2026-04-22 19:03:47 +02:00
parent 9986b71b26
commit 07bd841bc6
4 changed files with 14 additions and 14 deletions

View File

@ -16,20 +16,20 @@
<elements> <elements>
<div gap="8" flex_direction="column" min_width="100%" overflow_y="scroll"> <div gap="8" flex_direction="column" min_width="100%" overflow_y="scroll">
<label id="label_author" weight="bold"/>
<label id="label_description" wrap="1"/>
<Separator/>
<div gap="24" justify_content="center">
<label id="label_creation_date"/>
<label id="label_modification_date"/>
<label id="label_version"/>
</div>
<div gap="8" flex_direction="column" align_items="center"> <div gap="8" flex_direction="column" align_items="center">
<image id="image" width="500" height="250" round="8" border="2" border_color="~color_accent"/>
<div id="resolution_buttons" gap="8" flex_direction="row"> <div id="resolution_buttons" gap="8" flex_direction="row">
<!-- filled-in at runtime --> <!-- filled-in at runtime -->
</div> </div>
<image id="image" width="400" height="200" round="8" border="2" border_color="~color_accent"/>
<label id="label_author" weight="bold"/>
<label id="label_description" wrap="1"/>
<Separator/>
<!-- nerdy stuff below -->
<div gap="24" justify_content="center">
<label size="10" id="label_creation_date"/>
<label size="10" id="label_modification_date"/>
<label size="10" id="label_version"/>
</div>
</div> </div>
</div> </div>
</elements> </elements>

View File

@ -17,13 +17,13 @@ impl State {
)?; )?;
options_dropdown::<wlx_common::locale::Language>(par.mp, c, &SettingType::Language)?; options_dropdown::<wlx_common::locale::Language>(par.mp, c, &SettingType::Language)?;
options_checkbox(par.mp, c, SettingType::HideUsername)?; options_checkbox(par.mp, c, SettingType::HideUsername)?;
options_checkbox(par.mp, c, SettingType::OpaqueBackground)?;
options_checkbox(par.mp, c, SettingType::HideGrabHelp)?; options_checkbox(par.mp, c, SettingType::HideGrabHelp)?;
options_slider_f32(par.mp, c, SettingType::UiAnimationSpeed, 0.5, 5.0, 0.1)?; // min, max, step options_slider_f32(par.mp, c, SettingType::UiAnimationSpeed, 0.5, 5.0, 0.1)?; // min, max, step
options_slider_f32(par.mp, c, SettingType::UiGradientIntensity, 0.0, 1.0, 0.05)?; // min, max, step options_slider_f32(par.mp, c, SettingType::UiGradientIntensity, 0.0, 1.0, 0.05)?; // min, max, step
options_slider_f32(par.mp, c, SettingType::UiRoundMultiplier, 0.5, 5.0, 0.1)?; options_slider_f32(par.mp, c, SettingType::UiRoundMultiplier, 0.5, 5.0, 0.1)?;
options_checkbox(par.mp, c, SettingType::SetsOnWatch)?; options_checkbox(par.mp, c, SettingType::SetsOnWatch)?;
options_slider_f32(par.mp, c, SettingType::GridOpacity, 0.0, 1.0, 0.05)?; // min, max, step options_slider_f32(par.mp, c, SettingType::GridOpacity, 0.0, 1.0, 0.05)?; // min, max, step
options_checkbox(par.mp, c, SettingType::UsePassthrough)?;
options_checkbox(par.mp, c, SettingType::Clock12h)?; options_checkbox(par.mp, c, SettingType::Clock12h)?;
Ok(State {}) Ok(State {})
} }

View File

@ -39,7 +39,7 @@ impl State {
pub fn mount(par: SettingsMountParams) -> anyhow::Result<Self> { pub fn mount(par: SettingsMountParams) -> anyhow::Result<Self> {
let id_category = options_category(par.mp, par.id_parent, "APP_SETTINGS.SKYBOX", "dashboard/globe.svg")?; let id_category = options_category(par.mp, par.id_parent, "APP_SETTINGS.SKYBOX", "dashboard/globe.svg")?;
options_checkbox(par.mp, id_category, SettingType::UseSkybox)?; options_checkbox(par.mp, id_category, SettingType::UseSkybox)?;
options_checkbox(par.mp, id_category, SettingType::OpaqueBackground)?; options_checkbox(par.mp, id_category, SettingType::UsePassthrough)?;
let tasks = Tasks::<Task>::new(); let tasks = Tasks::<Task>::new();

View File

@ -8,7 +8,7 @@ use crate::{
globals::WguiGlobals, globals::WguiGlobals,
i18n::Translation, i18n::Translation,
layout::Layout, layout::Layout,
parser::{self, Fetchable, ParserState}, parser::{self, Fetchable, ParserData, ParserState},
task::Tasks, task::Tasks,
windowing::window::{WguiWindow, WguiWindowParams, WguiWindowParamsExtra}, windowing::window::{WguiWindow, WguiWindowParams, WguiWindowParamsExtra},
}; };
@ -117,7 +117,7 @@ impl ContextMenu {
par.insert(Rc::from("tooltip_str"), tooltip.generate(&mut globals.i18n())); par.insert(Rc::from("tooltip_str"), tooltip.generate(&mut globals.i18n()));
} }
let mut data_cell = inner_parser.realize_template(&doc_params, "Cell", layout, id_buttons, par)?; let mut data_cell = inner_parser.parse_template_only(&doc_params, "Cell", layout, id_buttons, par)?;
let button = data_cell.fetch_component_as::<ComponentButton>("button")?; let button = data_cell.fetch_component_as::<ComponentButton>("button")?;
let button_id = button.base().get_id(); let button_id = button.base().get_id();