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

Fixed problem when restoring window after auto-type (closes #1978861)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@202 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 17 years ago
parent e47df76b56
commit cfcbe82138
1 changed files with 3 additions and 5 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. 8
      src/lib/AutoType_X11.cpp

8
src/lib/AutoType_X11.cpp
Unescape View File

@ -130,7 +130,7 @@ void AutoType::perform(IEntryHandle* entry, QString& err,bool hideWindow,int nr)
if (Keys[i].type==TypeKey){ if (Keys[i].type==TypeKey){
int keycode=XKeysymToKeycode(pDisplay,Keys[i].data); int keycode=XKeysymToKeycode(pDisplay,Keys[i].data);
if (keycode==0){ if (keycode==0){
err = QCoreApplication::translate("AutoType","Auto-Type string contains illegal characters"); err = QCoreApplication::translate("AutoType","Auto-Type string contains invalid characters");
break; break;
} }
int mods=HelperX11::getModifiers(pDisplay,Keys[i].data,keycode); int mods=HelperX11::getModifiers(pDisplay,Keys[i].data,keycode);
@ -144,7 +144,7 @@ void AutoType::perform(IEntryHandle* entry, QString& err,bool hideWindow,int nr)
AutoTypePrivate::sleepKeyStrokeDelay(); AutoTypePrivate::sleepKeyStrokeDelay();
} }
else if (Keys[i].type==Delay){ else if (Keys[i].type==Delay){
QCoreApplication::processEvents(); QApplication::processEvents();
AutoTypePrivate::sleep(Keys[i].data); AutoTypePrivate::sleep(Keys[i].data);
} }
} }
@ -154,10 +154,8 @@ void AutoType::perform(IEntryHandle* entry, QString& err,bool hideWindow,int nr)
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),false,CurrentTime); XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),false,CurrentTime);
} }
if (hideWindow){ if (hideWindow && !(config->showSysTrayIcon() && config->minimizeTray()) )
MainWin->showMinimized(); MainWin->showMinimized();
XIconifyWindow(pDisplay, MainWin->winId(), MainWin->x11Info().screen()); // workaround for Gnome
}
} }
#ifdef GLOBAL_AUTOTYPE #ifdef GLOBAL_AUTOTYPE