From: <hug...@li...> - 2013-09-09 17:51:26
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/79da63adde8c changeset: 6322:79da63adde8c user: tmodes date: Thu Jul 18 19:09:19 2013 +0200 description: Ignore dragging when ctrl key pressed for some special cases [12018349 for people with nervous fingers diffstat: src/hugin1/hugin/ImagesTree.cpp | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (22 lines): diff -r fab239806650 -r 79da63adde8c src/hugin1/hugin/ImagesTree.cpp --- a/src/hugin1/hugin/ImagesTree.cpp Sun Jul 14 09:30:52 2013 +0200 +++ b/src/hugin1/hugin/ImagesTree.cpp Thu Jul 18 19:09:19 2013 +0200 @@ -1362,12 +1362,17 @@ void ImagesTreeCtrl::OnBeginDrag(wxTreeEvent &e) { +#if wxCHECK_VERSION(2,9,4) + bool ctrlPressed=wxGetKeyState(WXK_COMMAND); +#else + bool ctrlPressed=wxGetKeyState(WXK_CONTROL); +#endif if(m_pano->getNrOfImages()>0 && !m_dragging) { m_draggingImages=GetSelectedImages(); if(m_draggingImages.size()>0) { - if((m_groupMode==GROUP_NONE && m_draggingImages.size()==1) || + if((m_groupMode==GROUP_NONE && m_draggingImages.size()==1 && !ctrlPressed) || m_groupMode==GROUP_LENS || m_groupMode==GROUP_STACK) { e.Allow(); |
From: <hug...@li...> - 2013-09-09 17:51:26
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/8776f102843c changeset: 6325:8776f102843c user: tmodes date: Thu Jul 18 19:09:19 2013 +0200 description: Ignore dragging when ctrl key pressed for some special cases [12018349 for people with nervous fingers diffstat: src/hugin1/hugin/ImagesTree.cpp | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (22 lines): diff -r a8f0da93fe57 -r 8776f102843c src/hugin1/hugin/ImagesTree.cpp --- a/src/hugin1/hugin/ImagesTree.cpp Sun Jul 14 09:30:52 2013 +0200 +++ b/src/hugin1/hugin/ImagesTree.cpp Thu Jul 18 19:09:19 2013 +0200 @@ -1310,12 +1310,17 @@ void ImagesTreeCtrl::OnBeginDrag(wxTreeEvent &e) { +#if wxCHECK_VERSION(2,9,4) + bool ctrlPressed=wxGetKeyState(WXK_COMMAND); +#else + bool ctrlPressed=wxGetKeyState(WXK_CONTROL); +#endif if(m_pano->getNrOfImages()>0 && !m_dragging) { m_draggingImages=GetSelectedImages(); if(m_draggingImages.size()>0) { - if((m_groupMode==GROUP_NONE && m_draggingImages.size()==1) || + if((m_groupMode==GROUP_NONE && m_draggingImages.size()==1 && !ctrlPressed) || m_groupMode==GROUP_LENS || m_groupMode==GROUP_STACK) { e.Allow(); |