update egui to 0.11

dymk · Apr 9, 2021 · 2e822b7 · 2e822b7
1 parent a84623c
commit 2e822b7
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ open_url = ["webbrowser"]
 
 [dependencies]
 bevy = { version = "0.5", default-features = false, features = ["render", "bevy_winit"] }
-egui = "0.10.0"
+egui = "0.11.0"
 webbrowser = { version = "0.5.5", optional = true }
 winit = { version = "0.24.0", features = ["x11"], default-features = false }
 

diff --git a/examples/ui.rs b/examples/ui.rs
@@ -54,7 +54,7 @@ fn ui_example(
             ui.text_edit_singleline(&mut ui_state.label);
         });
 
-        ui.add(egui::Slider::f32(&mut ui_state.value, 0.0..=10.0).text("value"));
+        ui.add(egui::Slider::new(&mut ui_state.value, 0.0..=10.0).text("value"));
         if ui.button("Increment").clicked() {
             ui_state.value += 1.0;
         }

diff --git a/src/systems.rs b/src/systems.rs
@@ -211,7 +211,13 @@ pub fn process_output(
 
     if let Some(window) = windows.get_primary() {
         if let Some(winit_window) = winit_windows.get_window(window.id()) {
-            winit_window.set_cursor_icon(egui_to_winit_cursor_icon(output.cursor_icon));
+            match egui_to_winit_cursor_icon(output.cursor_icon) {
+                None => winit_window.set_cursor_visible(false),
+                Some(icon) => {
+                    winit_window.set_cursor_visible(true);
+                    winit_window.set_cursor_icon(icon);
+                }
+            }
         } else {
             log::error!("No winit window found for the primary window");
         }
@@ -221,23 +227,39 @@ pub fn process_output(
 
     #[cfg(feature = "open_url")]
     if let Some(url) = output.open_url {
-        if let Err(err) = webbrowser::open(&url) {
-            log::error!("Failed to open '{}': {:?}", url, err);
+        if let Err(err) = webbrowser::open(&url.url) {
+            log::error!("Failed to open '{}': {:?}", &url.url, err);
         }
     }
 }
 
-fn egui_to_winit_cursor_icon(cursor_icon: egui::CursorIcon) -> winit::window::CursorIcon {
+fn egui_to_winit_cursor_icon(cursor_icon: egui::CursorIcon) -> Option<winit::window::CursorIcon> {
     match cursor_icon {
-        egui::CursorIcon::Default => winit::window::CursorIcon::Default,
-        egui::CursorIcon::PointingHand => winit::window::CursorIcon::Hand,
-        egui::CursorIcon::ResizeHorizontal => winit::window::CursorIcon::EwResize,
-        egui::CursorIcon::ResizeNeSw => winit::window::CursorIcon::NeswResize,
-        egui::CursorIcon::ResizeNwSe => winit::window::CursorIcon::NwseResize,
-        egui::CursorIcon::ResizeVertical => winit::window::CursorIcon::NsResize,
-        egui::CursorIcon::Text => winit::window::CursorIcon::Text,
-        egui::CursorIcon::Grab => winit::window::CursorIcon::Grab,
-        egui::CursorIcon::Grabbing => winit::window::CursorIcon::Grabbing,
+        egui::CursorIcon::Default => Some(winit::window::CursorIcon::Default),
+        egui::CursorIcon::PointingHand => Some(winit::window::CursorIcon::Hand),
+        egui::CursorIcon::ResizeHorizontal => Some(winit::window::CursorIcon::EwResize),
+        egui::CursorIcon::ResizeNeSw => Some(winit::window::CursorIcon::NeswResize),
+        egui::CursorIcon::ResizeNwSe => Some(winit::window::CursorIcon::NwseResize),
+        egui::CursorIcon::ResizeVertical => Some(winit::window::CursorIcon::NsResize),
+        egui::CursorIcon::Text => Some(winit::window::CursorIcon::Text),
+        egui::CursorIcon::Grab => Some(winit::window::CursorIcon::Grab),
+        egui::CursorIcon::Grabbing => Some(winit::window::CursorIcon::Grabbing),
+        egui::CursorIcon::ContextMenu => Some(winit::window::CursorIcon::ContextMenu),
+        egui::CursorIcon::Help => Some(winit::window::CursorIcon::Help),
+        egui::CursorIcon::Progress => Some(winit::window::CursorIcon::Progress),
+        egui::CursorIcon::Wait => Some(winit::window::CursorIcon::Wait),
+        egui::CursorIcon::Cell => Some(winit::window::CursorIcon::Cell),
+        egui::CursorIcon::Crosshair => Some(winit::window::CursorIcon::Crosshair),
+        egui::CursorIcon::VerticalText => Some(winit::window::CursorIcon::VerticalText),
+        egui::CursorIcon::Alias => Some(winit::window::CursorIcon::Alias),
+        egui::CursorIcon::Copy => Some(winit::window::CursorIcon::Copy),
+        egui::CursorIcon::Move => Some(winit::window::CursorIcon::Move),
+        egui::CursorIcon::NoDrop => Some(winit::window::CursorIcon::NoDrop),
+        egui::CursorIcon::NotAllowed => Some(winit::window::CursorIcon::NotAllowed),
+        egui::CursorIcon::AllScroll => Some(winit::window::CursorIcon::AllScroll),
+        egui::CursorIcon::ZoomIn => Some(winit::window::CursorIcon::ZoomIn),
+        egui::CursorIcon::ZoomOut => Some(winit::window::CursorIcon::ZoomOut),
+        egui::CursorIcon::None => None,
     }
 }