From 07bd841bc669a7010b2f8945dbfb3d1ef5466c02 Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Wed, 22 Apr 2026 19:03:47 +0200
Subject: [PATCH] dash-frontend: skymap browser ui improvements, wayvr: fix
 context menus not working

---
 .../gui/view/remote_skymap_downloader.xml     | 20 +++++++++----------
 .../src/tab/settings/tab_look_and_feel.rs     |  2 +-
 dash-frontend/src/tab/settings/tab_skybox.rs  |  2 +-
 wgui/src/windowing/context_menu.rs            |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dash-frontend/assets/gui/view/remote_skymap_downloader.xml b/dash-frontend/assets/gui/view/remote_skymap_downloader.xml
index 12dfbadc..c6e386ae 100644
--- a/dash-frontend/assets/gui/view/remote_skymap_downloader.xml
+++ b/dash-frontend/assets/gui/view/remote_skymap_downloader.xml
@@ -16,20 +16,20 @@
 
   <elements>
     <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">
-        <image id="image" width="500" height="250" round="8" border="2" border_color="~color_accent"/>
-    
         <div id="resolution_buttons" gap="8" flex_direction="row">
           <!-- filled-in at runtime -->
         </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>
   </elements>
diff --git a/dash-frontend/src/tab/settings/tab_look_and_feel.rs b/dash-frontend/src/tab/settings/tab_look_and_feel.rs
index f2e3ac66..601eb840 100644
--- a/dash-frontend/src/tab/settings/tab_look_and_feel.rs
+++ b/dash-frontend/src/tab/settings/tab_look_and_feel.rs
@@ -17,13 +17,13 @@ impl State {
 		)?;
 		options_dropdown::<wlx_common::locale::Language>(par.mp, c, &SettingType::Language)?;
 		options_checkbox(par.mp, c, SettingType::HideUsername)?;
+		options_checkbox(par.mp, c, SettingType::OpaqueBackground)?;
 		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::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_checkbox(par.mp, c, SettingType::SetsOnWatch)?;
 		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)?;
 		Ok(State {})
 	}
diff --git a/dash-frontend/src/tab/settings/tab_skybox.rs b/dash-frontend/src/tab/settings/tab_skybox.rs
index f516a2d0..dfe4b3e6 100644
--- a/dash-frontend/src/tab/settings/tab_skybox.rs
+++ b/dash-frontend/src/tab/settings/tab_skybox.rs
@@ -39,7 +39,7 @@ impl State {
 	pub fn mount(par: SettingsMountParams) -> anyhow::Result<Self> {
 		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::OpaqueBackground)?;
+		options_checkbox(par.mp, id_category, SettingType::UsePassthrough)?;
 
 		let tasks = Tasks::<Task>::new();
 
diff --git a/wgui/src/windowing/context_menu.rs b/wgui/src/windowing/context_menu.rs
index e9139015..ef0c0bf9 100644
--- a/wgui/src/windowing/context_menu.rs
+++ b/wgui/src/windowing/context_menu.rs
@@ -8,7 +8,7 @@ use crate::{
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::Layout,
-	parser::{self, Fetchable, ParserState},
+	parser::{self, Fetchable, ParserData, ParserState},
 	task::Tasks,
 	windowing::window::{WguiWindow, WguiWindowParams, WguiWindowParamsExtra},
 };
@@ -117,7 +117,7 @@ impl ContextMenu {
 				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_id = button.base().get_id();