AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always update dynamic completions when the text changes

Browse Source 
Don't do it only when the text entry is (or becomes again) empty, this
breaks dynamic completers such as the one used in the widgets sample,
which determines its completions depending on the already entered text
(of course, the sample example is not particularly useful, as the
completions are always the same, but it's supposed to show that they
could dynamically depend on the already entered part of the string).
This commit is contained in:
Vadim Zeitlin 2018-01-27 01:18:21 +01:00
parent 02f2159aea
commit 456fdd8f93
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/textentry.cpp
View File

@ -363,26 +363,12 @@ private:
{
m_completer = NULL;
m_newCompletionsNeeded = m_entry->IsEmpty();
win->Bind(wxEVT_TEXT, &wxTextAutoCompleteDynamic::OnEntryChanged, this);
}
// for a given prefix, if DoUpdateCompletionModel() succeeds,
// we won't do any further update of the model as long as we
// do not clear the textentry. but then we have to start over again.
void OnEntryChanged( wxCommandEvent& event )
void OnEntryChanged(wxCommandEvent& event)
{
if ( event.GetString().empty() )
{
m_newCompletionsNeeded = true;
}
else
{
if ( m_newCompletionsNeeded )
DoUpdateCompletionModel();
}
DoUpdateCompletionModel();
event.Skip();
}
@ -406,8 +392,6 @@ private:
}
UseModel(store);
m_newCompletionsNeeded = false;
}
else
{
@ -422,12 +406,6 @@ private:
// The associated window, we need to store it to unbind our event handler.
wxWindow* const m_win;
// Each time we enter a new prefix, GtkEntryCompletion needs to be fed with
// new completions. And this flag lets us try to DoUpdateCompletionModel()
// and if it succeeds, it'll set the flag to false and OnEntryChanged()
// will not try to call it again unless we entered a new prefix.
bool m_newCompletionsNeeded;
wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteDynamic);
};