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

John's paragraph spacing patch.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2661 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-09-03 09:25:09 +00:00
parent 781db21b32
commit 1b0c700cc1
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2001-09-02 John Levon <moz@compsoc.man.ac.uk>
* FormParagraph.C: fix default line spacing case
2001-08-31 John Levon <moz@compsoc.man.ac.uk> 2001-08-31 John Levon <moz@compsoc.man.ac.uk>
* FormParagraph.C: disable space inputs when != Length * FormParagraph.C: disable space inputs when != Length

22
src/frontends/xforms/FormParagraph.C
View File

@ -333,33 +333,19 @@ void FormParagraph::update()
par_->params().noindent()); par_->params().noindent());
int linespacing; int linespacing;
Spacing space = par_->params().spacing(); Spacing const space = par_->params().spacing();
/*
switch (lv_->buffer()->params.spacing.getSpace()) {
case Spacing::Default: linespacing = 1; break;
case Spacing::Single: linespacing = 2; break;
case Spacing::Onehalf: linespacing = 3; break;
case Spacing::Double: linespacing = 4; break;
case Spacing::Other: linespacing = 5; break;
}
*/
switch (space.getSpace()) { switch (space.getSpace()) {
case Spacing::Default: linespacing = 1; break; default: linespacing = 1; break;
case Spacing::Single: linespacing = 2; break; case Spacing::Single: linespacing = 2; break;
case Spacing::Onehalf: linespacing = 3; break; case Spacing::Onehalf: linespacing = 3; break;
case Spacing::Double: linespacing = 4; break; case Spacing::Double: linespacing = 4; break;
case Spacing::Other: linespacing = 5; break; case Spacing::Other: linespacing = 5; break;
} }
fl_set_choice(dialog_->choice_linespacing, linespacing); fl_set_choice(dialog_->choice_linespacing, linespacing);
if (space.getSpace() == Spacing::Other) { if (space.getSpace() == Spacing::Other) {
string sp; string const sp = tostr(space.getValue());
if (space.getSpace() == Spacing::Default)
sp = tostr(lv_->buffer()->params.spacing.getValue());
else
sp = tostr(space.getValue());
fl_set_input(dialog_->input_linespacing, sp.c_str()); fl_set_input(dialog_->input_linespacing, sp.c_str());
setEnabled(dialog_->input_linespacing, true); setEnabled(dialog_->input_linespacing, true);
} else { } else {