0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-04 05:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Ladybird: Allow browser tabs to be closed

Browse source 
This is a small patch which wires up the tab close button.
This commit is contained in:
Matthew Costa 2022-07-06 14:36:49 +01:00 committed by Andrew Kaster
parent 8af5b49cba
commit 67ab6dd2e6
Notes: sideshowbarker 2024-07-17 08:45:34 +09:00 
Author: https://github.com/ucosty
Commit: https://github.com/SerenityOS/serenity/commit/67ab6dd2e6
Pull-request: https://github.com/SerenityOS/serenity/pull/16583
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/awesomekling ✅
Reviewed-by: https://github.com/linusg
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ladybird/BrowserWindow.cpp
View file

@ -29,6 +29,7 @@ BrowserWindow::BrowserWindow(Core::EventLoop& event_loop)
setWindowTitle(m_tabs_container->tabText(index));
setWindowIcon(m_tabs_container->tabIcon(index));
});
QObject::connect(m_tabs_container, &QTabWidget::tabCloseRequested, this, &BrowserWindow::close_tab);
new_tab();
@ -46,11 +47,21 @@ void BrowserWindow::new_tab()
}
m_tabs_container->addTab(tab_ptr, "New Tab");
m_tabs_container->setCurrentWidget(tab_ptr);
QObject::connect(tab_ptr, &Tab::title_changed, this, &BrowserWindow::tab_title_changed);
QObject::connect(tab_ptr, &Tab::favicon_changed, this, &BrowserWindow::tab_favicon_changed);
}
void BrowserWindow::close_tab(int index)
{
auto* tab = m_tabs_container->widget(index);
m_tabs_container->removeTab(index);
m_tabs.remove_first_matching([&](auto& entry) {
return entry == tab;
});
}
int BrowserWindow::tab_index(Tab* tab)
{
return m_tabs_container->indexOf(tab);

5
Ladybird/BrowserWindow.h
View file

@ -5,7 +5,7 @@
*/
#include "Tab.h"
#include <AK/Vector.h>
#include <AK/NonnullOwnPtrVector.h>
#include <LibCore/Forward.h>
#include <QIcon>
#include <QLineEdit>
@ -33,10 +33,11 @@ public slots:
void tab_title_changed(int index, QString const&);
void tab_favicon_changed(int index, QIcon icon);
void new_tab();
void close_tab(int index);
private:
QTabWidget* m_tabs_container { nullptr };
Vector<NonnullOwnPtr<Tab>> m_tabs;
NonnullOwnPtrVector<Tab> m_tabs;
Tab* m_current_tab { nullptr };
Core::EventLoop& m_event_loop;