Use one standard Iris resource bundle

src/desktop/mod.rs

@@ -50,8 +50,8 @@ pub struct DesktopUiState {
     pub access: AccessTree,
 }
 
-impl<State: 'static> HasRoot<DesktopRsc<State>> for DesktopUiState {
-    fn set_root(&mut self, rsc: &mut DesktopRsc<State>, root: StrongWidget) {
+impl<State: 'static> HasRoot<StdRsc<State>> for DesktopUiState {
+    fn set_root(&mut self, rsc: &mut StdRsc<State>, root: StrongWidget) {
         self.root = Some(crate::overlay::default_overlay_root(rsc, root));
     }
 }
@@ -81,25 +81,22 @@ pub trait HasDesktopUiState: Sized + 'static {
 
 pub trait DesktopAppState: HasDesktopUiState {
     type Event = ();
-    fn new(ui_state: DesktopUiState, rsc: &mut DesktopRsc<Self>, proxy: Proxy<Self::Event>)
-    -> Self;
+    fn new(ui_state: DesktopUiState, rsc: &mut StdRsc<Self>, proxy: Proxy<Self::Event>) -> Self;
     #[allow(unused_variables)]
-    fn event(&mut self, event: Self::Event, rsc: &mut DesktopRsc<Self>) {}
+    fn event(&mut self, event: Self::Event, rsc: &mut StdRsc<Self>) {}
     #[allow(unused_variables)]
-    fn exit(&mut self, rsc: &mut DesktopRsc<Self>) {}
+    fn exit(&mut self, rsc: &mut StdRsc<Self>) {}
     #[allow(unused_variables)]
-    fn window_event(&mut self, event: WindowEvent, rsc: &mut DesktopRsc<Self>) {}
+    fn window_event(&mut self, event: WindowEvent, rsc: &mut StdRsc<Self>) {}
     fn window_attributes() -> WindowAttributes {
         Default::default()
     }
 }
 
-pub type DesktopRsc<State> = AppRsc<State>;
-
 pub struct DesktopApp<State: DesktopAppState> {
-    rsc: DesktopRsc<State>,
+    rsc: StdRsc<State>,
     state: State,
-    task_recv: TaskMsgReceiver<DesktopRsc<State>>,
+    task_recv: TaskMsgReceiver<StdRsc<State>>,
 }
 
 impl<State: DesktopAppState> AppState for DesktopApp<State> {
@@ -118,7 +115,7 @@ impl<State: DesktopAppState> AppState for DesktopApp<State> {
         );
         window.set_visible(true);
         let desktop_state = DesktopUiState::new(window, access_adapter);
-        let (mut rsc, task_recv) = AppRsc::new(desktop_state.window.clone());
+        let (mut rsc, task_recv) = StdRsc::new(desktop_state.window.clone());
         // Set before building widgets so the first text shape uses the right density.
         let scale = content_scale(desktop_state.window.as_ref());
         rsc.ui.set_density(scale);