mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 05:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Better handling of "Lock on Minimize" setting

Browse source 
* Fix #1090 - delay locking databases after minimize to allow for clipboard use, Auto-Type use, and browser integration use.

* Fix #6757 - prevent setting both minimize on unlock and lock on minimize settings at the same time.
This commit is contained in:
Jonathan White 2022-06-27 23:21:40 -04:00
parent 0cbfbc08f3
commit e245701533
7 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/gui/DatabaseTabWidget.cpp
View file

@ -63,6 +63,9 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
#ifdef Q_OS_MACOS
connect(macUtils(), SIGNAL(lockDatabases()), SLOT(lockDatabases()));
#endif
m_lockDelayTimer.setSingleShot(true);
connect(&m_lockDelayTimer, &QTimer::timeout, this, [this] { lockDatabases(); });
}
DatabaseTabWidget::~DatabaseTabWidget()
@ -649,6 +652,18 @@ bool DatabaseTabWidget::lockDatabases()
return numLocked == c;
}
void DatabaseTabWidget::lockDatabasesDelayed()
{
// Delay at least 1 second and up to 20 seconds depending on clipboard state.
// This allows for Auto-Type, Browser Extension, and clipboard to function
// even with "Lock on Minimize" setting enabled.
int lockDelay = qBound(1, clipboard()->secondsToClear(), 20);
m_lockDelayTimer.setInterval(lockDelay * 1000);
if (!m_lockDelayTimer.isActive()) {
m_lockDelayTimer.start();
}
}
/**
* Unlock a database with an unlock popup dialog.
*