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

Fix for Michael's bug: In the "Character layout"dialog,

Browse Source 
set all options to "reset", close the dialog, re-open it ->
the options are set incorrectly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2687 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-09-04 16:11:24 +00:00
parent 4735efe3fe
commit 971f1755d0
2 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/controllers/ChangeLog
View File

@ -1,5 +1,9 @@
2001-09-04 Angus Leeming <a.leeming@ic.ac.uk>
* ControlCharacter.C: fix Michael's bug: In the "Character layout"
dialog, set all options to "reset", close the dialog, re-open it ->
the options are set incorrectly.
* ControlButtons.[Ch]: add an is_closing_ variable and isClosing method.
When Applying it's useful to know whether the dialog is about to close
or not (no point refreshing the display for example).

74
src/frontends/controllers/ControlCharacter.C
View File

@ -78,9 +78,9 @@ void ControlCharacter::apply()
LyXFont::FONT_FAMILY ControlCharacter::getFamily() const
{
if (font_.get())
return font_->family();
return LyXFont::IGNORE_FAMILY;
if (!font_.get())
return LyXFont::IGNORE_FAMILY;
return font_->family();
}
@ -92,9 +92,9 @@ void ControlCharacter::setFamily(LyXFont::FONT_FAMILY val)
LyXFont::FONT_SERIES ControlCharacter::getSeries() const
{
if (font_.get())
return font_->series();
return LyXFont::IGNORE_SERIES;
if (!font_.get())
return LyXFont::IGNORE_SERIES;
return font_->series();
}
@ -106,9 +106,9 @@ void ControlCharacter::setSeries(LyXFont::FONT_SERIES val)
LyXFont::FONT_SHAPE ControlCharacter::getShape() const
{
if (font_.get())
return font_->shape();
return LyXFont::IGNORE_SHAPE;
if (!font_.get())
return LyXFont::IGNORE_SHAPE;
return font_->shape();
}
@ -120,9 +120,9 @@ void ControlCharacter::setShape(LyXFont::FONT_SHAPE val)
LyXFont::FONT_SIZE ControlCharacter::getSize() const
{
if (font_.get())
return font_->size();
return LyXFont::IGNORE_SIZE;
if (!font_.get())
return LyXFont::IGNORE_SIZE;
return font_->size();
}
@ -134,17 +134,24 @@ void ControlCharacter::setSize(LyXFont::FONT_SIZE val)
character::FONT_STATE ControlCharacter::getBar() const
{
if (font_.get()) {
if (font_->emph() != LyXFont::IGNORE)
return character::EMPH_TOGGLE;
if (!font_.get())
return character::IGNORE;
else if (font_->underbar() != LyXFont::IGNORE)
return character::UNDERBAR_TOGGLE;
if (font_->emph() == LyXFont::TOGGLE)
return character::EMPH_TOGGLE;
else if (font_->noun() != LyXFont::IGNORE)
return character::NOUN_TOGGLE;
}
return character::IGNORE;
if (font_->underbar() == LyXFont::TOGGLE)
return character::UNDERBAR_TOGGLE;
if (font_->noun() == LyXFont::TOGGLE)
return character::NOUN_TOGGLE;
if (font_->emph() == LyXFont::IGNORE &&
font_->underbar() == LyXFont::IGNORE &&
font_->noun() == LyXFont::IGNORE)
return character::IGNORE;
return character::INHERIT;
}
@ -180,29 +187,10 @@ void ControlCharacter::setBar(character::FONT_STATE val)
LColor::color ControlCharacter::getColor() const
{
LColor::color col = LColor::ignore;
if (font_.get()) {
switch (font_->color()) {
case LColor::ignore:
case LColor::none:
case LColor::black:
case LColor::white:
case LColor::red:
case LColor::green:
case LColor::blue:
case LColor::cyan:
case LColor::magenta:
case LColor::yellow:
case LColor::inherit:
break;
default:
col = font_->color();
break;
}
}
if (!font_.get())
return LColor::ignore;
return col;
return font_->color();
}