From db591bc56cb28c4376d048cee6278fdb187feded Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emilernerfeldt@gmail.com>
Date: Fri, 15 Jan 2021 18:11:12 +0100
Subject: [PATCH] Fix minor alignment/size issue in TextEdit

---
 egui/src/ui.rs                |  6 ++++++
 egui/src/widgets/text_edit.rs | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/egui/src/ui.rs b/egui/src/ui.rs
index 7264c7bd..e9d58e5a 100644
--- a/egui/src/ui.rs
+++ b/egui/src/ui.rs
@@ -516,6 +516,12 @@ impl Ui {
         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 {
         let item_spacing = self.style().spacing.item_spacing;
         self.placer.advance_after_rects(rect, rect, item_spacing);
diff --git a/egui/src/widgets/text_edit.rs b/egui/src/widgets/text_edit.rs
index 9cd970ee..995f7002 100644
--- a/egui/src/widgets/text_edit.rs
+++ b/egui/src/widgets/text_edit.rs
@@ -228,14 +228,14 @@ impl<'t> TextEdit<'t> {
 impl<'t> Widget for TextEdit<'t> {
     fn ui(self, ui: &mut Ui) -> Response {
         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 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 frame_rect = Rect::from_min_max(frame_rect.min, content_ui.min_rect().max + margin);
-        let response = response | ui.allocate_response(frame_rect.size(), Sense::click());
+        let frame_rect = response.rect.expand2(margin);
+        let response = response | ui.allocate_rect(frame_rect, Sense::click());
 
         if frame {
             let visuals = ui.style().interact(&response);