github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-11 22:03:09 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*CtrlCore: Fixed popup focus issue in X11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5307 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-09-02 14:52:34 +00:00
parent 83fd93654d
commit 6d63dc0dcb
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/src.tpp/TcpSocket$en-us.tpp
View file

@ -343,4 +343,4 @@ SSL connection.&]
[s4; &]
[s5;:SSLInfo`:`:cert`_serial: [_^String^ String]_[* cert`_serial]&]
[s2;%% Serial number of certificate.&]
[s3; ]
[s3; ]]

4
uppsrc/CtrlCore/CtrlKbd.cpp
View file

@ -236,7 +236,9 @@ bool Ctrl::SetFocus0(bool activate)
if(!topwindow) topwindow = topctrl;
LLOG("SetFocus -> SetWndFocus: topwindow = " << UPP::Name(topwindow) << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd));
if(!topwindow->HasWndFocus() && !topwindow->SetWndFocus()) return false;// cxl 31.1.2004
#ifdef GUI_X11 // ugly temporary hack - popups not behaving right in MacOS
#ifdef PLATFORM_OSX11 // ugly temporary hack - popups not behaving right in MacOS
// before 2012-9-2 was #ifdef GUI_X11, but that caused issues in most linux distros (cxl)
// as parent window of popup always manages focus/keyboard for popup in X11
if(activate) // Dolik/fudadmin 2011-5-1
topctrl->SetWndForeground();
#else