From 3628c03a365c959776307e6cb5ea491e6bdb3dd2 Mon Sep 17 00:00:00 2001
From: Allen Webster <editor@4coder.net>
Date: Mon, 23 May 2016 14:19:04 -0400
Subject: [PATCH] bug with min_y, max_y

---
 4ed_file_view.cpp | 29 +++++++++++++++++------------
 README.txt        |  2 +-
 SUPERREADME.txt   |  2 +-
 build_all.bat     |  4 ++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp
index 5b64725e..154bce7a 100644
--- a/4ed_file_view.cpp
+++ b/4ed_file_view.cpp
@@ -3231,20 +3231,25 @@ view_get_cursor_scroll_change_state(View *view){
         if ((view->prev_cursor_pos != pos)){
             result |= CursorScroll_Cursor;
         }
-        
-        if (view->current_scroll){
-            if (!gui_scroll_eq(view->current_scroll, &view->gui_target.scroll_original)){
-                result |= CursorScroll_Scroll;
-            }
+    }
+    
+    if (view->current_scroll){
+        if (!gui_scroll_eq(view->current_scroll, &view->gui_target.scroll_original)){
+            result |= CursorScroll_Scroll;
         }
-        
+    }
+    
+    if (context.mode == VUI_None){
         context.file = view->file_data.file;
-        context.scroll = view->gui_target.scroll_id;
-        context.mode = view->showing_ui;
-        
-        if (!context_eq(view->prev_context, context)){
-            result |= CursorScroll_ContextChange;
-        }
+    }
+    else{
+        context.file = view->prev_context.file;
+    }
+    context.scroll = view->gui_target.scroll_id;
+    context.mode = view->showing_ui;
+    
+    if (!context_eq(view->prev_context, context)){
+        result |= CursorScroll_ContextChange;
     }
     
     return(result);
diff --git a/README.txt b/README.txt
index dee1fb03..1363ee46 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-Distribution Date: 20.5.2016 (dd.mm.yyyy)
+Distribution Date: 23.5.2016 (dd.mm.yyyy)
 
 Thank you for contributing to the 4coder project!
 
diff --git a/SUPERREADME.txt b/SUPERREADME.txt
index d1995677..e609f1b7 100644
--- a/SUPERREADME.txt
+++ b/SUPERREADME.txt
@@ -1,4 +1,4 @@
-Distribution Date: 20.5.2016 (dd.mm.yyyy)
+Distribution Date: 23.5.2016 (dd.mm.yyyy)
 
 Thank you for contributing to the 4coder project!
 
diff --git a/build_all.bat b/build_all.bat
index e3a63c20..c941f561 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -22,8 +22,8 @@ popd
 
 pushd ..\build
 REM call "..\code\buildsuper.bat" ..\code\4coder_default_bindings.cpp
-call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp
-REM call "..\code\buildsuper.bat" ..\code\power\4coder_casey.cpp
+REM call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp
+call "..\code\buildsuper.bat" ..\code\power\4coder_casey.cpp
 if %ERRORLEVEL% neq 0 (set FirstError=1)
 
 set EXPORTS=/EXPORT:app_get_functions