Skip to content

Commit 38c2928

Browse files
committed
stash
1 parent 876c71b commit 38c2928

14 files changed

Lines changed: 631 additions & 446 deletions

File tree

agdk-egui/src/lib.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{num::NonZeroU32, sync::Arc};
22
use tracing::{debug, error};
33

44
use egui::ViewportId;
5-
use egui_wgpu::{wgpu, RendererOptions};
5+
use egui_wgpu::RendererOptions;
66
use egui_winit::winit;
77

88
use winit::event_loop::{ActiveEventLoop, EventLoop};
@@ -87,10 +87,6 @@ fn _main(event_loop: EventLoop<Event>) {
8787
)));
8888
ctx.set_request_repaint_callback(move |_info| {
8989
debug!("Request Repaint Callback");
90-
91-
// XXX: debug (Egui will redraw continuously during text input which
92-
// makes it awkward to debug IME behavior)
93-
//return;
9490
repaint_signal
9591
.0
9692
.lock()
@@ -206,7 +202,6 @@ const DEFAULT_ENV_FILTER: &str = "debug,wgpu_hal=info,winit=info,naga=info";
206202
#[cfg(target_os = "android")]
207203
#[no_mangle]
208204
fn android_main(app: AndroidApp) {
209-
use tracing_subscriber::fmt::format::FmtSpan;
210205
use tracing_subscriber::prelude::*;
211206
use winit::platform::android::EventLoopBuilderExtAndroid;
212207

@@ -215,7 +210,7 @@ fn android_main(app: AndroidApp) {
215210
let filter_layer = tracing_subscriber::EnvFilter::new(DEFAULT_ENV_FILTER);
216211
let android_layer = paranoid_android::layer(env!("CARGO_PKG_NAME"))
217212
.with_ansi(false)
218-
.with_span_events(FmtSpan::CLOSE)
213+
.with_span_events(tracing_subscriber::fmt::format::FmtSpan::CLOSE)
219214
.with_thread_names(true);
220215
tracing_subscriber::registry()
221216
.with(filter_layer)

na-mainloop/Cargo.lock

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)