Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-13 08:19:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use setChangeCurrentOnDrag property to handle drag and drop between tabs

Browse Source 
.FIXES #7155
This commit is contained in:
Rosa Hase 2022-03-23 22:47:24 +01:00 committed by Jonathan White
parent 5c45cf2d76
commit 044fc8d50c
4 changed files with 4 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -107,7 +107,6 @@ set(keepassx_SOURCES
gui/DatabaseWidgetStateSync.cpp
gui/EntryPreviewWidget.cpp
gui/DialogyWidget.cpp
gui/DragTabBar.cpp
gui/EditWidget.cpp
gui/EditWidgetIcons.cpp
gui/EditWidgetProperties.cpp

6
src/gui/DatabaseTabWidget.cpp
View File

@ -18,6 +18,7 @@
#include "DatabaseTabWidget.h"
#include <QFileInfo>
#include <QTabBar>
#include "autotype/AutoType.h"
#include "core/Tools.h"
@ -26,7 +27,6 @@
#include "gui/DatabaseOpenDialog.h"
#include "gui/DatabaseWidget.h"
#include "gui/DatabaseWidgetStateSync.h"
#include "gui/DragTabBar.h"
#include "gui/FileDialog.h"
#include "gui/HtmlExporter.h"
#include "gui/MessageBox.h"
@ -42,7 +42,9 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
, m_dbWidgetPendingLock(nullptr)
, m_databaseOpenDialog(new DatabaseOpenDialog(this))
{
auto* tabBar = new DragTabBar(this);
auto* tabBar = new QTabBar(this);
tabBar->setAcceptDrops(true);
tabBar->setChangeCurrentOnDrag(true);
setTabBar(tabBar);
setDocumentMode(true);

98
src/gui/DragTabBar.cpp
View File

@ -1,98 +0,0 @@
/*
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DragTabBar.h"
#include <QApplication>
#include <QDragEnterEvent>
#include <QTimer>
DragTabBar::DragTabBar(QWidget* parent)
: QTabBar(parent)
, m_tabSwitchTimer(new QTimer(this))
, m_tabSwitchIndex(-1)
{
m_tabSwitchTimer->setSingleShot(true);
connect(m_tabSwitchTimer, SIGNAL(timeout()), SLOT(dragSwitchTab()));
setAcceptDrops(true);
}
void DragTabBar::dragEnterEvent(QDragEnterEvent* event)
{
int tab = tabAt(event->pos());
if (tab != -1) {
if (tab != currentIndex()) {
m_tabSwitchIndex = tab;
m_tabSwitchTimer->start(QApplication::doubleClickInterval() * 2);
}
event->setAccepted(true);
} else {
QTabBar::dragEnterEvent(event);
}
}
void DragTabBar::dragMoveEvent(QDragMoveEvent* event)
{
int tab = tabAt(event->pos());
if (tab != -1) {
if (tab == currentIndex()) {
m_tabSwitchTimer->stop();
} else if (tab != m_tabSwitchIndex) {
m_tabSwitchIndex = tab;
m_tabSwitchTimer->start(QApplication::doubleClickInterval() * 2);
}
event->setAccepted(true);
} else {
m_tabSwitchIndex = -1;
m_tabSwitchTimer->stop();
QTabBar::dragMoveEvent(event);
}
}
void DragTabBar::dragLeaveEvent(QDragLeaveEvent* event)
{
m_tabSwitchIndex = -1;
m_tabSwitchTimer->stop();
QTabBar::dragLeaveEvent(event);
}
void DragTabBar::dropEvent(QDropEvent* event)
{
m_tabSwitchIndex = -1;
m_tabSwitchTimer->stop();
QTabBar::dropEvent(event);
}
void DragTabBar::tabLayoutChange()
{
m_tabSwitchIndex = -1;
m_tabSwitchTimer->stop();
QTabBar::tabLayoutChange();
}
void DragTabBar::dragSwitchTab()
{
int tab = tabAt(mapFromGlobal(QCursor::pos()));
if (tab != -1 && tab == m_tabSwitchIndex) {
m_tabSwitchIndex = -1;
setCurrentIndex(tab);
}
}

45
src/gui/DragTabBar.h
View File

@ -1,45 +0,0 @@
/*
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEEPASSX_DRAGTABBAR_H
#define KEEPASSX_DRAGTABBAR_H
#include <QTabBar>
class DragTabBar : public QTabBar
{
Q_OBJECT
public:
explicit DragTabBar(QWidget* parent = nullptr);
protected:
void dragEnterEvent(QDragEnterEvent* event) override;
void dragMoveEvent(QDragMoveEvent* event) override;
void dragLeaveEvent(QDragLeaveEvent* event) override;
void dropEvent(QDropEvent* event) override;
void tabLayoutChange() override;
private slots:
void dragSwitchTab();
private:
QTimer* const m_tabSwitchTimer;
int m_tabSwitchIndex;
};
#endif // KEEPASSX_DRAGTABBAR_H