...

2 files changed, 9 insertions, 4 deletions

diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index c4912307..47706174 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -46,6 +46,10 @@ render::RenderObject* TextBox::GetRenderObject() const {
   return border_render_object_.get();
 }
 
+bool TextBox::GetMultiLine() const { return service_->IsMultiLine(); }
+
+void TextBox::SetMultiLine(bool value) { service_->SetMultiLine(value); }
+
 gsl::not_null<render::TextRenderObject*> TextBox::GetTextRenderObject() {
   return text_render_object_.get();
 }
diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp
index 034d9bd8..9766e85e 100644
--- a/src/ui/host/WindowHost.cpp
+++ b/src/ui/host/WindowHost.cpp
@@ -181,10 +181,11 @@ void WindowHost::Relayout() {
 void WindowHost::RelayoutWithSize(const Size& available_size,
                                   bool set_window_size_to_fit_content) {
   root_render_object_->Measure(
-      render::MeasureRequirement{available_size,
-                                 IsLayoutPreferToFillWindow()
-                                     ? render::MeasureSize(available_size)
-                                     : render::MeasureSize::NotSpecified()},
+      render::MeasureRequirement{
+          available_size,
+          !set_window_size_to_fit_content && IsLayoutPreferToFillWindow()
+              ? render::MeasureSize(available_size)
+              : render::MeasureSize::NotSpecified()},
       render::MeasureSize::NotSpecified());
 
   if (set_window_size_to_fit_content) {