Merge remote-tracking branch 'origin/master' into hovered_src_indexes

emilk · Jan 27, 2023 · 43dbd45 · 43dbd45
2 parents bf83d78 + ce62b61
commit 43dbd45
Show file tree

Hide file tree

Showing 15 changed files with 183 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ NOTE: [`epaint`](crates/epaint/CHANGELOG.md), [`eframe`](crates/eframe/CHANGELOG
 * Don't render `\r` (Carriage Return) ([#2452](https://github.com/emilk/egui/pull/2452)).
 * The `button_padding` style option works closer as expected with image+text buttons now ([#2510](https://github.com/emilk/egui/pull/2510)).
 * Fixed rendering of `…` (ellipsis).
+* Menus are now moved to fit on the screen.
 
 ## 0.20.1 - 2022-12-11 - Fix key-repeat
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
@@ -116,7 +116,7 @@ image = { version = "0.24", optional = true, default-features = false, features
   "png",
 ] }
 puffin = { version = "0.14", optional = true }
-wgpu = { version = "0.14", optional = true }
+wgpu = { version = "0.15.0", optional = true }
 
 # -------------------------------------------
 # web:
@@ -172,4 +172,4 @@ web-sys = { version = "0.3.58", features = [
 # optional web:
 egui-wgpu = { version = "0.20.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
 tts = { version = "0.24", optional = true }
-wgpu = { version = "0.14", optional = true, features = ["webgl"] }
+wgpu = { version = "0.15.0", optional = true, features = ["webgl"] }