From a03244fa1e035c8a2f8c146e7d6039c495c92648 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 9 Jan 2020 21:35:13 +0100 Subject: [PATCH] Gui: [skip ci] when changing expression of a widget then set tooltip only for the label child but not for the widget itself this allows that a custom tooltip can be set --- src/Gui/QuantitySpinBox.cpp | 11 ++++------- src/Gui/SpinBox.cpp | 31 ++++++++++++------------------- src/Gui/Widgets.cpp | 10 ++++------ 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/src/Gui/QuantitySpinBox.cpp b/src/Gui/QuantitySpinBox.cpp index a04484f8c8..8e419d0045 100644 --- a/src/Gui/QuantitySpinBox.cpp +++ b/src/Gui/QuantitySpinBox.cpp @@ -394,8 +394,7 @@ void Gui::QuantitySpinBox::onChange() p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - iconLabel->setToolTip(QString()); - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -406,7 +405,6 @@ void Gui::QuantitySpinBox::onChange() lineEdit()->setPalette(p); iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } @@ -460,7 +458,7 @@ void QuantitySpinBox::resizeEvent(QResizeEvent * event) p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -470,9 +468,8 @@ void QuantitySpinBox::resizeEvent(QResizeEvent * event) QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } catch (const Base::Exception & e) { setReadOnly(true); @@ -489,7 +486,7 @@ void Gui::QuantitySpinBox::keyPressEvent(QKeyEvent *event) if (event->text() == QString::fromUtf8("=") && isBound()) openFormulaDialog(); else if (!hasExpression()) - QAbstractSpinBox::keyPressEvent(event); + QAbstractSpinBox::keyPressEvent(event); } diff --git a/src/Gui/SpinBox.cpp b/src/Gui/SpinBox.cpp index 0a0470cda0..c0d6114c29 100644 --- a/src/Gui/SpinBox.cpp +++ b/src/Gui/SpinBox.cpp @@ -292,7 +292,7 @@ void UIntSpinBox::onChange() { p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -300,9 +300,8 @@ void UIntSpinBox::onChange() { QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } @@ -344,7 +343,7 @@ void UIntSpinBox::resizeEvent(QResizeEvent * event) p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -354,9 +353,8 @@ void UIntSpinBox::resizeEvent(QResizeEvent * event) QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } catch (const Base::Exception & e) { setReadOnly(true); @@ -489,7 +487,7 @@ void IntSpinBox::onChange() { p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -497,9 +495,8 @@ void IntSpinBox::onChange() { QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } void IntSpinBox::resizeEvent(QResizeEvent * event) @@ -525,7 +522,7 @@ void IntSpinBox::resizeEvent(QResizeEvent * event) p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -535,9 +532,8 @@ void IntSpinBox::resizeEvent(QResizeEvent * event) QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } catch (const Base::Exception & e) { setReadOnly(true); @@ -670,7 +666,7 @@ void DoubleSpinBox::onChange() { p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -678,9 +674,8 @@ void DoubleSpinBox::onChange() { QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } void DoubleSpinBox::resizeEvent(QResizeEvent * event) @@ -706,7 +701,7 @@ void DoubleSpinBox::resizeEvent(QResizeEvent * event) p.setColor(QPalette::Text, Qt::lightGray); lineEdit()->setPalette(p); } - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -716,9 +711,8 @@ void DoubleSpinBox::resizeEvent(QResizeEvent * event) QPalette p(lineEdit()->palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); lineEdit()->setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } catch (const Base::Exception & e) { setReadOnly(true); @@ -727,7 +721,6 @@ void DoubleSpinBox::resizeEvent(QResizeEvent * event) lineEdit()->setPalette(p); iconLabel->setToolTip(QString::fromLatin1(e.what())); } - } void DoubleSpinBox::openFormulaDialog() diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp index b760d2da4e..fb331c4550 100644 --- a/src/Gui/Widgets.cpp +++ b/src/Gui/Widgets.cpp @@ -1489,7 +1489,7 @@ void ExpLineEdit::onChange() { QPalette p(palette()); p.setColor(QPalette::Text, Qt::lightGray); setPalette(p); - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -1497,9 +1497,8 @@ void ExpLineEdit::onChange() { QPalette p(palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } void ExpLineEdit::resizeEvent(QResizeEvent * event) @@ -1520,7 +1519,7 @@ void ExpLineEdit::resizeEvent(QResizeEvent * event) QPalette p(palette()); p.setColor(QPalette::Text, Qt::lightGray); setPalette(p); - setToolTip(Base::Tools::fromStdString(getExpression()->toString())); + iconLabel->setToolTip(Base::Tools::fromStdString(getExpression()->toString())); } else { setReadOnly(false); @@ -1530,9 +1529,8 @@ void ExpLineEdit::resizeEvent(QResizeEvent * event) QPalette p(palette()); p.setColor(QPalette::Active, QPalette::Text, defaultPalette.color(QPalette::Text)); setPalette(p); - + iconLabel->setToolTip(QString()); } - iconLabel->setToolTip(QString()); } catch (const Base::Exception & e) { setReadOnly(true);