From 541aa2bcf714c0b256e9345d180f3bbec48d4790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 2 Dec 2001 16:28:13 +0000 Subject: [PATCH] inset-sel patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3132 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 15 +++++++++++++++ src/ChangeLog | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 628522e855..1fb1f9c5a6 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -776,7 +776,21 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, // 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 @@ void BufferView::Pimpl::workAreaButtonRelease(int x, int y, #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) { diff --git a/src/ChangeLog b/src/ChangeLog index d07fb1c5ae..28bc7a2534 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-12-01 John Levon + + * BufferView_pimpl.C: refuse to open an inset when + there's a selection. + 2001-11-30 Juergen Vigna * tabular.C (LyXTabular): add a same_id to set the same id's in the