Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

TabWidget: Add moveTab() method that supports moving tabs between both tabbars

Browse Source
This commit is contained in:
David Rosca 2018-02-12 16:16:53 +01:00
parent 802e447c0c
commit eb90925a32
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/tabwidget/tabmodel.cpp
View File

@ -186,21 +186,8 @@ bool TabModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int ro
WebTab *tab = mimeData->tab(); WebTab *tab = mimeData->tab();
if (tab->browserWindow() == m_window) { if (tab->browserWindow() == m_window) {
if (tab->isPinned()) {
if (row < 0) { if (row < 0) {
row = m_window->tabWidget()->pinnedTabsCount(); row = tab->isPinned() ? m_window->tabWidget()->pinnedTabsCount() : m_window->tabWidget()->count();
}
if (row > m_window->tabWidget()->pinnedTabsCount()) {
tab->togglePinned();
}
} else {
if (row < 0) {
row = m_window->tabWidget()->count();
}
if (row < m_window->tabWidget()->pinnedTabsCount()) {
tab->togglePinned();
row++;
}
} }
tab->moveTab(row > mimeData->tab()->tabIndex() ? row - 1 : row); tab->moveTab(row > mimeData->tab()->tabIndex() ? row - 1 : row);
} else { } else {

13
src/lib/tabwidget/tabwidget.cpp
View File

@ -649,6 +649,19 @@ void TabWidget::closeToLeft(int index)
} }
} }
void TabWidget::moveTab(int from, int to)
{
WebTab *tab = webTab(from);
if (!tab) {
return;
}
// (Un)pin tab when needed
if ((tab->isPinned() && to >= pinnedTabsCount()) || (!tab->isPinned() && to < pinnedTabsCount())) {
tab->togglePinned();
}
TabStackedWidget::moveTab(tab->tabIndex(), to);
}
int TabWidget::pinUnPinTab(int index, const QString &title) int TabWidget::pinUnPinTab(int index, const QString &title)
{ {
const int newIndex = TabStackedWidget::pinUnPinTab(index, title); const int newIndex = TabStackedWidget::pinUnPinTab(index, title);

1
src/lib/tabwidget/tabwidget.h
View File

@ -96,6 +96,7 @@ public:
ToolButton* buttonClosedTabs() const; ToolButton* buttonClosedTabs() const;
AddTabButton* buttonAddTab() const; AddTabButton* buttonAddTab() const;
void moveTab(int from, int to);
int pinUnPinTab(int index, const QString &title = QString()); int pinUnPinTab(int index, const QString &title = QString());
void detachTab(WebTab* tab); void detachTab(WebTab* tab);