Merge pull request #89 from matwey/fix/spinbox_textedit

Fix ScientificSpinBox text edition

Author: matwey

include/scientificspinbox.h

@@ -51,6 +51,9 @@ class ScientificSpinBox: public QAbstractSpinBox {
 	inline double minimum() const { return minimum_; }
 	inline double maximum() const { return maximum_; }
 
+private slots:
+	void updateValueFromText();
+
 public slots:
 	void setValue(double value);
 	inline void setMinimum(double min) { setRange(min, maximum_); }

src/scientificspinbox.cpp

@@ -30,10 +30,15 @@ constexpr const int ScientificSpinBox::log10_steps_in_range_;
 ScientificSpinBox::ScientificSpinBox(QWidget* parent, int decimals):
 	QAbstractSpinBox(parent),
 	decimals_(decimals) {
+	connect(this, SIGNAL(editingFinished()), this, SLOT(updateValueFromText()));
 	const auto font = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
 	const auto family = font.family();
 }
 
+void ScientificSpinBox::updateValueFromText() {
+	setValue(valueFromText(text()));
+}
+
 QSize ScientificSpinBox::sizeHint() const {
 	const auto char_width = fontMetrics().averageCharWidth();
 	// +1 for number sign, +1 for integer part, +1 for decimal point, + decimals() for decimals,
@@ -48,8 +53,11 @@ QSize ScientificSpinBox::minimumSizeHint() const {
 }
 
 void ScientificSpinBox::setValue(double value) {
+	const auto old_text = textFromValue(value_);
 	const auto new_text = textFromValue(value);
-	if (new_text == text()) return;
+	if ((new_text == old_text) && (new_text == text())) {
+		return;
+	}
 	value_ = valueFromText(new_text);
 	lineEdit()->setText(new_text);
 	emit valueChanged(value_);
@@ -90,15 +98,15 @@ double ScientificSpinBox::valueFromText(const QString& text) const {
 }
 
 QValidator::State ScientificSpinBox::validate(QString& text, int&) const {
-	const auto decimal_point = QString(locale().decimalPoint());
-	const auto e = QString(locale().exponential());
-	const auto minus = QString(locale().negativeSign());
-	const auto plus = QString(locale().positiveSign());
 	bool ok = false;
 	locale().toDouble(text, &ok);
 	if (ok) {
 		return QValidator::Acceptable;
 	}
+	const auto decimal_point = QString(locale().decimalPoint());
+	const auto e = QString(locale().exponential());
+	const auto minus = QString(locale().negativeSign());
+	const auto plus = QString(locale().positiveSign());
 	if (text.isEmpty()) {
 		return QValidator::Intermediate;
 	}