anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 00:39:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final tweaks for 1.1.5fix2

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/lyx-1_1_5@1134 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-10-18 09:05:23 +00:00
parent d5f72072bf
commit 9fd770a4aa
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2000-10-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/version.h (LYX_RELEASE): version 1.1.5fix2 released.
* src/minibuffer.C (peek_event): return 1 if there has been a
mouse click in the minibuffer.
2000-10-17 Dekel Tsur <dekelts@tau.ac.il>
* src/lyxfunc.C (Dispatch): Call to showState() after insertion of
a char only if real_current_font was changed.
2000-10-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-10-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/lyx_gui.C (init): increase max number of menus to 128. * src/lyx_gui.C (init): increase max number of menus to 128.

15
src/lyxfunc.C
View File

@ -2565,6 +2565,7 @@ string LyXFunc::Dispatch(int ac,
case LFUN_SELFINSERT: case LFUN_SELFINSERT:
{ {
LyXFont old_font(owner->view()->text->real_current_font);
for (string::size_type i = 0; i < argument.length(); ++i) { for (string::size_type i = 0; i < argument.length(); ++i) {
owner->view()->text->InsertChar(argument[i]); owner->view()->text->InsertChar(argument[i]);
// This needs to be in the loop, or else we // This needs to be in the loop, or else we
@ -2576,9 +2577,10 @@ string LyXFunc::Dispatch(int ac,
owner->view()->text->cursor; owner->view()->text->cursor;
moveCursorUpdate(false); moveCursorUpdate(false);
// current_font.number can change so we need to update // real_current_font.number can change so we need to update
// the minibuffer // the minibuffer
owner->getMiniBuffer()->Set(CurrentState(owner->view())); if (old_font != owner->view()->text->real_current_font)
owner->getMiniBuffer()->Set(CurrentState(owner->view()));
} }
break; break;
@ -2680,7 +2682,7 @@ string LyXFunc::Dispatch(int ac,
} }
owner->view()->beforeChange(); owner->view()->beforeChange();
LyXFont old_font(owner->view()->text->real_current_font);
for (string::size_type i = 0; for (string::size_type i = 0;
i < argument.length(); ++i) { i < argument.length(); ++i) {
if (greek_kb_flag) { if (greek_kb_flag) {
@ -2696,9 +2698,10 @@ string LyXFunc::Dispatch(int ac,
owner->view()->text->sel_cursor = owner->view()->text->sel_cursor =
owner->view()->text->cursor; owner->view()->text->cursor;
moveCursorUpdate(false); moveCursorUpdate(false);
// current_font.number can change so we need to update // real_current_font.number can change so we
// the minibuffer // need to update the minibuffer
owner->getMiniBuffer()->Set(CurrentState(owner->view())); if (old_font != owner->view()->text->real_current_font)
owner->getMiniBuffer()->Set(CurrentState(owner->view()));
return string(); return string();
} else { } else {
// why is an "Unknown action" with empty // why is an "Unknown action" with empty

1
src/minibuffer.C
View File

@ -129,6 +129,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, FL_Coord, FL_Coord,
} else if (event == FL_PUSH) { } else if (event == FL_PUSH) {
// This actually clears the buffer. // This actually clears the buffer.
mini->PrepareForCommand(); mini->PrepareForCommand();
return 1;
} }
return 0; return 0;

4
src/version.h
View File

@ -1,5 +1,5 @@
/* Version and release date definition */ /* Version and release date definition */
#define LYX_VERSION "1.1.5fixcvs" #define LYX_VERSION "1.1.5fix2"
#define LYX_RELEASE "Tue Jul 18, 2000" #define LYX_RELEASE "Tue Oct 18, 2000"
/* This version string is intended to be used in files created by LyX */ /* This version string is intended to be used in files created by LyX */
#define LYX_DOCVERSION "LyX 1.1" #define LYX_DOCVERSION "LyX 1.1"