Added [X] and [Close] buttons to close 3Dconnexion setting imgui dialog by clicking on them

This commit is contained in:
Enrico Turri 2019-12-16 13:35:45 +01:00
parent 7b1e96fe7f
commit 43213b9548
6 changed files with 178 additions and 81 deletions

View file

@ -1920,7 +1920,11 @@ void GLCanvas3D::render()
m_camera.debug_render();
#endif // ENABLE_CAMERA_STATISTICS
#if ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG
wxGetApp().plater()->get_mouse3d_controller().render_settings_dialog(*this);
#else
wxGetApp().plater()->get_mouse3d_controller().render_settings_dialog((unsigned int)cnv_size.get_width(), (unsigned int)cnv_size.get_height());
#endif // ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG
wxGetApp().imgui()->render();
@ -2628,8 +2632,8 @@ void GLCanvas3D::on_idle(wxIdleEvent& evt)
if (m_extra_frame_requested || mouse3d_controller_applied)
{
m_dirty = true;
evt.RequestMore();
m_extra_frame_requested = false;
evt.RequestMore();
}
else
m_dirty = false;