migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 23:00:04 -04:00
Code Activity

Use _px suffix for things in pixel units

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-12 12:52:48 +01:00
parent a3c7bdd846
commit 5892d057d7
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/egui-winit/src/lib.rs
View File

@@ -209,7 +209,7 @@ impl State {
None None
}; };
let inner_pos = if getting_info { let inner_pos_px = if getting_info {
window window
.inner_position() .inner_position()
.map(|pos| Pos2::new(pos.x as f32, pos.y as f32)) .map(|pos| Pos2::new(pos.x as f32, pos.y as f32))
@@ -218,7 +218,7 @@ impl State {
None None
}; };
let outer_pos = if getting_info { let outer_pos_px = if getting_info {
window window
.outer_position() .outer_position()
.map(|pos| Pos2::new(pos.x as f32, pos.y as f32)) .map(|pos| Pos2::new(pos.x as f32, pos.y as f32))
@@ -227,14 +227,14 @@ impl State {
None None
}; };
let inner_size = if getting_info { let inner_size_px = if getting_info {
let size = window.inner_size(); let size = window.inner_size();
Some(Vec2::new(size.width as f32, size.height as f32)) Some(Vec2::new(size.width as f32, size.height as f32))
} else { } else {
None None
}; };
let outer_size = if getting_info { let outer_size_px = if getting_info {
let size = window.outer_size(); let size = window.outer_size();
Some(Vec2::new(size.width as f32, size.height as f32)) Some(Vec2::new(size.width as f32, size.height as f32))
} else { } else {
@@ -242,15 +242,15 @@ impl State {
}; };
self.egui_input.viewport.id_pair = id_pair; self.egui_input.viewport.id_pair = id_pair;
self.egui_input.viewport.inner_rect = self.egui_input.viewport.inner_rect_px =
if let (Some(pos), Some(size)) = (inner_pos, inner_size) { if let (Some(pos), Some(size)) = (inner_pos_px, inner_size_px) {
Some(Rect::from_min_size(pos, size)) Some(Rect::from_min_size(pos, size))
} else { } else {
None None
}; };
self.egui_input.viewport.outer_rect = self.egui_input.viewport.outer_rect_px =
if let (Some(pos), Some(size)) = (outer_pos, outer_size) { if let (Some(pos), Some(size)) = (outer_pos_px, outer_size_px) {
Some(Rect::from_min_size(pos, size)) Some(Rect::from_min_size(pos, size))
} else { } else {
None None

12
crates/egui/src/data/input.rs
View File

@@ -147,11 +147,11 @@ pub struct ViewportInfo {
/// Viewport inner position and size, only the drowable area /// Viewport inner position and size, only the drowable area
/// unit = physical pixels /// unit = physical pixels
pub inner_rect: Option<Rect>, pub inner_rect_px: Option<Rect>,
/// Viewport outer position and size, drowable area + decorations /// Viewport outer position and size, drowable area + decorations
/// unit = physical pixels /// unit = physical pixels
pub outer_rect: Option<Rect>, pub outer_rect_px: Option<Rect>,
/// Viewport should close? /// Viewport should close?
pub close_requested: bool, pub close_requested: bool,
@@ -165,13 +165,13 @@ impl ViewportInfo {
pub fn ui(&self, ui: &mut crate::Ui) { pub fn ui(&self, ui: &mut crate::Ui) {
let Self { let Self {
id_pair, id_pair,
inner_rect, inner_rect_px,
outer_rect, outer_rect_px,
close_requested, close_requested,
} = self; } = self;
ui.label(format!("id_pair: {id_pair:?}")); ui.label(format!("id_pair: {id_pair:?}"));
ui.label(format!("inner_rect: {inner_rect:?}")); ui.label(format!("inner_rect_px: {inner_rect_px:?}"));
ui.label(format!("outer_rect: {outer_rect:?}")); ui.label(format!("outer_rect_px: {outer_rect_px:?}"));
ui.label(format!("close_requested: {close_requested:?}")); ui.label(format!("close_requested: {close_requested:?}"));
} }
} }

4
examples/test_viewports/src/main.rs
View File

@@ -197,14 +197,14 @@ fn generic_ui(ui: &mut egui::Ui, children: &[Arc<RwLock<ViewportState>>]) {
ui.add_space(8.0); ui.add_space(8.0);
if let Some(inner_rect) = ctx.input(|i| i.raw.viewport.inner_rect) { if let Some(inner_rect) = ctx.input(|i| i.raw.viewport.inner_rect_px) {
ui.label(format!( ui.label(format!(
"Inner Rect: Pos: {:?}, Size: {:?}", "Inner Rect: Pos: {:?}, Size: {:?}",
inner_rect.min, inner_rect.min,
inner_rect.size() inner_rect.size()
)); ));
} }
if let Some(outer_rect) = ctx.input(|i| i.raw.viewport.outer_rect) { if let Some(outer_rect) = ctx.input(|i| i.raw.viewport.outer_rect_px) {
ui.label(format!( ui.label(format!(
"Outer Rect: Pos: {:?}, Size: {:?}", "Outer Rect: Pos: {:?}, Size: {:?}",
outer_rect.min, outer_rect.min,