Skip to content

Commit

Permalink
Revert change to winit event loop in egui_glium (#756)
Browse files Browse the repository at this point in the history
* Revert change to winit event loop in egui_glium

This reverts #631

Fixes #755

* Add example of file dialogs and file drag-and-drop

* fix ci
  • Loading branch information
emilk authored Sep 30, 2021
1 parent 5539dbe commit 3e1db88
Show file tree
Hide file tree
Showing 8 changed files with 377 additions and 88 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
profile: minimal
toolchain: 1.54.0
override: true
- run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev
- run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libgtk-3-dev # libgtk-3-dev is used by rfd
- uses: actions-rs/cargo@v1
with:
command: test
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
toolchain: 1.54.0
override: true
- run: rustup component add clippy
- run: sudo apt-get install libspeechd-dev
- run: sudo apt-get install libspeechd-dev libgtk-3-dev # libgtk-3-dev is used by rfd
- uses: actions-rs/cargo@v1
with:
command: clippy
Expand Down
214 changes: 214 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions eframe/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog for eframe
All notable changes to the `eframe` and `epi` crates.

NOTE: [`egui_web`](egui_web/CHANGELOG.md), [`egui-winit`](egui-winit/CHANGELOG.md) and [`egui_glium`](egui_glium/CHANGELOG.md) have their own changelogs!


## Unreleased
* `Frame` now provides `set_decorations` to set whether to show window decorations.
Expand Down
1 change: 1 addition & 0 deletions eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ egui_web = { version = "0.14.0", path = "../egui_web", default-features = false

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

[features]
default = ["default_fonts"]
Expand Down
Loading

0 comments on commit 3e1db88

Please sign in to comment.