From ba4d367deae1543ffd03c538dba66bb367fdbc38 Mon Sep 17 00:00:00 2001 From: Erik Biederstadt Date: Sat, 3 Jul 2021 15:33:57 -0600 Subject: [PATCH] HackStudio: Remove old form editing logic In the past Hack Studio had the ability to design GUI widgets via `.frm` files. We now use the GML playground for this purpose, and the old code can be removed. `.frm` files are now treated as plain text files. This commit also fixes a crash when opening `.frm` files. `m_form_inner_container` was never instantiated, and caused a null pointer dereference. --- Userland/DevTools/HackStudio/HackStudioWidget.cpp | 8 +------- Userland/DevTools/HackStudio/HackStudioWidget.h | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index dd86ecd1fa..fc40dca2ba 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -268,11 +268,7 @@ bool HackStudioWidget::open_file(const String& full_filename) current_editor().vertical_scrollbar().set_value(new_project_file->vertical_scroll_value()); current_editor().set_editing_engine(make()); - if (filename.ends_with(".frm")) { - set_edit_mode(EditMode::Form); - } else { - set_edit_mode(EditMode::Text); - } + set_edit_mode(EditMode::Text); String relative_file_path = filename; if (filename.starts_with(m_project->root_path())) @@ -302,8 +298,6 @@ void HackStudioWidget::set_edit_mode(EditMode mode) { if (mode == EditMode::Text) { m_right_hand_stack->set_active_widget(m_editors_splitter); - } else if (mode == EditMode::Form) { - m_right_hand_stack->set_active_widget(m_form_inner_container); } else if (mode == EditMode::Diff) { m_right_hand_stack->set_active_widget(m_diff_viewer); } else { diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.h b/Userland/DevTools/HackStudio/HackStudioWidget.h index 86e56596f0..1e13cd609c 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.h +++ b/Userland/DevTools/HackStudio/HackStudioWidget.h @@ -65,7 +65,6 @@ private: enum class EditMode { Text, - Form, Diff, }; @@ -133,8 +132,6 @@ private: RefPtr m_right_hand_splitter; RefPtr m_right_hand_stack; RefPtr m_editors_splitter; - RefPtr m_form_inner_container; - RefPtr m_form_widget_tree_view; RefPtr m_diff_viewer; RefPtr m_git_widget; RefPtr m_class_view;