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

[GB.QT4]

Browse source 
* BUG: ShowModal() now honors the initial window state (full screen, 
  maximized...)


git-svn-id: svn://localhost/gambas/trunk@5612 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2013-04-06 12:34:59 +00:00
parent cb37409e50
commit 8b6c4b72f8
2 changed files with 53 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1662,6 +1662,56 @@ void MyMainWindow::activateLater()
activateWindow();
}
void MyMainWindow::present()
{
if (!isVisible())
{
//X11_window_startup(WINDOW->winId(), THIS->x, THIS->y, THIS->w, THIS->h);
if (isUtility() && _resizable)
setMinimumSize(THIS->minw, THIS->minh);
if (getState() & Qt::WindowMinimized)
showMinimized();
else if (getState() & Qt::WindowFullScreen)
showFullScreen();
else if (getState() & Qt::WindowMaximized)
showMaximized();
else
show();
if (isUtility() && _resizable)
setSizeGrip(true);
else
setSizeGrip(false);
if (hasBorder())
{
//MAIN_process_events();
//usleep(50000);
//_activate = TRUE;
//if (isToolbar())
//QTimer::singleShot(50, this, SLOT(activateLater()));
//else
activateWindow();
}
}
else
{
//_activate = true;
if (getState() & Qt::WindowMinimized)
{
setState(windowState() & ~Qt::WindowMinimized);
//qDebug("_activate set #2");
}
raise();
if (hasBorder())
activateWindow();
}
}
void MyMainWindow::showActivate(QWidget *transient)
{
CWIDGET *_object = CWidget::get(this);
@ -1694,63 +1744,7 @@ void MyMainWindow::showActivate(QWidget *transient)
initProperties();
//::sleep(1);
if (!isVisible())
{
//X11_window_startup(WINDOW->winId(), THIS->x, THIS->y, THIS->w, THIS->h);
if (isUtility() && _resizable)
setMinimumSize(THIS->minw, THIS->minh);
if (getState() & Qt::WindowMinimized)
showMinimized();
else if (getState() & Qt::WindowFullScreen)
showFullScreen();
else if (getState() & Qt::WindowMaximized)
showMaximized();
else
show();
if (isUtility() && _resizable)
setSizeGrip(true);
else
setSizeGrip(false);
/*if (_type == _NET_WM_WINDOW_TYPE_NORMAL
|| _type == _NET_WM_WINDOW_TYPE_DOCK
|| _type == _NET_WM_WINDOW_TYPE_TOOLBAR
|| _type == _NET_WM_WINDOW_TYPE_MENU
|| _type == _NET_WM_WINDOW_TYPE_UTILITY
|| _type == _NET_WM_WINDOW_TYPE_DIALOG
|| _type == _NET_WM_WINDOW_TYPE_DROPDOWN_MENU
|| _type == _NET_WM_WINDOW_TYPE_POPUP_MENU
|| _type == _NET_WM_WINDOW_TYPE_COMBO)
{*/
if (hasBorder())
{
//MAIN_process_events();
//usleep(50000);
//_activate = TRUE;
//if (isToolbar())
//QTimer::singleShot(50, this, SLOT(activateLater()));
//else
activateWindow();
}
}
else
{
//_activate = true;
if (getState() & Qt::WindowMinimized)
{
setState(windowState() & ~Qt::WindowMinimized);
//qDebug("_activate set #2");
}
raise();
if (hasBorder())
activateWindow();
}
present();
afterShow();
#ifndef NO_X_WINDOW
@ -1791,7 +1785,7 @@ void MyMainWindow::showModal(void)
_enterLoop = false; // Do not call exitLoop() if we do not entered the loop yet!
show();
present();
afterShow();
#ifndef NO_X_WINDOW

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

@ -190,6 +190,7 @@ public:
~MyMainWindow();
void initProperties();
void present();
void showActivate(QWidget *parent = 0);
//void activateLater() { _activate = true; }
void showModal();