From f256c55e8d4b5448bbb9b91d0ef253d7ab574d20 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 25 Oct 2019 10:25:42 +0200 Subject: [PATCH] HackStudio: Unbreak jumping to a search result I broke this when factoring out the find-in-files widget into its own class. This patch adds a main_editor() global getter for grabbing at the main GTextEditor from wherever you are. --- DevTools/HackStudio/FindInFilesWidget.cpp | 5 +++-- DevTools/HackStudio/main.cpp | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/DevTools/HackStudio/FindInFilesWidget.cpp b/DevTools/HackStudio/FindInFilesWidget.cpp index d5e7b77fad..666f84fc51 100644 --- a/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/DevTools/HackStudio/FindInFilesWidget.cpp @@ -5,6 +5,7 @@ #include #include +extern GTextEditor& main_editor(); extern void open_file(const String&); extern OwnPtr g_project; @@ -70,8 +71,8 @@ FindInFilesWidget::FindInFilesWidget(GWidget* parent) int line_number = parts[1].to_int(ok); ASSERT(ok); open_file(parts[0]); - m_textbox->set_cursor(line_number - 1, 0); - m_textbox->set_focus(true); + main_editor().set_cursor(line_number - 1, 0); + main_editor().set_focus(true); }; m_button->on_click = [this](auto&) { diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index cd0486a5e2..1942df42a6 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -29,6 +29,12 @@ RefPtr g_window; RefPtr g_project_list_view; RefPtr g_text_editor; +GTextEditor& main_editor() +{ + ASSERT(g_text_editor); + return *g_text_editor; +} + static void build(TerminalWrapper&); static void run(TerminalWrapper&); void open_file(const String&); @@ -109,7 +115,7 @@ int main(int argc, char** argv) auto statusbar = GStatusBar::construct(widget); g_text_editor->on_cursor_change = [&] { - statusbar->set_text(String::format("Line: %d, Column: %d", g_text_editor->cursor().line(), g_text_editor->cursor().column())); + statusbar->set_text(String::format("Line: %d, Column: %d", g_text_editor->cursor().line() + 1, g_text_editor->cursor().column())); }; g_text_editor->add_custom_context_menu_action(GAction::create(