From 81ad100610c7542f7cf6ecd690d442d06116e7f5 Mon Sep 17 00:00:00 2001
From: Craig Watson <craig@watsons.ch>
Date: Wed, 11 May 2016 17:13:38 +0200
Subject: [PATCH] Fix for window being placed badly on the screen when
 returning to board mode from desktop mode on some environments

---
 src/core/UBApplicationController.cpp          | 2 +-
 src/desktop/UBDesktopAnnotationController.cpp | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp
index eb3d858b..daee10dd 100644
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@@ -375,7 +375,7 @@ void UBApplicationController::showBoard()
 
     mUninoteController->hideWindow();
 
-    mMainWindow->show();
+    UBPlatformUtils::showFullScreen(mMainWindow);
 
     emit mainModeChanged(Board);
 
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index a5b8e0aa..1fb97835 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -411,13 +411,7 @@ void UBDesktopAnnotationController::hideWindow()
 
 void UBDesktopAnnotationController::goToUniboard()
 {
-    onToolClicked();
-    hideWindow();
-
-    UBPlatformUtils::setDesktopMode(false);
-    UBDrawingController::drawingController()->setInDestopMode(false);
-
-    emit restoreUniboard();
+    UBApplication::applicationController->showBoard();
 }