From 9b8a6396805e223746239ad372055e944262ddd5 Mon Sep 17 00:00:00 2001 From: rylek Date: Wed, 27 Apr 2011 18:46:00 +0000 Subject: [PATCH] .Geom/Ctrl: minor D&D related fixes in PlotterCtrl git-svn-id: svn://ultimatepp.org/upp/trunk@3381 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Geom/Ctrl/PlotterCtrl.cpp | 4 ++-- uppsrc/TCtrlLib/util.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp index 429c11403..17f6426cf 100644 --- a/uppsrc/Geom/Ctrl/PlotterCtrl.cpp +++ b/uppsrc/Geom/Ctrl/PlotterCtrl.cpp @@ -802,14 +802,14 @@ void PlotterCtrl::Drop(Point start, Point end, dword keyflags) void PlotterCtrl::Click(Point pt, dword keyflags) { - if(drag_drop) + if(drag_drop && drag_mode == DRAG_CUSTOM) drag_drop->Click(FromPushClient(pt), keyflags); } void PlotterCtrl::Cancel() { PanOffset(Size(0, 0)); - if(drag_drop) { + if(drag_drop && drag_mode == DRAG_CUSTOM) { drag_drop->Cancel(); } } diff --git a/uppsrc/TCtrlLib/util.cpp b/uppsrc/TCtrlLib/util.cpp index 5e6160ac4..bddad1811 100644 --- a/uppsrc/TCtrlLib/util.cpp +++ b/uppsrc/TCtrlLib/util.cpp @@ -352,7 +352,7 @@ void DragDropCtrl::LeftDown(Point pt, dword keyflags) void DragDropCtrl::LeftDouble(Point pt, dword keyflags) { SetWantFocus(); - Click(pt, keyflags | K_MOUSEDOUBLE); + Push(pt, keyflags | K_MOUSEDOUBLE); } void DragDropCtrl::DragStop(bool accept, dword keyflags)