From 1b0c700cc12fd81080942b6ec24cda4a5e0f6039 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 3 Sep 2001 09:25:09 +0000 Subject: [PATCH] John's paragraph spacing patch. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2661 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/FormParagraph.C | 22 ++++------------------ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 790d8e0ab6..1d6bd32179 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2001-09-02 John Levon + + * FormParagraph.C: fix default line spacing case + 2001-08-31 John Levon * FormParagraph.C: disable space inputs when != Length diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index f2d171e4b9..2085822a1d 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -333,33 +333,19 @@ void FormParagraph::update() par_->params().noindent()); int linespacing; - Spacing 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; - } - */ + Spacing const space = par_->params().spacing(); switch (space.getSpace()) { - case Spacing::Default: linespacing = 1; break; + 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; } + fl_set_choice(dialog_->choice_linespacing, linespacing); if (space.getSpace() == Spacing::Other) { - string sp; - - if (space.getSpace() == Spacing::Default) - sp = tostr(lv_->buffer()->params.spacing.getValue()); - else - sp = tostr(space.getValue()); + string const sp = tostr(space.getValue()); fl_set_input(dialog_->input_linespacing, sp.c_str()); setEnabled(dialog_->input_linespacing, true); } else { -- 2.39.5