anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix small clash between patches

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3229 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-12-17 15:08:51 +00:00
parent e8f7285df3
commit 12d3ca2886
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2001-12-17 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insettext.C (insetButtonRelease): fix compile problem
2001-12-17 Juergen Vigna <jug@sad.it>
* insettext.C (insetButtonPress): set the selection cursor!
@ -11,7 +15,7 @@
can be opened.
* insetcollapsable.C (insetButtonRelease): changed so that it can
open evetual existing popup dialogs on mousebutton==3.
open eventual existing popup dialogs on mousebutton==3.
* insetfloat.C (insetButtonRelease): removed not needed anymore!

2
src/insets/insettext.C
View File

@ -1009,7 +1009,7 @@ bool InsetText::insetButtonRelease(BufferView * bv, int x, int y, int button)
}
int tmp_x = x - drawTextXOffset;
int tmp_y = y + insetAscent - getLyXText(bv)->first;
Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y, button);
Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y);
bool ret = false;
if (inset) {
if (isHighlyEditableInset(inset)) {