Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed reentrancy when closing flyout

This commit is contained in:
Dale Stammen 2014-10-23 22:01:35 -07:00
parent afa052c5c7
commit b77e7a5a97
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cocos/ui/UIEditBox/UIEditBoxImpl-winrt.cpp
View File

@ -136,23 +136,34 @@ void EditBoxWinRT::OpenXamlEditBox(Platform::String^ strText)
void EditBoxWinRT::Closed(Platform::Object^ sender, Platform::Object^ e) void EditBoxWinRT::Closed(Platform::Object^ sender, Platform::Object^ e)
{ {
critical_section::scoped_lock lock(m_criticalSection);
RemoveControls(); RemoveControls();
} }
void EditBoxWinRT::Done(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) void EditBoxWinRT::Done(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
{ {
critical_section::scoped_lock lock(m_criticalSection);
QueueText(); QueueText();
RemoveControls(); HideFlyout();
} }
void EditBoxWinRT::Cancel(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) void EditBoxWinRT::Cancel(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
{ {
RemoveControls(); HideFlyout();
} }
void EditBoxWinRT::HideKeyboard(Windows::UI::ViewManagement::InputPane^ inputPane, Windows::UI::ViewManagement::InputPaneVisibilityEventArgs^ args) void EditBoxWinRT::HideKeyboard(Windows::UI::ViewManagement::InputPane^ inputPane, Windows::UI::ViewManagement::InputPaneVisibilityEventArgs^ args)
{ {
RemoveControls(); critical_section::scoped_lock lock(m_criticalSection);
HideFlyout();
}
void EditBoxWinRT::HideFlyout()
{
if (m_flyout)
{
m_flyout->Hide();
}
} }
void EditBoxWinRT::RemoveControls() void EditBoxWinRT::RemoveControls()
@ -182,7 +193,6 @@ void EditBoxWinRT::RemoveControls()
if (m_flyout != nullptr) if (m_flyout != nullptr)
{ {
m_flyout->Closed -= m_closedToken; m_flyout->Closed -= m_closedToken;
m_flyout->Hide();
m_flyout = nullptr; m_flyout = nullptr;
} }
@ -278,6 +288,11 @@ void EditBoxWinRT::SetInputScope(TextBox^ box, EditBox::InputMode inputMode)
void EditBoxWinRT::QueueText() void EditBoxWinRT::QueueText()
{ {
if ((m_passwordBox == nullptr) && (m_textBox == nullptr))
{
return;
}
m_strText = m_inputFlag == EditBox::InputFlag::PASSWORD ? m_passwordBox->Password : m_textBox->Text; m_strText = m_inputFlag == EditBox::InputFlag::PASSWORD ? m_passwordBox->Password : m_textBox->Text;
std::shared_ptr<cocos2d::InputEvent> e(new UIEditBoxEvent(this, m_strText, m_receiveHandler)); std::shared_ptr<cocos2d::InputEvent> e(new UIEditBoxEvent(this, m_strText, m_receiveHandler));
cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e);

1
cocos/ui/UIEditBox/UIEditBoxImpl-winrt.h
View File

@ -59,6 +59,7 @@ namespace ui {
void Cancel(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); void Cancel(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
void Closed(Platform::Object^ sender, Platform::Object^ e); void Closed(Platform::Object^ sender, Platform::Object^ e);
void HideKeyboard(Windows::UI::ViewManagement::InputPane^ inputPane, Windows::UI::ViewManagement::InputPaneVisibilityEventArgs^ args); void HideKeyboard(Windows::UI::ViewManagement::InputPane^ inputPane, Windows::UI::ViewManagement::InputPaneVisibilityEventArgs^ args);
void HideFlyout();
Platform::Agile<Windows::UI::Core::CoreDispatcher> m_dispatcher; Platform::Agile<Windows::UI::Core::CoreDispatcher> m_dispatcher;
Platform::Agile<Windows::UI::Xaml::Controls::Panel> m_panel; Platform::Agile<Windows::UI::Xaml::Controls::Panel> m_panel;