Update egui, smithay-egui, smithay
This commit is contained in:
parent
afdb656778
commit
a96394f7a6
7 changed files with 131 additions and 245 deletions
|
|
@ -470,7 +470,7 @@ fn surface_thread(
|
|||
(400, 800),
|
||||
));
|
||||
let mut visuals: egui::style::Visuals = Default::default();
|
||||
visuals.window_shadow.extrusion = 0.0;
|
||||
visuals.window_shadow = egui::Shadow::NONE;
|
||||
state.context().set_visuals(visuals);
|
||||
state
|
||||
};
|
||||
|
|
|
|||
|
|
@ -609,7 +609,7 @@ where
|
|||
let fps_overlay = fps_ui(
|
||||
_gpu,
|
||||
debug_active,
|
||||
seats.iter(),
|
||||
&seats,
|
||||
renderer.glow_renderer_mut(),
|
||||
state,
|
||||
timings,
|
||||
|
|
|
|||
12
src/debug.rs
12
src/debug.rs
|
|
@ -32,7 +32,7 @@ pub const DISPLAY_COLOR: Color32 = Color32::from_rgb(41, 184, 209);
|
|||
pub fn fps_ui<'a>(
|
||||
gpu: Option<&DrmNode>,
|
||||
debug_active: bool,
|
||||
seats: impl Iterator<Item = &'a Seat<State>>,
|
||||
seats: &[Seat<State>],
|
||||
renderer: &mut GlowRenderer,
|
||||
state: &EguiState,
|
||||
timings: &Timings,
|
||||
|
|
@ -126,7 +126,7 @@ pub fn fps_ui<'a>(
|
|||
|
||||
state.render(
|
||||
|ctx| {
|
||||
egui::Area::new("main")
|
||||
egui::Area::new("main".into())
|
||||
.anchor(egui::Align2::LEFT_TOP, (10.0, 10.0))
|
||||
.show(ctx, |ui| {
|
||||
ui.label(format!(
|
||||
|
|
@ -171,14 +171,14 @@ pub fn fps_ui<'a>(
|
|||
ui.label(egui::RichText::new(format!("min: {:>7.6}", min_disp)).code());
|
||||
ui.label(egui::RichText::new(format!("max: {:>7.6}", max_disp)).code());
|
||||
|
||||
let elements_chart = BarChart::new(bars_elements).vertical();
|
||||
let render_chart = BarChart::new(bars_render)
|
||||
let elements_chart = BarChart::new(bars_elements.clone()).vertical();
|
||||
let render_chart = BarChart::new(bars_render.clone())
|
||||
.stack_on(&[&elements_chart])
|
||||
.vertical();
|
||||
let submitted_chart = BarChart::new(bars_submitted)
|
||||
let submitted_chart = BarChart::new(bars_submitted.clone())
|
||||
.stack_on(&[&elements_chart, &render_chart])
|
||||
.vertical();
|
||||
let display_chart = BarChart::new(bars_displayed)
|
||||
let display_chart = BarChart::new(bars_displayed.clone())
|
||||
.stack_on(&[&elements_chart, &render_chart, &submitted_chart])
|
||||
.vertical();
|
||||
|
||||
|
|
|
|||
|
|
@ -685,7 +685,7 @@ impl CosmicMapped {
|
|||
let glow_renderer = renderer.glow_renderer_mut();
|
||||
match debug.render(
|
||||
|ctx| {
|
||||
egui::Area::new("window")
|
||||
egui::Area::new("window".into())
|
||||
.anchor(
|
||||
egui::Align2::RIGHT_TOP,
|
||||
[
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ use smithay::{
|
|||
delegate_pointer_constraints,
|
||||
input::pointer::PointerHandle,
|
||||
reexports::wayland_server::protocol::wl_surface::WlSurface,
|
||||
utils::{Logical, Point},
|
||||
wayland::{
|
||||
pointer_constraints::{with_pointer_constraint, PointerConstraintsHandler},
|
||||
seat::WaylandFocus,
|
||||
|
|
@ -23,5 +24,14 @@ impl PointerConstraintsHandler for State {
|
|||
});
|
||||
}
|
||||
}
|
||||
|
||||
fn cursor_position_hint(
|
||||
&mut self,
|
||||
_surface: &WlSurface,
|
||||
_pointer: &PointerHandle<Self>,
|
||||
_location: Point<f64, Logical>,
|
||||
) {
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
delegate_pointer_constraints!(State);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue