kopia lustrzana https://github.com/f4exb/sdrangel
Merge pull request #1303 from srcejon/fix_value_dial_fast_typing
Value dial: Check for completed animation before using m_valuepull/1304/head
commit
f58e22e338
|
@ -553,14 +553,14 @@ void ValueDial::keyPressEvent(QKeyEvent *value)
|
||||||
|
|
||||||
if (c >= QChar('0') && (c <= QChar('9')))
|
if (c >= QChar('0') && (c <= QChar('9')))
|
||||||
{
|
{
|
||||||
int d = c.toLatin1() - '0';
|
|
||||||
quint64 e = findExponent(m_cursor);
|
|
||||||
quint64 v = (m_value / e) % 10;
|
|
||||||
|
|
||||||
if (m_animationState != 0) {
|
if (m_animationState != 0) {
|
||||||
m_value = m_valueNew;
|
m_value = m_valueNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int d = c.toLatin1() - '0';
|
||||||
|
quint64 e = findExponent(m_cursor);
|
||||||
|
quint64 v = (m_value / e) % 10;
|
||||||
|
|
||||||
v = m_value - v * e;
|
v = m_value - v * e;
|
||||||
v += d * e;
|
v += d * e;
|
||||||
setValue(v);
|
setValue(v);
|
||||||
|
|
|
@ -619,16 +619,16 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
|
||||||
}
|
}
|
||||||
else if ((c >= QChar('0')) && (c <= QChar('9')) && (m_cursor > 0)) // digits
|
else if ((c >= QChar('0')) && (c <= QChar('9')) && (m_cursor > 0)) // digits
|
||||||
{
|
{
|
||||||
|
if(m_animationState != 0) {
|
||||||
|
m_value = m_valueNew;
|
||||||
|
}
|
||||||
|
|
||||||
int d = c.toLatin1() - '0';
|
int d = c.toLatin1() - '0';
|
||||||
quint64 e = findExponent(m_cursor);
|
quint64 e = findExponent(m_cursor);
|
||||||
quint64 value = abs(m_value);
|
quint64 value = abs(m_value);
|
||||||
int sign = m_value < 0 ? -1 : 1;
|
int sign = m_value < 0 ? -1 : 1;
|
||||||
quint64 v = (value / e) % 10;
|
quint64 v = (value / e) % 10;
|
||||||
|
|
||||||
if(m_animationState != 0) {
|
|
||||||
m_value = m_valueNew;
|
|
||||||
}
|
|
||||||
|
|
||||||
v = value - v * e;
|
v = value - v * e;
|
||||||
v += d * e;
|
v += d * e;
|
||||||
setValue(sign*v);
|
setValue(sign*v);
|
||||||
|
|
Ładowanie…
Reference in New Issue