Skip to content
Snippets Groups Projects
Commit 06c602a0 authored by konstantin.kukharenko's avatar konstantin.kukharenko
Browse files

[*]Edit comments

parent 5ef03322
No related branches found
No related tags found
2 merge requests!26Feature 3349,!25Features 3332
...@@ -64,7 +64,7 @@ void CustomButtonComboBox::setCurrentText(const QString &text) ...@@ -64,7 +64,7 @@ void CustomButtonComboBox::setCurrentText(const QString &text)
if(m_showTextPolicy == CaptionPolicy::showWhenUnselected) if(m_showTextPolicy == CaptionPolicy::showWhenUnselected)
m_button->setText(text); m_button->setText(text);
if(text == "") if(text == "")
this->setCaption(m_caption); m_button->setText(m_caption);
} }
} }
......
...@@ -7,7 +7,7 @@ CustomLineEdit::CustomLineEdit(QWidget *parent):CustomLineEditBase (parent) ...@@ -7,7 +7,7 @@ CustomLineEdit::CustomLineEdit(QWidget *parent):CustomLineEditBase (parent)
this->clear(); this->clear();
setVisibleButton(false); setVisibleButton(false);
Utils::setPropertyAndUpdateStyle(this, Properties::FILLED,false); Utils::setPropertyAndUpdateStyle(this, Properties::FILLED,false);
Utils::setPropertyAndUpdateStyle(this, Properties::ACTIVE,true); Utils::setPropertyAndUpdateStyle(this, Properties::ACTIVE,false);
this->setFocus(); this->setFocus();
}); });
} }
......
...@@ -73,7 +73,7 @@ void CustomLineEditBase::focusOutEvent(QFocusEvent *e) ...@@ -73,7 +73,7 @@ void CustomLineEditBase::focusOutEvent(QFocusEvent *e)
Utils::setPropertyAndUpdateStyle(this, Properties::FILLED,false); Utils::setPropertyAndUpdateStyle(this, Properties::FILLED,false);
} }
QLineEdit::focusInEvent(e); QLineEdit::focusOutEvent(e);
} }
void CustomLineEditBase::inputMethodEvent(QInputMethodEvent *event) void CustomLineEditBase::inputMethodEvent(QInputMethodEvent *event)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment