Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 09:34:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more indentation changes

Browse source
This commit is contained in:
Niraj Venkat 2015-06-03 14:59:07 -07:00
parent 694272ffaa
commit 92248d23e7
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
interface/src/MainWindow.cpp
View file

@ -26,9 +26,9 @@
#include "Util.h" #include "Util.h"
MainWindow::MainWindow(QWidget* parent) : MainWindow::MainWindow(QWidget* parent) :
QMainWindow(parent), QMainWindow(parent),
_windowGeometry("WindowGeometry"), _windowGeometry("WindowGeometry"),
_windowState("WindowState", 0) _windowState("WindowState", 0)
{ {
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -94,33 +94,29 @@ void MainWindow::changeEvent(QEvent* event) {
stateChangeEvent->oldState() == Qt::WindowMaximized) && stateChangeEvent->oldState() == Qt::WindowMaximized) &&
windowState() == Qt::WindowMinimized) { windowState() == Qt::WindowMinimized) {
emit windowShown(false); emit windowShown(false);
} } else {
else {
emit windowShown(true); emit windowShown(true);
} }
if (isFullScreen() != Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen)) { if (isFullScreen() != Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen)) {
Menu::getInstance()->setIsOptionChecked(MenuOption::Fullscreen, isFullScreen()); Menu::getInstance()->setIsOptionChecked(MenuOption::Fullscreen, isFullScreen());
} }
} } else if (event->type() == QEvent::ActivationChange) {
else if (event->type() == QEvent::ActivationChange) {
if (isActiveWindow()) { if (isActiveWindow()) {
emit windowShown(true); emit windowShown(true);
} } else {
else {
emit windowShown(false); emit windowShown(false);
} }
} }
QMainWindow::changeEvent(event); QMainWindow::changeEvent(event);
} }
void MainWindow::dragEnterEvent(QDragEnterEvent* event) void MainWindow::dragEnterEvent(QDragEnterEvent* event) {
{ if (event->mimeData()) {
if (event->mimeData())
event->acceptProposedAction(); event->acceptProposedAction();
}
} }
void MainWindow::dropEvent(QDropEvent* event) void MainWindow::dropEvent(QDropEvent* event) {
{
QCoreApplication::sendEvent(QCoreApplication::instance(), event); QCoreApplication::sendEvent(QCoreApplication::instance(), event);
} }