1) make sure no selection exists at inset-uncollapse time to prevent drawing errors

2) don't open an inset when we finish a selection. This was a really really annoying
"feature", then when you end up over an inset at the end of a selection, it opened
the inset.

please apply

thanks
john

p.s. the X11 selection buffer patch stil not applied ?

-- 
"We are all in the gutter, but some of us are looking at the pavement." 
        - Morrissey
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.421
diff -u -r1.421 ChangeLog
--- src/ChangeLog       2001/11/29 17:12:17     1.421
+++ src/ChangeLog       2001/12/01 05:55:59
@@ -1,3 +1,8 @@
+2001-12-01  John Levon  <[EMAIL PROTECTED]>
+
+       * BufferView_pimpl.C: refuse to open an inset when
+         there's a selection.
+ 
 2001-11-28  André Pönitz <[EMAIL PROTECTED]>
 
        * all the files from the change on 2001/11/26:
Index: src/BufferView_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.178
diff -u -r1.178 BufferView_pimpl.C
--- src/BufferView_pimpl.C      2001/11/29 17:12:16     1.178
+++ src/BufferView_pimpl.C      2001/12/01 05:56:05
@@ -776,7 +776,21 @@
                // Inset like error, notes and figures
                selection_possible = false;
 
+               // if we reach this point with a selection, it
+               // must mean we are currently selecting.
+               // But we don't want to open the inset
+               // because that is annoying for the user. 
+               // So just pretend we didn't hit it.
+               // this is OK because a "kosher" ButtonRelease
+               // will follow a ButtonPress that clears
+               // the selection.
+               // Note this also fixes selection drawing
+               // problems if we end up opening an inset
+               if (bv_->getLyXText()->selection.set())
+                       return;
+ 
                // CHECK fix this proper in 0.13
+               // well, maybe 13.0 !!!!!!!!!
 
                // Following a ref shouldn't issue
                // a push on the undo-stack
@@ -810,6 +824,7 @@
 
 #ifdef WITH_WARNINGS
 #warning variable c is set but never used. What is it good for?? (JMarc)
+#warning isnt this code dead ?? "open a float" ??? (jbl)
 #endif
        // check whether we want to open a float
        if (bv_->text) {

Reply via email to