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

Fix minor alignment/size issue in TextEdit

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-01-15 18:11:12 +01:00
parent 17d88c8187
commit db591bc56c
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
egui/src/ui.rs
View file

@ -516,6 +516,12 @@ impl Ui {
widget_rect widget_rect
} }
/// Allocate a specific part of the ui.
pub(crate) fn allocate_rect(&mut self, rect: Rect, sense: Sense) -> Response {
let id = self.advance_cursor_after_rect(rect);
self.interact(rect, id, sense)
}
pub(crate) fn advance_cursor_after_rect(&mut self, rect: Rect) -> Id { pub(crate) fn advance_cursor_after_rect(&mut self, rect: Rect) -> Id {
let item_spacing = self.style().spacing.item_spacing; let item_spacing = self.style().spacing.item_spacing;
self.placer.advance_after_rects(rect, rect, item_spacing); self.placer.advance_after_rects(rect, rect, item_spacing);

12
egui/src/widgets/text_edit.rs
View file

@ -228,14 +228,14 @@ impl<'t> TextEdit<'t> {
impl<'t> Widget for TextEdit<'t> { impl<'t> Widget for TextEdit<'t> {
fn ui(self, ui: &mut Ui) -> Response { fn ui(self, ui: &mut Ui) -> Response {
let frame = self.frame; let frame = self.frame;
let margin = Vec2::splat(2.0);
let frame_rect = ui.available_rect_before_wrap();
let content_rect = frame_rect.shrink2(margin);
let where_to_put_background = ui.painter().add(Shape::Noop); let where_to_put_background = ui.painter().add(Shape::Noop);
let mut content_ui = ui.child_ui(content_rect, *ui.layout());
let margin = Vec2::new(4.0, 2.0);
let max_rect = ui.available_rect_before_wrap().shrink2(margin);
let mut content_ui = ui.child_ui(max_rect, *ui.layout());
let response = self.content_ui(&mut content_ui); let response = self.content_ui(&mut content_ui);
let frame_rect = Rect::from_min_max(frame_rect.min, content_ui.min_rect().max + margin); let frame_rect = response.rect.expand2(margin);
let response = response | ui.allocate_response(frame_rect.size(), Sense::click()); let response = response | ui.allocate_rect(frame_rect, Sense::click());
if frame { if frame {
let visuals = ui.style().interact(&response); let visuals = ui.style().interact(&response);