EditTextView.st
branchtext-view-selection-refactoring
changeset 4970 36ec8c9fde52
parent 4969 ddcde42e07bf
child 4973 e78f1243d4ef
--- a/EditTextView.st	Tue Mar 25 16:37:50 2014 +0000
+++ b/EditTextView.st	Tue Mar 25 17:35:56 2014 +0000
@@ -4706,9 +4706,9 @@
             selectionStartLine := clickStartLine := cursorLine. selectionEndLine := cursorLine + 1.
             selectionStartCol := clickStartCol := cursorCol.
             selectionEndCol := cursorCol - 1.
-            selectionEndCol == 1 ifTrue:[
-                selectionEndCol := 0.
-            ].
+"/            selectionEndCol == 1 ifTrue:[
+"/                selectionEndCol := 0.
+"/            ].
             self setCursorLine: cursorLine + 1.
             self validateNewSelection.
             self selectionChanged.
@@ -4827,7 +4827,7 @@
         ].
     ].
 
-    "Modified: / 30-08-2013 / 00:16:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-03-2014 / 17:24:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doKeyPress:key x:x y:y
@@ -5290,7 +5290,7 @@
     ].
 !
 
-extendSelectionToX:x y:y
+extendSelectionToX:x y:y setPrimarySelection: primary
     "mouse-move while button was pressed - handle selection changes"
 
     " Overwritten here to move cursor position to start/end of the
@@ -5301,7 +5301,7 @@
     oldClickLine := clickStartLine.
     oldClickCol := clickStartCol.
 
-    super extendSelectionToX:x y:y.
+    super extendSelectionToX:x y:y setPrimarySelection: primary.
 
     self hasSelection ifFalse: [ ^ self ].
 
@@ -5333,8 +5333,7 @@
     self setCursorCol: newCursorCol. 
     self setCursorLine: newCursorLine.
 
-    "Created: / 28-08-2013 / 15:28:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 28-08-2013 / 17:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 25-03-2014 / 17:32:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 handleNonCommandKey:keyArg
@@ -7677,7 +7676,7 @@
      Shift-Home & Shift-End. "
 
     "/ Following comment is in czech and thus now very useful.
-    "/ However I (JV) keep it here as this is one of the very
+    "/ However I (JV) kept it here as this is one of the very
     "/ first fix/hack we made to Smalltalk/X ages ago, if not
     "/ the very first one. Actually, this method and comment was 
     "/ written by Martin Dvorak. Yeah, being bit nostalgic...
@@ -7694,10 +7693,10 @@
     curCol := cursorCol.
 
     self hasSelection ifTrue: [
-        startLine := selectionStartLine .
-        startCol := selectionStartCol .
-        endLine := selectionEndLine .
-        endCol := selectionEndCol .
+        startLine := selectionStartLine.
+        startCol := selectionStartCol.
+        endLine := selectionEndLine.
+        endCol := selectionEndCol.
     ] ifFalse:[
         startLine := endLine := curLine.
         startCol := curCol.
@@ -7750,6 +7749,7 @@
     cursorWasShown ifTrue:[self showCursor].
 
     "Modified: / 28-08-2013 / 01:23:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (comment): / 25-03-2014 / 17:18:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 autoMoveCursorToEndOfSelection