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

[GB.QT]

Browse source 
* BUG: Correctly manage windows whose Type is Toolbar, as in Gambas 2.


git-svn-id: svn://localhost/gambas/trunk@1660 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2008-10-30 11:50:31 +00:00
parent f6ceba1017
commit 005ce5eeec
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gb.qt/src/CWindow.cpp
View file

@ -1135,7 +1135,7 @@ END_PROPERTY
#endif //------------------------------------------------------------------------------------------ #endif //------------------------------------------------------------------------------------------
#if 0
BEGIN_PROPERTY(CWINDOW_tool) BEGIN_PROPERTY(CWINDOW_tool)
if (!THIS->toplevel) if (!THIS->toplevel)
@ -1160,7 +1160,7 @@ BEGIN_PROPERTY(CWINDOW_tool)
} }
END_PROPERTY END_PROPERTY
#endif
BEGIN_METHOD_VOID(CWINDOW_center) BEGIN_METHOD_VOID(CWINDOW_center)
@ -1598,7 +1598,7 @@ void MyMainWindow::showActivate(QWidget *transient)
} }
#ifndef NO_X_WINDOW #ifndef NO_X_WINDOW
if (newParentWidget && getTool()) if (newParentWidget && isToolbar())
X11_set_transient_for(winId(), newParentWidget->winId()); X11_set_transient_for(winId(), newParentWidget->winId());
#endif #endif
@ -1626,7 +1626,7 @@ void MyMainWindow::showActivate(QWidget *transient)
else else
show(); show();
if (getTool()) if (isToolbar())
{ {
qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput); qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
usleep(50000); usleep(50000);
@ -1721,6 +1721,12 @@ void MyMainWindow::showModal(void)
} }
bool MyMainWindow::isToolbar(void)
{
return getType() == _NET_WM_WINDOW_TYPE_UTILITY;
}
/*
void MyMainWindow::setTool(bool t) void MyMainWindow::setTool(bool t)
{ {
WFlags f = getWFlags(); WFlags f = getWFlags();
@ -1732,6 +1738,7 @@ void MyMainWindow::setTool(bool t)
doReparent(CWINDOW_Main ? (MyMainWindow *)QWIDGET(CWINDOW_Main) : 0, f, pos()); doReparent(CWINDOW_Main ? (MyMainWindow *)QWIDGET(CWINDOW_Main) : 0, f, pos());
} }
*/
void MyMainWindow::moveSizeGrip() void MyMainWindow::moveSizeGrip()
{ {

4
gb.qt/src/CWindow.h
View file

@ -193,11 +193,9 @@ public:
#else #else
int getType(void); int getType(void);
void setType(int type); void setType(int type);
bool isToolbar(void);
#endif #endif
bool getTool(void) { return testWFlags(WStyle_Tool); }
void setTool(bool);
void setSizeGrip(bool); void setSizeGrip(bool);
void moveSizeGrip(); void moveSizeGrip();