scroll bar
This commit is contained in:
parent
662436bb3e
commit
0e19a10325
|
@ -8,10 +8,9 @@ use bevy::{
|
|||
},
|
||||
math::Vec3,
|
||||
prelude::default,
|
||||
reflect::Reflect,
|
||||
render::{camera::Camera, color::Color},
|
||||
transform::components::{GlobalTransform, Transform},
|
||||
window::{PrimaryWindow, Window},
|
||||
window::{PrimaryWindow, Window, WindowResolution},
|
||||
};
|
||||
use bevy_egui::{
|
||||
egui::{self, color_picker, epaint::Hsva, Id, Pos2, Rect, ScrollArea},
|
||||
|
@ -412,17 +411,29 @@ pub fn edit_window_ui(
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut win_size = Option::<WindowResolution>::None;
|
||||
for win in &window {
|
||||
let size = &win.resolution;
|
||||
let size = win.resolution.clone();
|
||||
response = response.fixed_pos(Pos2::new(0., 0.));
|
||||
response = response.fixed_size(egui::Vec2::new(
|
||||
size.width() as f32 / 3.,
|
||||
size.height() as f32 / 1.,
|
||||
size.width() as f32 / 4.,
|
||||
size.height() as f32 / 1.33,
|
||||
));
|
||||
response = response.constrain(true);
|
||||
win_size = Some(size);
|
||||
}
|
||||
|
||||
response.show(contexts.ctx_mut(), |ui: &mut egui::Ui| {
|
||||
response.show(contexts.ctx_mut(), |ui| {
|
||||
let win_size = {
|
||||
if win_size.is_some() {
|
||||
win_size.unwrap()
|
||||
} else {
|
||||
WindowResolution::new(50f32, 50f32)
|
||||
}
|
||||
};
|
||||
egui::ScrollArea::vertical().max_height(win_size.height()).scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::AlwaysVisible).show(ui, |ui| {
|
||||
|
||||
|
||||
if ui.button("test directory list popup").clicked() {
|
||||
shared_ui_state.popup = PopupWindowMode::LoadFile("".into(), 0, Vec::new());
|
||||
}
|
||||
|
@ -661,6 +672,7 @@ pub fn edit_window_ui(
|
|||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
show_popup(
|
||||
&mut shared_ui_state,
|
||||
&mut contexts,
|
||||
|
|
Loading…
Reference in a new issue