José Matos wrote:
On Wednesday 22 August 2007 13:40:09 Abdelrazak Younes wrote:
Jose, do you want me to proceed?
Yes. Please coordinate with Bo since this is his code.
I've committed it.
Abdel.
Author: younes
Date: Fri Aug 24 15:53:45 2007
New Revision: 19770
URL: http://www.lyx.org/trac/changeset/19770
Log:
Bugfix: the current cursor font was not reset when going to a bookmark.
Modified:
lyx-devel/branches/BRANCH_1_5_X/src/BufferView.cpp
lyx-devel/branches/BRANCH_1_5_X/src/frontends/LyXView.cpp
lyx-devel/branches/BRANCH_1_5_X/status.15x
Modified: lyx-devel/branches/BRANCH_1_5_X/src/BufferView.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/branches/BRANCH_1_5_X/src/BufferView.cpp?rev=19770
==============================================================================
--- lyx-devel/branches/BRANCH_1_5_X/src/BufferView.cpp (original)
+++ lyx-devel/branches/BRANCH_1_5_X/src/BufferView.cpp Fri Aug 24
15:53:45 2007
@@ -546,6 +546,7 @@
break;
}
setCursor(dit);
+ buffer_->text().setCurrentFont(cursor_);
// Note: return bottom (document) level pit.
return boost::make_tuple(cursor_.bottom().pit(),
cursor_.bottom().pos(), top_id);
}
@@ -561,6 +562,7 @@
it.pit() = bottom_pit;
it.pos() = min(bottom_pos, it.paragraph().size());
setCursor(it);
+ buffer_->text().setCurrentFont(cursor_);
return boost::make_tuple(it.pit(), it.pos(),
it.paragraph().id());
}
Modified: lyx-devel/branches/BRANCH_1_5_X/src/frontends/LyXView.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/branches/BRANCH_1_5_X/src/frontends/LyXView.cpp?rev=19770
==============================================================================
--- lyx-devel/branches/BRANCH_1_5_X/src/frontends/LyXView.cpp (original)
+++ lyx-devel/branches/BRANCH_1_5_X/src/frontends/LyXView.cpp Fri Aug 24
15:53:45 2007
@@ -244,7 +244,6 @@
if (work_area_->bufferView().moveToPosition(pit, pos, 0,
0).get<1>()) {
if (work_area_->bufferView().fitCursor())
work_area_->bufferView().updateMetrics(false);
-
newBuffer->text().setCurrentFont(work_area_->bufferView().cursor());
updateMenubar();
updateToolbars();
updateLayoutChoice();
Modified: lyx-devel/branches/BRANCH_1_5_X/status.15x
URL:
http://www.lyx.org/trac/file/lyx-devel/branches/BRANCH_1_5_X/status.15x?rev=19770
==============================================================================
--- lyx-devel/branches/BRANCH_1_5_X/status.15x (original)
+++ lyx-devel/branches/BRANCH_1_5_X/status.15x Fri Aug 24 15:53:45 2007
@@ -80,6 +80,8 @@
- Fix crash when using down cursor in an empty math subscript (Bug 4117).
+- Reset current cursor font when going to a bookmark.
+
* DOCUMENTATION
- Fix installation links for Hebrew (bug 4165)
