RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 02:47:35 +00:00
Code Issues Activity Actions

TextEditor: Move the find/replace buttons to JSON GUI

Browse source
This commit is contained in:
Andreas Kling 2020-09-14 16:03:32 +02:00
parent 093de0e323
commit 119a0c5dee
2 changed files with 51 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Applications/TextEditor/MainWindow.json
View file

@ -53,7 +53,25 @@
"preferred_height": 22, "preferred_height": 22,
"layout": { "layout": {
"class": "GUI::HorizontalBoxLayout" "class": "GUI::HorizontalBoxLayout"
} },
"children": [
{
"class": "GUI::Button",
"name": "find_previous_button",
"text": "Find previous",
"horizontal_size_policy": "Fixed",
"vertical_size_policy": "Fill",
"preferred_width": 150
},
{
"class": "GUI::Button",
"name": "find_next_button",
"text": "Find next",
"horizontal_size_policy": "Fixed",
"vertical_size_policy": "Fill",
"preferred_width": 150
}
]
}, },
{ {
"class": "GUI::Widget", "class": "GUI::Widget",
@ -64,7 +82,33 @@
"preferred_height": 22, "preferred_height": 22,
"layout": { "layout": {
"class": "GUI::HorizontalBoxLayout" "class": "GUI::HorizontalBoxLayout"
} },
"children": [
{
"class": "GUI::Button",
"name": "replace_previous_button",
"text": "Replace previous",
"horizontal_size_policy": "Fixed",
"vertical_size_policy": "Fill",
"preferred_width": 100
},
{
"class": "GUI::Button",
"name": "replace_next_button",
"text": "Replace next",
"horizontal_size_policy": "Fixed",
"vertical_size_policy": "Fill",
"preferred_width": 100
},
{
"class": "GUI::Button",
"name": "replace_all_button",
"text": "Replace all",
"horizontal_size_policy": "Fixed",
"vertical_size_policy": "Fill",
"preferred_width": 100
}
]
} }
] ]
}, },

20
Applications/TextEditor/TextEditorWidget.cpp
View file

@ -213,14 +213,10 @@ TextEditorWidget::TextEditorWidget()
} }
}); });
m_find_previous_button = m_find_widget->add<GUI::Button>("Find previous"); m_find_previous_button = static_cast<GUI::Button&>(*find_descendant_by_name("find_previous_button"));
m_find_previous_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
m_find_previous_button->set_preferred_size(150, 0);
m_find_previous_button->set_action(*m_find_previous_action); m_find_previous_button->set_action(*m_find_previous_action);
m_find_next_button = m_find_widget->add<GUI::Button>("Find next"); m_find_next_button = static_cast<GUI::Button&>(*find_descendant_by_name("find_next_button"));
m_find_next_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
m_find_next_button->set_preferred_size(150, 0);
m_find_next_button->set_action(*m_find_next_action); m_find_next_button->set_action(*m_find_next_action);
m_find_textbox->on_return_pressed = [this] { m_find_textbox->on_return_pressed = [this] {
@ -232,19 +228,13 @@ TextEditorWidget::TextEditorWidget()
m_editor->set_focus(true); m_editor->set_focus(true);
}; };
m_replace_previous_button = m_replace_widget->add<GUI::Button>("Replace previous"); m_replace_previous_button = static_cast<GUI::Button&>(*find_descendant_by_name("replace_previous_button"));
m_replace_previous_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
m_replace_previous_button->set_preferred_size(100, 0);
m_replace_previous_button->set_action(*m_replace_previous_action); m_replace_previous_button->set_action(*m_replace_previous_action);
m_replace_next_button = m_replace_widget->add<GUI::Button>("Replace next"); m_replace_next_button = static_cast<GUI::Button&>(*find_descendant_by_name("replace_next_button"));
m_replace_next_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
m_replace_next_button->set_preferred_size(100, 0);
m_replace_next_button->set_action(*m_replace_next_action); m_replace_next_button->set_action(*m_replace_next_action);
m_replace_all_button = m_replace_widget->add<GUI::Button>("Replace all"); m_replace_all_button = static_cast<GUI::Button&>(*find_descendant_by_name("replace_all_button"));
m_replace_all_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
m_replace_all_button->set_preferred_size(100, 0);
m_replace_all_button->set_action(*m_replace_all_action); m_replace_all_button->set_action(*m_replace_all_action);
m_replace_textbox->on_return_pressed = [this] { m_replace_textbox->on_return_pressed = [this] {