From 623a3606eb26332434c9840a2f9117242d38a729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Wed, 26 Aug 2015 00:28:12 +0200
Subject: [PATCH] Fixed UI not reverting to previous state when exiting render
 dialog

---
 .../modeler/quickapp/MainModelerWindow.cpp    |  2 +-
 .../modeler/quickapp/qml/RenderDialog.qml     | 11 +++----
 src/interface/modeler/quickapp/qml/main.qml   | 32 ++++++++++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/interface/modeler/quickapp/MainModelerWindow.cpp b/src/interface/modeler/quickapp/MainModelerWindow.cpp
index 8f2cb2a..0db8809 100644
--- a/src/interface/modeler/quickapp/MainModelerWindow.cpp
+++ b/src/interface/modeler/quickapp/MainModelerWindow.cpp
@@ -128,7 +128,7 @@ void MainModelerWindow::keyReleaseEvent(QKeyEvent *event)
         {
             render_process->stopRender();
 
-            setState("Init");
+            setState(rootObject()->property("previous_state").toString());
         }
     }
     else
diff --git a/src/interface/modeler/quickapp/qml/RenderDialog.qml b/src/interface/modeler/quickapp/qml/RenderDialog.qml
index e335090..6263c94 100644
--- a/src/interface/modeler/quickapp/qml/RenderDialog.qml
+++ b/src/interface/modeler/quickapp/qml/RenderDialog.qml
@@ -10,13 +10,12 @@ BaseRectangle {
         preview_image.source = "image://renderpreviewprovider/live";
     }
 
-    onOpacityChanged: {
-        refresh();
-        render_progress.value = 0;
-    }
     onVisibleChanged: {
-        refresh();
-        render_progress.value = 0;
+        if (visible)
+        {
+            refresh();
+            render_progress.value = 0;
+        }
     }
 
     Image {
diff --git a/src/interface/modeler/quickapp/qml/main.qml b/src/interface/modeler/quickapp/qml/main.qml
index 07f0b37..a42404f 100644
--- a/src/interface/modeler/quickapp/qml/main.qml
+++ b/src/interface/modeler/quickapp/qml/main.qml
@@ -4,6 +4,7 @@ import Paysages 1.0
 OpenGLView {
     id: main_ui
     state: "Init"
+    property string previous_state
 
     width: 1000
     height: 700
@@ -148,6 +149,13 @@ OpenGLView {
         anchors.fill: parent
     }
 
+    onStateChanged: {
+        if (state != "Render Dialog")
+        {
+            previous_state = state;
+        }
+    }
+
     states: [
         State {
             name: "Water Mode"
@@ -157,6 +165,10 @@ OpenGLView {
                 target: water_section
                 enabled: true
             }
+            PropertyChanges {
+                target: tool_water
+                selected: true
+            }
         },
         State {
             name: "Atmosphere Mode"
@@ -166,6 +178,10 @@ OpenGLView {
                 target: atmosphere_section
                 enabled: true
             }
+            PropertyChanges {
+                target: tool_atmosphere
+                selected: true
+            }
         },
         State {
             name: "Render Mode"
@@ -175,6 +191,10 @@ OpenGLView {
                 target: render_toolbar
                 enabled: true
             }
+            PropertyChanges {
+                target: tool_render
+                selected: true
+            }
         },
         State {
             name: "File Mode"
@@ -184,18 +204,14 @@ OpenGLView {
                 target: file_toolbar
                 enabled: true
             }
+            PropertyChanges {
+                target: tool_file
+                selected: true
+            }
         },
         State {
             name: "Render Dialog"
 
-            PropertyChanges {
-                target: primary_toolbar
-                enabled: false
-            }
-            PropertyChanges {
-                target: camera_choice
-                enabled: false
-            }
             PropertyChanges {
                 target: render_dialog
                 enabled: true