fix log thread bug, add clean memory button, fix pinch zoom bug, set android back button to undo

This commit is contained in:
2017-05-12 13:31:56 +01:00
parent 6dbb8bf3a1
commit 51e355d039
13 changed files with 72 additions and 17 deletions

View File

@@ -2043,7 +2043,7 @@ public:
auto blend = glIsEnabled(GL_BLEND);
glEnable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
//glEnable(GL_DEPTH_TEST);
glClear(GL_DEPTH_BUFFER_BIT);
for (int plane_index = 0; plane_index < 6; plane_index++)
{
@@ -2144,6 +2144,9 @@ public:
// m_zoom_canvas *= 0.9f;
// if (ke->m_key == kKey::AndroidVolumeDown)
// m_zoom_canvas *= 1.1f;
if (ke->m_key == kKey::AndroidBack)
if (!ActionManager::empty())
ActionManager::undo();
break;
case kEventType::KeyUp:
// if (ke->m_key == kKey::KeyE)