Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 08:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Lower the main window after unlock request from extension (#1884)

Browse Source
This commit is contained in:
Sami Vänttinen 2018-05-05 00:31:17 +03:00 committed by Jonathan White
parent 635d6fe82c
commit 963ac75389
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/browser/BrowserService.cpp
View File

@ -47,7 +47,8 @@ static int KEEPASSXCBROWSER_DEFAULT_ICON = 1;
BrowserService::BrowserService(DatabaseTabWidget* parent) : BrowserService::BrowserService(DatabaseTabWidget* parent) :
m_dbTabWidget(parent), m_dbTabWidget(parent),
m_dialogActive(false) m_dialogActive(false),
m_bringToFrontRequested(false)
{ {
connect(m_dbTabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), this, SLOT(databaseLocked(DatabaseWidget*))); connect(m_dbTabWidget, SIGNAL(databaseLocked(DatabaseWidget*)), this, SLOT(databaseLocked(DatabaseWidget*)));
connect(m_dbTabWidget, SIGNAL(databaseUnlocked(DatabaseWidget*)), this, SLOT(databaseUnlocked(DatabaseWidget*))); connect(m_dbTabWidget, SIGNAL(databaseUnlocked(DatabaseWidget*)), this, SLOT(databaseUnlocked(DatabaseWidget*)));
@ -82,6 +83,7 @@ bool BrowserService::openDatabase(bool triggerUnlock)
if (triggerUnlock) { if (triggerUnlock) {
KEEPASSXC_MAIN_WINDOW->bringToFront(); KEEPASSXC_MAIN_WINDOW->bringToFront();
m_bringToFrontRequested = true;
} }
return false; return false;
@ -743,6 +745,10 @@ void BrowserService::databaseLocked(DatabaseWidget* dbWidget)
void BrowserService::databaseUnlocked(DatabaseWidget* dbWidget) void BrowserService::databaseUnlocked(DatabaseWidget* dbWidget)
{ {
if (dbWidget) { if (dbWidget) {
if (m_bringToFrontRequested) {
KEEPASSXC_MAIN_WINDOW->lower();
m_bringToFrontRequested = false;
}
emit databaseUnlocked(); emit databaseUnlocked();
} }
} }

1
src/browser/BrowserService.h
View File

@ -78,6 +78,7 @@ private:
private: private:
DatabaseTabWidget* const m_dbTabWidget; DatabaseTabWidget* const m_dbTabWidget;
bool m_dialogActive; bool m_dialogActive;
bool m_bringToFrontRequested;
}; };
#endif // BROWSERSERVICE_H #endif // BROWSERSERVICE_H