Commit 480b3067 authored by Felix Ernst's avatar Felix Ernst
Browse files

Merge branch 'release/21.04'

parents 5e79f27a dc3beae3
Pipeline #67071 passed with stage
in 5 minutes and 32 seconds
......@@ -116,28 +116,23 @@ DolphinContextMenu::Command DolphinContextMenu::open()
return m_command;
}
void DolphinContextMenu::childEvent(QChildEvent* event)
bool DolphinContextMenu::eventFilter(QObject* object, QEvent* event)
{
if(event->added()) {
event->child()->installEventFilter(this);
}
QMenu::childEvent(event);
}
Q_UNUSED(object)
bool DolphinContextMenu::eventFilter(QObject* dest, QEvent* event)
{
if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
if(m_removeAction && keyEvent->key() == Qt::Key_Shift) {
if(event->type() == QEvent::KeyPress) {
if (m_removeAction && keyEvent->key() == Qt::Key_Shift) {
if (event->type() == QEvent::KeyPress) {
m_removeAction->update(DolphinRemoveAction::ShiftState::Pressed);
} else {
m_removeAction->update(DolphinRemoveAction::ShiftState::Released);
}
return true;
}
}
return QMenu::eventFilter(dest, event);
return false;
}
void DolphinContextMenu::openTrashContextMenu()
......
......@@ -74,8 +74,7 @@ public:
Command open();
protected:
void childEvent(QChildEvent* event) override;
bool eventFilter(QObject* dest, QEvent* event) override;
bool eventFilter(QObject* object, QEvent* event) override;
private:
void openTrashContextMenu();
......
......@@ -211,6 +211,8 @@ DolphinMainWindow::DolphinMainWindow() :
DolphinMainWindow::~DolphinMainWindow()
{
// This fixes a crash on Wayland when closing the mainwindow while another dialog is open.
disconnect(QGuiApplication::clipboard(), &QClipboard::dataChanged, this, &DolphinMainWindow::updatePasteAction);
}
QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment