* math_nestinset.C (lfunMousePress): on button 2 press, paste

inner LyX selection if it exists (bug 2779).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14813 a592a061-630c-0410-9148-cb99ea01b6c8

src/mathed/ChangeLog

@@ -1,3 +1,8 @@
+2006-08-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* math_nestinset.C (lfunMousePress): on button 2 press, paste
+	inner LyX selection if it exists (bug 2779).
+
 2006-08-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* math_nestinset.C (script): when creating a script inset, handle

src/mathed/math_nestinset.C

@@ -1032,19 +1032,19 @@ InsetBase * MathNestInset::editXY(LCursor & cur, int x, int y)
 void MathNestInset::lfunMousePress(LCursor & cur, FuncRequest & cmd)
 {
 	//lyxerr << "## lfunMousePress: buttons: " << cmd.button() << endl;
+	BufferView & bv = cur.bv();
 	if (cmd.button() == mouse_button::button1) {
 		//lyxerr << "## lfunMousePress: setting cursor to: " << cur << endl;
-		cur.bv().mouseSetCursor(cur);
-	}
-
-	if (cmd.button() == mouse_button::button2) {
+		bv.mouseSetCursor(cur);
+	} else if (cmd.button() == mouse_button::button2) {
 		MathArray ar;
-		asArray(cur.bv().getClipboard(), ar);
-		cur.clearSelection();
-		editXY(cur, cmd.x, cmd.y);
+		if (cur.selection())
+			asArray(bv.cursor().selectionAsString(false), ar);
+		else
+			asArray(bv.getClipboard(), ar);
+
 		cur.insert(ar);
-		cur.bv().update();
-		return;
+		bv.mouseSetCursor(cur);
 	}
 }
 

status.14x

@@ -80,6 +80,9 @@ What's new
 - Handle properly script insets which nucleus has more than one
   element (like {a'}^{2}).
 
+- On button 2 press in math inset, paste inner LyX selection if it
+  exists (bug 2779).
+
 - Fix disabling of some toolbar icons after closing a dialog (bug 2423).
 
 - Fix editing of document while Error List dialog is open (bug 2179).