anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-08 18:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed spurious cursor line bug!

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1155 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2000-10-25 14:37:39 +00:00
parent ddbec11708
commit 239a2e8928
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2000-10-25 Juergen Vigna <jug@sad.it>
* src/screen.C (ShowManualCursor): fixed another uint -> int problem.
2000-10-25 Lars Gullik Bjønnes <larsbj@lyx.org> 2000-10-25 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/support/filetools.C (MakeRelPath): change some types to * src/support/filetools.C (MakeRelPath): change some types to

1
src/insets/insettext.C
View File

@ -114,7 +114,6 @@ InsetText::~InsetText()
{ {
for(Cache::const_iterator cit = cache.begin(); cit != cache.end(); ++cit) for(Cache::const_iterator cit = cache.begin(); cit != cache.end(); ++cit)
delete (*cit).second; delete (*cit).second;
// deleteLyXText((*cit).first);
LyXParagraph * p = par->next; LyXParagraph * p = par->next;
delete par; delete par;
while(p) { while(p) {

10
src/screen.C
View File

@ -242,10 +242,8 @@ bool LyXScreen::FitManualCursor(LyXText * text,
void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y, void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
int asc, int desc, Cursor_Shape shape) int asc, int desc, Cursor_Shape shape)
{ {
unsigned int y1 = max(y - text->first - asc, 0); int y1 = max(y - text->first - asc, 0);
typedef unsigned int uint; int y2 = min(y - text->first + desc, (int)owner.height());
unsigned int y2 = min(y - text->first + desc, (int)owner.height());
// Secure against very strange situations // Secure against very strange situations
y2 = max(y2, y1); y2 = max(y2, y1);
@ -255,7 +253,7 @@ void LyXScreen::ShowManualCursor(LyXText const * text, int x, int y,
cursor_pixmap = 0; cursor_pixmap = 0;
} }
if (y2 > 0 && y1 < owner.height()) { if ((y2 > 0) && (y1 < int(owner.height()))) {
cursor_pixmap_h = y2 - y1 + 1; cursor_pixmap_h = y2 - y1 + 1;
cursor_pixmap_y = y1; cursor_pixmap_y = y1;
@ -458,8 +456,6 @@ void LyXScreen::ToggleToggle(LyXText * text, int y_offset, int x_offset)
- text->toggle_end_cursor.row()->baseline() - text->toggle_end_cursor.row()->baseline()
+ text->toggle_end_cursor.row()->height(); + text->toggle_end_cursor.row()->height();
typedef unsigned int uint;
bottom = min(max(bottom, text->first), (int)(text->first + owner.height())); bottom = min(max(bottom, text->first), (int)(text->first + owner.height()));
top = min(max(top, text->first), (int)(text->first + owner.height())); top = min(max(top, text->first), (int)(text->first + owner.height()));