adds a drag region to the mist sidebar (#820)

ethereum · Jun 15, 2016 · c654097 · c654097
1 parent 3117c4d
commit c654097
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/interface/client/styles/layout.import.less b/interface/client/styles/layout.import.less
@@ -60,6 +60,7 @@ body, html {
     margin: 0;
     overflow: hidden;
     background: @colorWinBackgroundFocus;
+    -webkit-app-region: drag;
 
     &.app-blur {
         background: @colorWinBackgroundBlur;
@@ -92,6 +93,11 @@ aside {
     bottom: 0;
     // padding-top: @gridHeight/2;
     width: @widthSideBar;
+    -webkit-app-region: drag;
+
+    nav {
+        -webkit-app-region: no-drag;
+    }
 
     &:before {
         content: " ";
@@ -167,5 +173,6 @@ webview {
     bottom: 0;
     overflow: hidden;
     margin-top: @gridHeight*2;
-    border-top: solid 1px rgba(0, 0, 0, 0.1)
+    border-top: solid 1px rgba(0, 0, 0, 0.1);
+    -webkit-app-region: no-drag;
 }
diff --git a/interface/client/templates/elements/img.js b/interface/client/templates/elements/img.js
@@ -18,7 +18,7 @@ Template['elements_img'].onRendered(function(){
 
 Template['elements_img'].helpers({
     /**
-    This helper will preload the image, and then incject it later after its loaded
+    This helper will preload the image, and then inject it later after its loaded
 
     @method (preload)
     */

diff --git a/interface/client/templates/popupWindows/splashScreen.js b/interface/client/templates/popupWindows/splashScreen.js
@@ -99,8 +99,9 @@ Template['popupWindows_splashScreen'].onCreated(function(){
                 // Select the appropriate message
                 if(web3.net.peerCount > 0) {
                     // Check which state we are
-                    if (lastSyncData.knownStates > lastSyncData.lastKnownStates 
-                        || (lastSyncData.pulledStates / lastSyncData.knownStates) < 0.9  ) {
+
+                    if  (   lastSyncData.pulledStates != Math.round(lastSyncData._displayState) 
+                        ||  lastSyncData.knownStates != Math.round(lastSyncData._displayKnownStates)) {
                         // Mostly downloading new states
                         translationString = 'mist.startScreen.nodeSyncInfoStates';
 
@@ -116,7 +117,6 @@ Template['popupWindows_splashScreen'].onCreated(function(){
 
                 // Saves data as numbers (hex)
                 lastSyncData._highestBlock = lastSyncData.highestBlock;
-                lastSyncData.lastKnownStates = lastSyncData.knownStates;
 
                 // saves data as pretty strings
                 lastSyncData.highestBlock = numeral(lastSyncData.highestBlock).format('0,0');