thooge
/
keepassx1
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable "Always On Top" on Mac OS for now

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@344 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 15 years ago
parent 09544078cd
commit 1af6133336
2 changed files with 7 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      src/dialogs/SettingsDlg.cpp
  2. 4
      src/mainwindow.cpp

3
src/dialogs/SettingsDlg.cpp
Unescape View File

@ -69,6 +69,9 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
Edit_GlobalShortcut->setVisible(false); Edit_GlobalShortcut->setVisible(false);
CheckBox_EntryTitlesMatch->setVisible(false); CheckBox_EntryTitlesMatch->setVisible(false);
#endif #endif
#ifdef Q_WS_MAC
CheckBox_AlwaysOnTop->setVisible(false);
#endif
#ifdef GLOBAL_AUTOTYPE #ifdef GLOBAL_AUTOTYPE
pShortcut = autoType->getShortcut(); pShortcut = autoType->getShortcut();

4
src/mainwindow.cpp
Unescape View File

@ -84,8 +84,10 @@ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,bool ArgMin,bool Arg
//statusBar()->addWidget(StatusBarSelection,85); //statusBar()->addWidget(StatusBarSelection,85);
statusBar()->setVisible(config->showStatusbar()); statusBar()->setVisible(config->showStatusbar());
setStatusBarMsg(StatusBarReady); setStatusBarMsg(StatusBarReady);
#ifndef Q_WS_MAC
if (config->alwaysOnTop()) if (config->alwaysOnTop())
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
#endif
NormalCentralWidget=QMainWindow::centralWidget(); NormalCentralWidget=QMainWindow::centralWidget();
LockedCentralWidget=new QWidget(this); LockedCentralWidget=new QWidget(this);
@ -1133,6 +1135,7 @@ void KeepassMainWindow::OnExtrasSettings(){
EntryView->setAlternatingRowColors(config->alternatingRowColors()); EntryView->setAlternatingRowColors(config->alternatingRowColors());
SysTray->setVisible(config->showSysTrayIcon()); SysTray->setVisible(config->showSysTrayIcon());
menuBookmarks->menuAction()->setVisible(config->featureBookmarks()); menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
#ifndef Q_WS_MAC
if (config->alwaysOnTop() != oldAlwaysOnTop) { if (config->alwaysOnTop() != oldAlwaysOnTop) {
if (config->alwaysOnTop()) if (config->alwaysOnTop())
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
@ -1140,6 +1143,7 @@ void KeepassMainWindow::OnExtrasSettings(){
setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
show(); show();
} }
#endif
EventOccurred = true; EventOccurred = true;
if (config->lockOnInactivity() && config->lockAfterSec()!=0 && !inactivityTimer->isActive()){ if (config->lockOnInactivity() && config->lockAfterSec()!=0 && !inactivityTimer->isActive()){