Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update winit to 0.26 #930

Merged
merged 4 commits into from
Dec 20, 2021
Merged

Update winit to 0.26 #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d48881
[WIP] Update winit
parasyte Dec 3, 2021
5278d97
Update glium
parasyte Dec 14, 2021
49cc4c5
Update rfd in eframe's file_dialog example
parasyte Dec 14, 2021
31f4495
Update changelogs
parasyte Dec 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
712 changes: 340 additions & 372 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eframe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ egui_web = { version = "0.15.0", path = "../egui_web", default-features = false

[dev-dependencies]
image = { version = "0.23", default-features = false, features = ["png"] }
rfd = "0.5.0"
rfd = "0.6"

[features]
default = ["default_fonts", "egui_glium"]
Expand Down
1 change: 1 addition & 0 deletions egui-winit/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to the `egui-winit` integration will be noted in this file.
* Add helper `EpiIntegration` ([#871](https://github.com/emilk/egui/pull/871)).
* Fix shift key getting stuck enabled with the X11 option `shift:both_capslock` enabled ([#849](https://github.com/emilk/egui/pull/849)).
* Remove `State::is_quit_event` and `State::is_quit_shortcut` ([#881](https://github.com/emilk/egui/pull/881)).
* Updated `winit` to 0.26 ([#930](https://github.com/emilk/egui/pull/930)).

## 0.15.0 - 2021-10-24
First stand-alone release. Previously part of `egui_glium`.
2 changes: 1 addition & 1 deletion egui-winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ all-features = true

[dependencies]
egui = { version = "0.15.0", path = "../egui", default-features = false, features = ["single_threaded"] }
winit = "0.25"
parasyte marked this conversation as resolved.
Show resolved Hide resolved
winit = "0.26"

epi = { version = "0.15.0", path = "../epi", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion egui_demo_app/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fn main() {
let app = egui_demo_lib::WrapApp::default();
let options = eframe::NativeOptions {
// Let's show off that we support transparent windows
transparent: true,
// transparent: true,
drag_and_drop_support: true,
..Default::default()
};
Expand Down
1 change: 1 addition & 0 deletions egui_glium/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ All notable changes to the `egui_glium` integration will be noted in this file.
## Unreleased
* Simplify `EguiGlium` interface ([#871](https://github.com/emilk/egui/pull/871)).
* Remove `EguiGlium::is_quit_event` ([#881](https://github.com/emilk/egui/pull/881)).
* Updated `glium` to 0.31 ([#930](https://github.com/emilk/egui/pull/930)).


## 0.15.0 - 2021-10-24
Expand Down
2 changes: 1 addition & 1 deletion egui_glium/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ egui = { version = "0.15.0", path = "../egui", default-features = false, feature
egui-winit = { version = "0.15.0", path = "../egui-winit", default-features = false, features = ["epi"] }
epi = { version = "0.15.0", path = "../epi", optional = true }

glium = "0.30"
glium = "0.31"

[dev-dependencies]
image = { version = "0.23", default-features = false, features = ["png"] }
Expand Down
1 change: 1 addition & 0 deletions egui_glow/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes to the `egui_glow` integration will be noted in this file.
* Make winit/glutin an optional dependency ([#868](https://github.com/emilk/egui/pull/868)).
* Simplify `EguiGlow` interface ([#871](https://github.com/emilk/egui/pull/871)).
* Remove `EguiGlow::is_quit_event` ([#881](https://github.com/emilk/egui/pull/881)).
* Updated `glutin` to 0.28 ([#930](https://github.com/emilk/egui/pull/930)).


## 0.15.0 - 2021-10-24
Expand Down
2 changes: 1 addition & 1 deletion egui_glow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ memoffset = "0.6"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.15.0", path = "../egui-winit", default-features = false, features = ["epi"], optional = true }
glutin = { version = "0.27.0", optional = true }
glutin = { version = "0.28.0", optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
web-sys = { version = "0.3", features=["console"] }
Expand Down