djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unneeded use statements

Browse source
This commit is contained in:
charburgx 2022-12-19 04:31:30 -06:00
parent 3c2e669fe1
commit 45336eaf62
3 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/egui/src/containers/area.rs
View file

@ -2,7 +2,7 @@
//! It has no frame or own size. It is potentially movable. //! It has no frame or own size. It is potentially movable.
//! It is the foundation for windows and popups. //! It is the foundation for windows and popups.
use crate::{layers::ZLayer, *}; use crate::*;
/// State that is persisted between frames. /// State that is persisted between frames.
// TODO(emilk): this is not currently stored in `memory().data`, but maybe it should be? // TODO(emilk): this is not currently stored in `memory().data`, but maybe it should be?
@ -268,7 +268,7 @@ impl Area {
let move_response = ctx.interact( let move_response = ctx.interact(
Rect::EVERYTHING, Rect::EVERYTHING,
ctx.style().spacing.item_spacing, ctx.style().spacing.item_spacing,
ZLayer::from_area_layer(layer_id), layers::ZLayer::from_area_layer(layer_id),
interact_id, interact_id,
state.rect(), state.rect(),
sense, sense,

18
crates/egui/src/context.rs
View file

@ -2,15 +2,9 @@
use std::sync::Arc; use std::sync::Arc;
use crate::{ use crate::{
animation_manager::AnimationManager, animation_manager::AnimationManager, data::output::PlatformOutput, frame_state::FrameState,
data::output::PlatformOutput, input_state::*, layers::GraphicLayers, memory::Options, os::OperatingSystem,
frame_state::FrameState, output::FullOutput, TextureHandle, *,
input_state::*,
layers::{GraphicLayers, ZLayer, ZOrder},
memory::Options,
os::OperatingSystem,
output::FullOutput,
TextureHandle, *,
}; };
use epaint::{mutex::*, stats::*, text::Fonts, TessellationOptions, *}; use epaint::{mutex::*, stats::*, text::Fonts, TessellationOptions, *};
@ -70,9 +64,9 @@ struct ContextImpl {
requested_repaint_last_frame: bool, requested_repaint_last_frame: bool,
/// Written to during the frame. /// Written to during the frame.
layer_rects_this_frame: ahash::HashMap<AreaLayerId, Vec<(Id, ZOrder, Rect)>>, layer_rects_this_frame: ahash::HashMap<AreaLayerId, Vec<(Id, layers::ZOrder, Rect)>>,
/// Read /// Read
layer_rects_prev_frame: ahash::HashMap<AreaLayerId, Vec<(Id, ZOrder, Rect)>>, layer_rects_prev_frame: ahash::HashMap<AreaLayerId, Vec<(Id, layers::ZOrder, Rect)>>,
#[cfg(feature = "accesskit")] #[cfg(feature = "accesskit")]
is_accesskit_enabled: bool, is_accesskit_enabled: bool,
@ -383,7 +377,7 @@ impl Context {
&self, &self,
clip_rect: Rect, clip_rect: Rect,
item_spacing: Vec2, item_spacing: Vec2,
layer: ZLayer, layer: layers::ZLayer,
id: Id, id: Id,
rect: Rect, rect: Rect,
sense: Sense, sense: Sense,

13
crates/egui/src/ui.rs
View file

@ -6,15 +6,8 @@ use std::sync::Arc;
use epaint::mutex::{RwLock, RwLockReadGuard, RwLockWriteGuard}; use epaint::mutex::{RwLock, RwLockReadGuard, RwLockWriteGuard};
use crate::{ use crate::{
containers::*, containers::*, ecolor::*, epaint::text::Fonts, layers::ZLayer, layout::*, menu::MenuState,
ecolor::*, placer::Placer, widgets::*, *,
epaint::text::Fonts,
layers::{ZLayer, ZOrder},
layout::*,
menu::MenuState,
placer::Placer,
widgets::*,
*,
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -1768,7 +1761,7 @@ impl Ui {
pub fn with_z<R>( pub fn with_z<R>(
&mut self, &mut self,
z: ZOrder, z: layers::ZOrder,
add_contents: impl FnOnce(&mut Self) -> R, add_contents: impl FnOnce(&mut Self) -> R,
) -> InnerResponse<R> { ) -> InnerResponse<R> {
self.scope(|ui| { self.scope(|ui| {