From 6bbcf0da2ac89f24c167cf8976562c68274a1b07 Mon Sep 17 00:00:00 2001
From: Ignacio Ortiz de Zuniga <ignacio@fivetech.com>
Date: Tue, 19 Feb 2002 09:42:01 +0000
Subject: [PATCH] 2002-02-19 10:40 UTC+0100 Ignacio Ortiz
 <ignacio@fivetech.com>

---
 harbour/source/rtl/tget.prg     | 17 +++++++++++------
 harbour/source/rtl/tgetlist.prg |  4 +---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index b8d6406d4f..386980bdd3 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -122,7 +122,7 @@ CLASS Get
    METHOD SetFocus()
    METHOD Undo()
    METHOD UnTransform()
-   METHOD UpdateBuffer() INLINE  ::buffer := ::PutMask(), ::Assign(), ::Display(), Self
+   METHOD UpdateBuffer() INLINE  ::buffer := ::PutMask(), ::Assign():Display(), Self
 
    METHOD VarGet()
    METHOD VarPut(xValue, lReFormat)
@@ -313,7 +313,11 @@ METHOD Display( lForced ) CLASS Get
    DEFAULT lForced TO .t.
 
    if ::HasScroll() .and. ::Pos != NIL
-      ::nDispPos := Max( 1, Min( ::Pos - Int( ::nDispLen / 2 ), ::nMaxLen - ::nDispLen + 1 ) )
+      if ::nDispLen > 8
+         ::nDispPos := Max( 1, Min( ::Pos - ::nDispLen + 4, ::nMaxLen - ::nDispLen + 1 ) )
+      else
+         ::nDispPos := Max( 1, Min( ::Pos - int( ::nDispLen / 2 ), ::nMaxLen - ::nDispLen + 1 ) )
+      endif
    endif
 
    if lForced .or. ( ::nDispPos != ::nOldPos )
@@ -537,6 +541,7 @@ METHOD overstrike( cChar ) CLASS Get
       ::lEdit  := .t.
    endif
 
+
    do while ! ::IsEditable( ::pos ) .and. ::pos <= ::nMaxLen
       ::pos++
    enddo
@@ -553,6 +558,7 @@ METHOD overstrike( cChar ) CLASS Get
    endif
 
    ::buffer := SubStr( ::buffer, 1, ::Pos - 1 ) + cChar + SubStr( ::buffer, ::Pos + 1 )
+
    ::Changed := !( ::unTransform() == ::Original )
    ::Assign()
    ::Right( .f. )
@@ -941,16 +947,15 @@ METHOD PutMask( xValue, lEdit ) CLASS Get
 
    if lEdit .and. ::type == "N" .and. ! Empty( ::cPicMask )
       nLen  := Len( cBuffer )
+      cMask := ::cPicMask
       if "E" $ ::cPicFunc
-         cMask := StrTran(::cPicMask, ",", Chr(1))
+         cMask := StrTran(cMask, ",", Chr(1))
          cMask := StrTran(cMask, ".", ",")
          cMask := StrTran(cMask, Chr(1), ".")
-      else
-         cMask := ::cPicFunc
       endif
       for nFor := 1 to nLen
          cChar := SubStr( cMask, nFor, 1 )
-         if cChar $ ",." .and. !( SubStr( cBuffer, nFor, 1 ) == cChar )
+         if cChar $ ",." .and. SubStr( cBuffer, nFor, 1 ) != cChar
             cBuffer := SubStr( cBuffer, 1, nFor - 1 ) + cChar + SubStr( cBuffer, nFor + 1 )
          endif
       next
diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg
index 5aee08d91f..b559116477 100644
--- a/harbour/source/rtl/tgetlist.prg
+++ b/harbour/source/rtl/tgetlist.prg
@@ -326,13 +326,11 @@ METHOD GetPostValidate() CLASS HBGetList
    endif
 
    if oGet:Changed
-//      oGet:Assign()
       oGet:UpdateBuffer()
-      oGet:Display()
       ::lUpdated := .t.
    endif
 
-   oGet:Reset()
+   oGet:Reset():Display()
 
    if oGet:PostBlock != NIL