feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FindToolBar: Update to FancyLineEdit changes

Browse Source 
Change-Id: I2a1b0440e0cbf511f7e73057bb9fe75e3a01a695
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-12 15:44:46 +02:00
parent b0bb2d3422
commit 0aad5fac70
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/find/findtoolbar.cpp
View File

@@ -111,7 +111,12 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
m_ui.findEdit->setButtonVisible(Utils::FancyLineEdit::Left, true); m_ui.findEdit->setButtonVisible(Utils::FancyLineEdit::Left, true);
m_ui.findEdit->setFiltering(true); m_ui.findEdit->setFiltering(true);
m_ui.findEdit->setPlaceholderText(QString()); m_ui.findEdit->setPlaceholderText(QString());
m_ui.findEdit->setOkColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal));
m_ui.findEdit->setErrorColor(Utils::creatorTheme()->color(Utils::Theme::TextColorError));
m_ui.findEdit->button(Utils::FancyLineEdit::Left)->setFocusPolicy(Qt::TabFocus); m_ui.findEdit->button(Utils::FancyLineEdit::Left)->setFocusPolicy(Qt::TabFocus);
m_ui.findEdit->setValidationFunction([this](Utils::FancyLineEdit *, QString *) {
return m_lastResult != IFindSupport::NotFound;
});
m_ui.replaceEdit->setPlaceholderText(QString()); m_ui.replaceEdit->setPlaceholderText(QString());
connect(m_ui.findEdit, &Utils::FancyLineEdit::textChanged, connect(m_ui.findEdit, &Utils::FancyLineEdit::textChanged,
@@ -789,9 +794,8 @@ void FindToolBar::acceptCandidateAndMoveToolBar()
void FindToolBar::indicateSearchState(IFindSupport::Result searchState) void FindToolBar::indicateSearchState(IFindSupport::Result searchState)
{ {
const Utils::Theme::Color colorRole = searchState == IFindSupport::NotFound m_lastResult = searchState;
? Utils::Theme::TextColorError : Utils::Theme::TextColorNormal; m_ui.findEdit->validate();
m_ui.findEdit->setTextColor(m_ui.findEdit, Utils::creatorTheme()->color(colorRole));
} }
void FindToolBar::openFind(bool focus) void FindToolBar::openFind(bool focus)

1
src/plugins/coreplugin/find/findtoolbar.h
View File

@@ -194,6 +194,7 @@ private:
QTimer m_findIncrementalTimer; QTimer m_findIncrementalTimer;
QTimer m_findStepTimer; QTimer m_findStepTimer;
IFindSupport::Result m_lastResult;
bool m_useFakeVim; bool m_useFakeVim;
bool m_eventFiltersInstalled; bool m_eventFiltersInstalled;
}; };