pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[desktop] Run progress only when needed.

Browse source
This commit is contained in:
vng 2012-07-09 15:02:28 -07:00 • committed by Alex Zolotarev
parent d5340b7982
commit b6836459f3
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt/draw_widget.cpp
View file

@ -480,7 +480,7 @@ namespace qt
}
}
void DrawWidget::Search(search::SearchParams params)
bool DrawWidget::Search(search::SearchParams params)
{
if (m_framework->GetCurrentPosition(params.m_lat, params.m_lon))
{
@ -488,7 +488,7 @@ namespace qt
params.m_validPos = true;
}
m_framework->Search(params);
return m_framework->Search(params);
}
void DrawWidget::ShowSearchResult(search::Result const & res)

2
qt/draw_widget.hpp
View file

@ -80,7 +80,7 @@ namespace qt
void SetScaleControl(QScaleSlider * pScale);
void Search(search::SearchParams params);
bool Search(search::SearchParams params);
void ShowSearchResult(search::Result const & res);
void CloseSearch();

16
qt/search_panel.cpp
View file

@ -155,6 +155,7 @@ void SearchPanel::OnSearchResult(ResultsT * res)
}
delete res;
// stop search busy indicator
m_pAnimationTimer->stop();
m_pClearButton->setIcon(QIcon(":/ui/x.png"));
@ -170,14 +171,15 @@ void SearchPanel::OnSearchTextChanged(QString const & str)
m_params.m_query = normalized.toUtf8().constData();
m_params.m_callback = bind(&SearchPanel::SearchResultThreadFunc, this, _1);
m_pDrawWidget->Search(m_params);
if (m_pDrawWidget->Search(m_params))
{
// show busy indicator
if (!m_pAnimationTimer->isActive())
m_pAnimationTimer->start(200);
// show busy indicator
if (!m_pAnimationTimer->isActive())
m_pAnimationTimer->start(200);
OnAnimationTimer();
m_pClearButton->setFlat(true);
m_pClearButton->setVisible(true);
m_pClearButton->setFlat(true);
m_pClearButton->setVisible(true);
}
}
//else
//{