From 68c45f069b28c1abd487f7c42387fa6ed445ac63 Mon Sep 17 00:00:00 2001
From: Graeme Geldenhuys <graeme@mastermaths.co.za>
Date: Wed, 27 Jul 2011 14:57:50 +0200
Subject: BaseGrid.HandleKeyPress and consume variable behaviour has changed.

Old behaviour we simply forced Consumed = True and later Consumed = False.
This has a very good chance of overwriting the origin consume value. We now
only set consume to True, if it is really so.
---
 src/gui/fpg_basegrid.pas | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/fpg_basegrid.pas b/src/gui/fpg_basegrid.pas
index c97122e4..1b45cfdf 100644
--- a/src/gui/fpg_basegrid.pas
+++ b/src/gui/fpg_basegrid.pas
@@ -828,7 +828,9 @@ var
   w: integer;
   r: integer;
 begin
-  consumed := True;
+  if consumed then
+    exit;
+
   case keycode of
     keyRight:
         begin
@@ -851,6 +853,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
 
     keyLeft:
@@ -863,6 +866,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
 
     keyUp:
@@ -873,6 +877,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
 
     keyDown:
@@ -883,6 +888,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
 
     keyPageUp:
@@ -897,6 +903,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
 
     keyPageDown:
@@ -911,6 +918,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
         
     keyHome:
@@ -930,6 +938,7 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
         
     keyEnd:
@@ -949,11 +958,9 @@ begin
             FollowFocus;
             RePaint;
           end;
+          consumed := True;
         end;
-
-  else
-    consumed := False;
-  end;
+  end;  { case }
   
   if consumed then
     CheckFocusChange;
-- 
cgit v1.2.3-70-g09d2