2 files changed, 42 insertions, 7 deletions
diff --git a/ozone-ui/Cargo.toml b/ozone-ui/Cargo.toml
index 714496a..e7c7845 100644
--- a/ozone-ui/Cargo.toml
+++ b/ozone-ui/Cargo.toml
@@ -8,3 +8,5 @@ reqwest = "0.12.12"
 simple_logger = { version = "5.0.0", features = ["colors"] }
 slint = { version = "1.9.2", features = ["raw-window-handle-06"] }
 wry = "0.48.1"
+gtk = "0.18.2"
+winit = "0.30.8"
diff --git a/ozone-ui/src/main.rs b/ozone-ui/src/main.rs
index 0d578a1..43a9c42 100644
--- a/ozone-ui/src/main.rs
+++ b/ozone-ui/src/main.rs
@@ -1,8 +1,13 @@
 use std::borrow::Cow;
+use std::error::Error;
 use reqwest::Url;
 use slint::run_event_loop;
+use winit::application::ApplicationHandler;
+use winit::event::WindowEvent;
+use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
+use winit::window::{Window, WindowAttributes, WindowId};
 use wry::http::{Response, StatusCode};
-use wry::{WebViewBuilder, WebViewBuilderExtWindows};
+use wry::WebViewBuilder;
 
 slint::slint! {
     export component HelloWorld inherits Window {
@@ -10,12 +15,39 @@ slint::slint! {
     }
 }
 
-fn main() {
+struct Application {
+    window: Option<Window>
+}
+
+impl ApplicationHandler for Application {
+    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
+        let win = event_loop.create_window(WindowAttributes::default()).unwrap();
+        
+
+        win.set_visible(true);
+        self.window = Some(win);
+    }
+
+    fn window_event(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, event: WindowEvent) {
+        match event {
+            WindowEvent::CloseRequested => {
+                event_loop.exit();
+            }
+            WindowEvent::RedrawRequested => {
+                if let Some(ref window) = self.window {
+                    window.request_redraw();
+                }
+            }
+            _ => { }
+        }
+    }
+}
+
+fn main() -> Result<(), Box<dyn Error>> {
     simple_logger::SimpleLogger::new().env().init().unwrap();
+    gtk::init()?;
 
     let hw = HelloWorld::new().unwrap();
-    hw.show().unwrap();
-
     let wv = WebViewBuilder::new()
         .with_url("https://login.live.com/oauth20_authorize.srf?client_id=00000000402b5328&redirect_uri=ms-xal-00000000402b5328://auth&response_type=token&display=touch&scope=service::user.auth.xboxlive.com::MBI_SSL%20offline_access&prompt=select_account")
         .with_navigation_handler(|url| {
@@ -35,7 +67,8 @@ fn main() {
             }
 
             true
-        }).build(&hw.window().window_handle()).unwrap();
-
-    run_event_loop().unwrap();
+        }).build_as_child(&hw.window().window_handle()).unwrap();
+    wv.set_visible(true).unwrap();
+    hw.run().unwrap();
+    Ok(())
 }