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

Fix bug 8880: do not try to validate custom value if it is disabled

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-11-12 15:48:34 +01:00
parent 6f488a9ef2
commit 7e22abec5d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt4/GuiHSpace.cpp
View File

@ -104,12 +104,16 @@ void GuiHSpace::enableWidgets()
QString const selection = spacingCO->itemData(spacingCO->currentIndex()).toString(); QString const selection = spacingCO->itemData(spacingCO->currentIndex()).toString();
bool const custom = selection == "custom"; bool const custom = selection == "custom";
valueLE->setEnabled(custom); valueLE->setEnabled(custom);
valueL->setEnabled(custom);
unitCO->setEnabled(custom); unitCO->setEnabled(custom);
fillPatternCO->setEnabled(!math_mode_ && selection == "hfill"); fillPatternCO->setEnabled(!math_mode_ && selection == "hfill");
fillPatternL->setEnabled(!math_mode_ && selection == "hfill");
bool const no_pattern = fillPatternCO->currentIndex() == 0 || math_mode_; bool const no_pattern = fillPatternCO->currentIndex() == 0 || math_mode_;
bool const enable_keep = bool const enable_keep =
selection == "normal" || selection == "halfquad" || (selection == "hfill" && no_pattern) || custom; selection == "normal" || selection == "halfquad"
|| (selection == "hfill" && no_pattern) || custom;
keepCB->setEnabled(enable_keep); keepCB->setEnabled(enable_keep);
keepL->setEnabled(enable_keep);
} }

4
src/frontends/qt4/InsetParamsWidget.cpp
View File

@ -29,6 +29,10 @@ CheckedWidget::CheckedWidget(QLineEdit * input, QWidget * label)
bool CheckedWidget::check() const bool CheckedWidget::check() const
{ {
// Ignore if widget is disabled.
if (!input_->isEnabled())
return true;
bool const valid = input_->hasAcceptableInput(); bool const valid = input_->hasAcceptableInput();
// Visual feedback. // Visual feedback.
setValid(input_, valid); setValid(input_, valid);