Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-05 10:07:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection

Browse source
This commit is contained in:
Atlante45 2015-03-16 15:53:59 +01:00
commit a9ed09a742
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/ui/ToolWindow.cpp
View file

@ -22,7 +22,9 @@ ToolWindow::ToolWindow(QWidget* parent) :
_hasShown(false), _hasShown(false),
_lastGeometry() { _lastGeometry() {
# ifndef Q_OS_LINUX
setDockOptions(QMainWindow::ForceTabbedDocks); setDockOptions(QMainWindow::ForceTabbedDocks);
# endif
Application::getInstance()->installEventFilter(this); Application::getInstance()->installEventFilter(this);
} }
@ -53,6 +55,7 @@ bool ToolWindow::event(QEvent* event) {
} }
bool ToolWindow::eventFilter(QObject* sender, QEvent* event) { bool ToolWindow::eventFilter(QObject* sender, QEvent* event) {
# ifndef Q_OS_LINUX
switch (event->type()) { switch (event->type()) {
case QEvent::WindowStateChange: case QEvent::WindowStateChange:
if (Application::getInstance()->getWindow()->isMinimized()) { if (Application::getInstance()->getWindow()->isMinimized()) {
@ -77,7 +80,7 @@ bool ToolWindow::eventFilter(QObject* sender, QEvent* event) {
default: default:
break; break;
} }
# endif
return false; return false;
} }