From 8a7935a29f957220d8acd786e5ed203e8a470907 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Mon, 14 Sep 2020 13:01:32 +0200
Subject: [PATCH] TextEditor: Move the "find" and "replace" widget containers
 to JSON GUI

---
 Applications/TextEditor/MainWindow.json      | 26 +++++++++++++++++++-
 Applications/TextEditor/TextEditorWidget.cpp | 12 ++-------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Applications/TextEditor/MainWindow.json b/Applications/TextEditor/MainWindow.json
index 7b9c9e9cb00..0de2ed76dab 100644
--- a/Applications/TextEditor/MainWindow.json
+++ b/Applications/TextEditor/MainWindow.json
@@ -40,7 +40,31 @@
             "layout": {
                 "class": "GUI::VerticalBoxLayout",
                 "margins": [ 2, 2, 2, 4 ]
-            }
+            },
+            "children": [
+                {
+                    "class": "GUI::Widget",
+                    "name": "find_widget",
+                    "fill_with_background_color": true,
+                    "horizontal_size_policy": "Fill",
+                    "vertical_size_policy": "Fixed",
+                    "preferred_height": 22,
+                    "layout": {
+                        "class": "GUI::HorizontalBoxLayout"
+                    }
+                },
+                {
+                    "class": "GUI::Widget",
+                    "name": "replace_widget",
+                    "fill_with_background_color": true,
+                    "horizontal_size_policy": "Fill",
+                    "vertical_size_policy": "Fixed",
+                    "preferred_height": 22,
+                    "layout": {
+                        "class": "GUI::HorizontalBoxLayout"
+                    }
+                }
+            ]
         },
         {
             "class": "GUI::StatusBar",
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index 688fa3eb9f4..e1d9a762ad1 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -105,18 +105,10 @@ TextEditorWidget::TextEditorWidget()
     m_find_replace_widget = *find_descendant_by_name("find_replace_widget");
     m_find_replace_widget->set_visible(false);
 
-    m_find_widget = m_find_replace_widget->add<GUI::Widget>();
-    m_find_widget->set_fill_with_background_color(true);
-    m_find_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
-    m_find_widget->set_preferred_size(0, 22);
-    m_find_widget->set_layout<GUI::HorizontalBoxLayout>();
+    m_find_widget = *find_descendant_by_name("find_widget");
     m_find_widget->set_visible(false);
 
-    m_replace_widget = m_find_replace_widget->add<GUI::Widget>();
-    m_replace_widget->set_fill_with_background_color(true);
-    m_replace_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
-    m_replace_widget->set_preferred_size(0, 22);
-    m_replace_widget->set_layout<GUI::HorizontalBoxLayout>();
+    m_replace_widget = *find_descendant_by_name("replace_widget");
     m_replace_widget->set_visible(false);
 
     m_find_textbox = m_find_widget->add<GUI::TextBox>();