From a43593c3b2dde13b495ada6d965459db97041b36 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 29 May 2015 15:23:55 -0700
Subject: [PATCH] Dialog opacity transition tidying

---
 interface/resources/qml/controls/Dialog.qml      | 4 ++--
 interface/resources/qml/styles/HifiConstants.qml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/controls/Dialog.qml b/interface/resources/qml/controls/Dialog.qml
index 15c8b7bafc..aa14e2fcba 100644
--- a/interface/resources/qml/controls/Dialog.qml
+++ b/interface/resources/qml/controls/Dialog.qml
@@ -31,7 +31,7 @@ DialogBase {
      * Support for animating the dialog in and out. 
      */
     enabled: false
-	opacity: 0.0
+    opacity: 1.0
     
     // The offscreen UI will enable an object, rather than manipulating it's 
     // visibility, so that we can do animations in both directions.  Because 
@@ -46,7 +46,7 @@ DialogBase {
     // The actual animator
     Behavior on opacity {
         NumberAnimation {
-            duration: 300
+            duration: animationDuration
             easing.type: Easing.OutCubic
         }
     }
diff --git a/interface/resources/qml/styles/HifiConstants.qml b/interface/resources/qml/styles/HifiConstants.qml
index d24e9ca9be..702a396afb 100644
--- a/interface/resources/qml/styles/HifiConstants.qml
+++ b/interface/resources/qml/styles/HifiConstants.qml
@@ -56,6 +56,6 @@ Item {
 
     QtObject {
         id: effects
-        readonly property int fadeInDuration: 400
+        readonly property int fadeInDuration: 300
     }
 }