Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-20 21:04:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Focus database unlock dialog on macOS, fix #1023

Browse source
This commit is contained in:
Weslly 2017-11-20 04:26:53 -02:00
parent ac73e25d88
commit 3b8d49104c
No known key found for this signature in database
GPG key ID: 0506FFCC6A90226C
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/autotype/AutoType.cpp
View file

@ -256,6 +256,13 @@ void AutoType::resetInAutoType()
m_inAutoType = false; m_inAutoType = false;
} }
void AutoType::raiseWindow()
{
#if defined(Q_OS_MAC)
m_plugin->raiseOwnWindow();
#endif
}
void AutoType::unloadPlugin() void AutoType::unloadPlugin()
{ {
if (m_executor) { if (m_executor) {

1
src/autotype/AutoType.h
View file

@ -51,6 +51,7 @@ public:
public slots: public slots:
void performGlobalAutoType(const QList<Database*>& dbList); void performGlobalAutoType(const QList<Database*>& dbList);
void raiseWindow();
signals: signals:
void globalShortcutTriggered(); void globalShortcutTriggered();

6
src/gui/DatabaseWidget.cpp
View file

@ -1400,6 +1400,12 @@ void DatabaseWidget::showUnlockDialog()
{ {
m_unlockDatabaseDialog->clearForms(); m_unlockDatabaseDialog->clearForms();
m_unlockDatabaseDialog->setDBFilename(m_filename); m_unlockDatabaseDialog->setDBFilename(m_filename);
#if defined(Q_OS_MAC)
autoType()->raiseWindow();
Tools::wait(500);
#endif
m_unlockDatabaseDialog->show(); m_unlockDatabaseDialog->show();
m_unlockDatabaseDialog->activateWindow(); m_unlockDatabaseDialog->activateWindow();
} }