Skip to content

Migrate to bevy_egui 0.35 #95

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate to bevy_egui 0.35 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e22eb99
Update to egui 0.35
inogai Aug 4, 2025
1247923
bump version
inogai Aug 4, 2025
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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_console"
version = "0.14.1"
version = "0.15.0"
edition = "2021"
authors = ["RichoDemus <[email protected]>"]
homepage = "https://github.com/RichoDemus/bevy-console"
Expand All @@ -16,7 +16,7 @@ bevy = { version = "0.16", default-features = false, features = [
] }
clap = { version = "4.5", features = ["derive"] }
bevy_console_derive = { path = "./bevy_console_derive", version = "0.5.0" }
bevy_egui = { version = "0.34", default-features = false, features = [
bevy_egui = { version = "0.35", default-features = false, features = [
"render",
"default_fonts",
] }
Expand Down
6 changes: 3 additions & 3 deletions src/console.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ pub(crate) fn console_ui(
let keyboard_input_events = keyboard_input_events.read().collect::<Vec<_>>();

// If there is no egui context, return, this can happen when exiting the app
let ctx = if let Some(ctxt) = egui_context.try_ctx_mut() {
let ctx = if let Ok(ctxt) = egui_context.ctx_mut() {
ctxt
} else {
return;
Expand Down Expand Up @@ -765,7 +765,7 @@ pub fn block_mouse_input(
return;
}

let Some(context) = contexts.try_ctx_mut() else {
let Ok(context) = contexts.ctx_mut() else {
return;
};

Expand All @@ -783,7 +783,7 @@ pub fn block_keyboard_input(
return;
}

let Some(context) = contexts.try_ctx_mut() else {
let Ok(context) = contexts.ctx_mut() else {
return;
};

Expand Down
10 changes: 4 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use bevy::prelude::*;
pub use bevy_console_derive::ConsoleCommand;
use bevy_egui::{EguiContextPass, EguiPlugin, EguiPreUpdateSet};
use bevy_egui::{EguiPlugin, EguiPreUpdateSet, EguiPrimaryContextPass};
use console::{block_keyboard_input, block_mouse_input, ConsoleCache};
use trie_rs::TrieBuilder;

Expand Down Expand Up @@ -86,14 +86,14 @@ impl Plugin for ConsolePlugin {
.before(EguiPreUpdateSet::BeginPass),
)
.add_systems(
EguiContextPass,
EguiPrimaryContextPass,
(
console_ui.in_set(ConsoleSet::ConsoleUI),
receive_console_line.in_set(ConsoleSet::PostCommands),
),
)
.configure_sets(
EguiContextPass,
EguiPrimaryContextPass,
(
ConsoleSet::Commands
.after(ConsoleSet::ConsoleUI)
Expand All @@ -105,9 +105,7 @@ impl Plugin for ConsolePlugin {
// Don't initialize an egui plugin if one already exists.
// This can happen if another plugin is using egui and was installed before us.
if !app.is_plugin_added::<EguiPlugin>() {
app.add_plugins(EguiPlugin {
enable_multipass_for_primary_context: true,
});
app.add_plugins(EguiPlugin::default());
}
}
}