Updated dependencies.

egui -> 0.15.0 egui-stylist -> 0.1.1 egui-theme -> 0.1.1
setzer22 · Nov 2, 2021 · c7577e5 · c7577e5
1 parent 360a24a
commit c7577e5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/egui_stylist_addon/Cargo.toml b/egui_stylist_addon/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["cdylib"]
 
 [dependencies]
 gdnative = "0.9.3"
-egui = "0.14.2"
+egui = "0.15.0"
 godot_egui = { path = "../godot_egui" }
-egui-stylist = "0.1.0"
-egui-theme = "0.1.0"
+egui-stylist = "0.1.1"
+egui-theme = "0.1.1"
 ron = "0.6.4"
 anyhow = "1.0.43"
 serde = "1.0.130"
diff --git a/egui_stylist_addon/addons/egui_stylist/egui_stylist.tscn b/egui_stylist_addon/addons/egui_stylist/egui_stylist.tscn
@@ -16,15 +16,19 @@ __meta__ = {
 [node name="godot_egui" type="Control" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
-focus_mode = 1
+mouse_filter = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
+reactive_update = true
 scroll_speed = 20.0
-consume_mouse_events = true
+input_mode = {
+"None": {
+}
+}
 disable_texture_filtering = false
 EguiTheme = "res://addons/egui_stylist/godot-editor.eguitheme"
 

diff --git a/example_project/Cargo.toml b/example_project/Cargo.toml
@@ -11,6 +11,6 @@ crate-type = ["cdylib"]
 
 [dependencies]
 gdnative = "0.9.3"
-egui = "0.14.2"
-egui_demo_lib = "0.14"
-godot_egui = { path = "../godot_egui" }
+egui = "0.15.0"
+egui_demo_lib = "0.15"
+godot_egui = { path = "../godot_egui" }
diff --git a/example_project/GodotEguiExample.tscn b/example_project/GodotEguiExample.tscn
@@ -12,6 +12,8 @@ script = ExtResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
+handle_gui_input = true
+handle_input = false
 
 [node name="GodotEgui" type="Control" parent="."]
 anchor_right = 1.0
@@ -21,4 +23,6 @@ script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
+scroll_speed = 20.0
 input_mode = 2
+disable_texture_filtering = false
diff --git a/godot_egui/Cargo.toml b/godot_egui/Cargo.toml
@@ -13,6 +13,6 @@ workspace = ".."
 
 [dependencies]
 gdnative = "0.9.3"
-egui = "0.14.2"
-egui-theme = "0.1.0"
+egui = "0.15.0"
+egui-theme = "0.1.1"
 ron = "0.6.4"
diff --git a/godot_egui/src/lib.rs b/godot_egui/src/lib.rs
@@ -88,7 +88,6 @@ struct SyncedTexture {
     texture_version: Option<u64>,
     godot_texture: Ref<ImageTexture>,
 }
-
 /// Core type to draw egui-based controls in Godot.
 /// The `update` or `update_ctx` methods can be used to draw a new frame.
 #[derive(NativeClass)]