fixes to shift home key

Author: cdburke

common.pri

@@ -1,6 +1,6 @@
 # included by main.pro and lib.pro
 
-VERSION = 2.6.1
+VERSION = 2.6.2
 JDLLVER = 9.7
 BUILDVERSION = 1
 

lib/base/bedit.cpp

@@ -85,6 +85,7 @@ void Bedit::homeshift()
 {
   QString ws=" \t";
   QTextCursor c = textCursor();
+  int sel = qMax(0,c.anchor() - c.position());
   QString txt = c.block().text();
   int pos=getpositioninblock(c);
   txt = txt.left(pos);
@@ -95,7 +96,7 @@ void Bedit::homeshift()
       break;
     }
   int cur=c.position();
-  setselect(cur-pos+mov,pos-mov);
+  setselect(cur-pos+mov,sel+pos-mov);
 }
 
 // ---------------------------------------------------------------------

lib/base/nedit.cpp

@@ -58,9 +58,12 @@ void Nedit::keyPressEvent(QKeyEvent *e)
   bool shift = mod.testFlag(Qt::ShiftModifier);
   bool ctrl = mod.testFlag(Qt::ControlModifier);
   int key = e->key();
-  if (key==Qt::Key_Home && (ctrl==false) && shift==false)
-    home();
-  else
+  if (key==Qt::Key_Home && (ctrl==false)) {
+    if (shift==false)
+      home();
+    else
+      homeshift();
+  } else
     Bedit::keyPressEvent(e);
 }
 

lib/base/textedit.cpp

@@ -89,6 +89,7 @@ void TextEdit::homeshift()
 {
   QString ws=" \t";
   QTextCursor c = textCursor();
+  int sel = qMax(0,c.anchor() - c.position());
   QString txt = c.block().text();
   int pos=getpositioninblock(c);
   txt = txt.left(pos);
@@ -99,7 +100,7 @@ void TextEdit::homeshift()
       break;
     }
   int cur=c.position();
-  setselect(cur-pos+mov,pos-mov);
+  setselect(cur-pos+mov,sel+pos-mov);
 }
 
 // ---------------------------------------------------------------------