From 46a7fee95a010f20490d7f66f0c2c82ed936ca5e Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Thu, 27 Mar 2025 13:08:20 +0530 Subject: Refactor and fix tab id use for focus/close --- src/widgets/MainWindow.cpp | 4 ++-- src/widgets/WebViewStack.cpp | 1 + src/widgets/WebViewStack.hpp | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/MainWindow.cpp b/src/widgets/MainWindow.cpp index c3c392e..d66611b 100644 --- a/src/widgets/MainWindow.cpp +++ b/src/widgets/MainWindow.cpp @@ -45,10 +45,10 @@ MainWindow::MainWindow() { LuaRuntime::instance()->load_file("./config.lua"); // TODO: remove - keymap_evaluator->add_keymap(KeyMode::Normal, "i", [keymap_evaluator]() { + keymap_evaluator->add_keymap(KeyMode::Normal, "i", [&keymap_evaluator]() { keymap_evaluator->set_current_mode(KeyMode::Insert); }); - keymap_evaluator->add_keymap(KeyMode::Insert, "", [keymap_evaluator]() { + keymap_evaluator->add_keymap(KeyMode::Insert, "", [&keymap_evaluator]() { keymap_evaluator->set_current_mode(KeyMode::Normal); }); keymap_evaluator->add_keymap(KeyMode::Normal, "a", diff --git a/src/widgets/WebViewStack.cpp b/src/widgets/WebViewStack.cpp index fda4f28..aee4af9 100644 --- a/src/widgets/WebViewStack.cpp +++ b/src/widgets/WebViewStack.cpp @@ -103,6 +103,7 @@ void WebViewStack::close(WebViewId webview_id) { // TODO: Focus on different webview // focus_webview(); + // TODO: Close window on empty if (webview_list.isEmpty()) { create_new_webview(configuration->new_tab_url, true); } diff --git a/src/widgets/WebViewStack.hpp b/src/widgets/WebViewStack.hpp index b675af5..9df088e 100644 --- a/src/widgets/WebViewStack.hpp +++ b/src/widgets/WebViewStack.hpp @@ -31,12 +31,15 @@ public: QWebEngineProfile *profile = new QWebEngineProfile, QWidget *parent = nullptr); - std::vector urls(); // TODO: Remove QList get_webview_list(); WebView *current_webview(); WebViewId current_webview_id(); uint32_t count(); QUrl current_url(); + + /// @deprecated TODO: Remove + std::vector urls(); + /// @deprecated TODO: Remove uint32_t current_webview_index(); protected: -- cgit v1.3.1