luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.QT4]

Browse source 
* BUG: Fix initial window screen again.

[GB.QT5]
* BUG: Fix initial window screen again.


git-svn-id: svn://localhost/gambas/trunk@7286 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2015-09-07 00:30:33 +00:00
parent 70c569d138
commit 807893eed8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gb.qt4/src/CWindow.cpp
View file

@ -1850,6 +1850,7 @@ void MyMainWindow::showPopup(QPoint &pos)
setWindowFlags(Qt::Popup | flags);
setWindowModality(Qt::ApplicationModal);
THIS->popup = true;
/*if (_resizable && _border)
{
@ -1895,6 +1896,7 @@ void MyMainWindow::showPopup(QPoint &pos)
{
setWindowModality(Qt::NonModal);
setWindowFlags(Qt::Window | flags);
THIS->popup = false;
}
CWIDGET_leave_popup(save_popup);
@ -2697,7 +2699,7 @@ bool CWindow::eventFilter(QObject *o, QEvent *e)
{
MyMainWindow *w = (MyMainWindow *)o;
if (THIS->toplevel && (w->windowFlags() & Qt::Popup) == 0 && (!THIS->moved || w->isModal()))
if (THIS->toplevel && !THIS->popup && (!THIS->moved || w->isModal()))
w->center();
//handle_focus(THIS);

1
gb.qt4/src/CWindow.h
View file

@ -87,6 +87,7 @@ typedef
unsigned sticky : 1;
unsigned noTakeFocus : 1;
unsigned moved : 1;
unsigned popup : 1;
}
CWINDOW;