mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: [STUDIO-2511] handle dbl click in ComboBox 

Change-Id: I27075e43de4a78446972806b57771f0880677935
This commit is contained in:
chunmao.guo 2023-03-17 16:29:56 +08:00 committed by Lane.Wei
parent 1966946256
commit c44a240ec0
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -679,6 +679,7 @@ GLCanvas3D::Mouse::Mouse()
, position(DBL_MAX, DBL_MAX) , position(DBL_MAX, DBL_MAX)
, scene_position(DBL_MAX, DBL_MAX, DBL_MAX) , scene_position(DBL_MAX, DBL_MAX, DBL_MAX)
, ignore_left_up(false) , ignore_left_up(false)
, ignore_right_up(false)
{ {
} }
@ -4175,6 +4176,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
camera.set_target(camera.get_target() + orig - cur_pos); camera.set_target(camera.get_target() + orig - cur_pos);
m_dirty = true; m_dirty = true;
m_mouse.ignore_right_up = true;
} }
m_mouse.drag.start_position_2D = pos; m_mouse.drag.start_position_2D = pos;
@ -4264,7 +4266,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
logical_pos = logical_pos.cwiseQuotient(Vec2d(factor, factor)); logical_pos = logical_pos.cwiseQuotient(Vec2d(factor, factor));
#endif // ENABLE_RETINA_GL #endif // ENABLE_RETINA_GL
if (!m_mouse.dragging) { if (!m_mouse.ignore_right_up) {
//BBS post right click event //BBS post right click event
if (!m_hover_plate_idxs.empty()) { if (!m_hover_plate_idxs.empty()) {
post_event(RBtnPlateEvent(EVT_GLCANVAS_PLATE_RIGHT_CLICK, { logical_pos, m_hover_plate_idxs.front() })); post_event(RBtnPlateEvent(EVT_GLCANVAS_PLATE_RIGHT_CLICK, { logical_pos, m_hover_plate_idxs.front() }));
@ -4928,6 +4930,7 @@ void GLCanvas3D::mouse_up_cleanup()
m_mouse.set_start_position_2D_as_invalid(); m_mouse.set_start_position_2D_as_invalid();
m_mouse.dragging = false; m_mouse.dragging = false;
m_mouse.ignore_left_up = false; m_mouse.ignore_left_up = false;
m_mouse.ignore_right_up = false;
m_dirty = true; m_dirty = true;
if (m_canvas->HasCapture()) if (m_canvas->HasCapture())

1
src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -334,6 +334,7 @@ class GLCanvas3D
Vec3d scene_position; Vec3d scene_position;
Drag drag; Drag drag;
bool ignore_left_up; bool ignore_left_up;
bool ignore_right_up;
Mouse(); Mouse();

1
src/slic3r/GUI/Widgets/ComboBox.cpp
View File

@ -6,6 +6,7 @@
BEGIN_EVENT_TABLE(ComboBox, TextInput) BEGIN_EVENT_TABLE(ComboBox, TextInput)
EVT_LEFT_DOWN(ComboBox::mouseDown) EVT_LEFT_DOWN(ComboBox::mouseDown)
EVT_LEFT_DCLICK(ComboBox::mouseDown)
//EVT_MOUSEWHEEL(ComboBox::mouseWheelMoved) //EVT_MOUSEWHEEL(ComboBox::mouseWheelMoved)
EVT_KEY_DOWN(ComboBox::keyDown) EVT_KEY_DOWN(ComboBox::keyDown)

2
src/slic3r/GUI/Widgets/DropDown.cpp
View File

@ -157,7 +157,7 @@ bool DropDown::HasDismissLongTime()
{ {
auto now = boost::posix_time::microsec_clock::universal_time(); auto now = boost::posix_time::microsec_clock::universal_time();
return !IsShown() && return !IsShown() &&
(now - dismissTime).total_milliseconds() >= 200; (now - dismissTime).total_milliseconds() >= 20;
} }
void DropDown::paintEvent(wxPaintEvent& evt) void DropDown::paintEvent(wxPaintEvent& evt)