Watch: Add "Toggle Dashboard" button by default, Toast: Show user-specific error messages in various places, WayVR: Modify example env vars

src/backend/openvr/mod.rs

@@ -43,7 +43,7 @@ use crate::{
 };
 
 #[cfg(feature = "wayvr")]
-use crate::overlays::wayvr::{wayvr_action, WayVRAction};
+use crate::{gui::modular::button::WayVRAction, overlays::wayvr::wayvr_action};
 
 pub mod helpers;
 pub mod input;

src/backend/openxr/mod.rs

@@ -32,7 +32,7 @@ use crate::{
 };
 
 #[cfg(feature = "wayvr")]
-use crate::overlays::wayvr::{wayvr_action, WayVRAction};
+use crate::{gui::modular::button::WayVRAction, overlays::wayvr::wayvr_action};
 
 mod helpers;
 mod input;

src/backend/task.rs

@@ -10,7 +10,7 @@ use serde::Deserialize;
 use crate::state::AppState;
 
 #[cfg(feature = "wayvr")]
-use crate::overlays::wayvr::WayVRAction;
+use crate::gui::modular::button::WayVRAction;
 
 use super::{
     common::OverlaySelector,

src/backend/wayvr/egl_data.rs

@@ -83,6 +83,8 @@ impl EGLData {
 
             let context = egl.create_context(display, config, None, &context_attrib_list)?;
 
+            log::debug!("eglMakeCurrent");
+
             egl.make_current(display, None, None, Some(context))?;
 
             Ok(EGLData {
@@ -94,18 +96,6 @@ impl EGLData {
         }
     }
 
-    #[allow(dead_code)]
-    pub fn make_current(&self, surface: &khronos_egl::Surface) -> anyhow::Result<()> {
-        self.egl.make_current(
-            self.display,
-            Some(*surface),
-            Some(*surface),
-            Some(self.context),
-        )?;
-
-        Ok(())
-    }
-
     fn query_dmabuf_mod_info(&self) -> anyhow::Result<DMAbufModifierInfo> {
         let target_fourcc = 0x34324258; //XB24