[haiku-commits] r36516 - haiku/trunk/src/kits/tracker

Author: aldeck
Date: 2010-04-28 15:37:27 +0200 (Wed, 28 Apr 2010)
New Revision: 36516
Changeset: http://dev.haiku-os.org/changeset/36516/haiku
Ticket: http://dev.haiku-os.org/ticket/4757

Modified:
   haiku/trunk/src/kits/tracker/Commands.h
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
   haiku/trunk/src/kits/tracker/PoseView.cpp
   haiku/trunk/src/kits/tracker/SlowContextPopup.cpp
Log:
* Removed what finally looks like an old (and not needed anymore) workaround. 
That is, the sending of a message when dropping a pose over another one while 
its context menu is still showing. That was causing #4757 since poseview was 
receiving the dropped message two times.

  I've been investigating the issue in depth, it's there since the first 
opentracker revision, so i even installed R5 and built/debugged opentracker to 
confirm it was indeed needed on R5. That would be another case of undocumented 
(misdocumented) workaround for an R5 bug, ie: BMenu would steal the drop 
message although the mouse isn't over it anymore (Stefano idea?). Heh if only i 
could reach the original Tracker devs :-D 

  I don't like when i don't understand a problem up to the last bit, but it 
should be reasonably safe for alpha2 +alphabranch


Modified: haiku/trunk/src/kits/tracker/Commands.h
===================================================================
--- haiku/trunk/src/kits/tracker/Commands.h     2010-04-28 09:58:18 UTC (rev 
36515)
+++ haiku/trunk/src/kits/tracker/Commands.h     2010-04-28 13:37:27 UTC (rev 
36516)
@@ -104,8 +104,6 @@
 const uint32 kSwitchDirectory = 'Tswd';
 const uint32 kQuitTracker = 'Tqit';
 
-const uint32 kContextMenuDragNDrop = '_dnd';
-
 const uint32 kSwitchToHome = 'Tswh';
 
 const uint32 kTestIconCache = 'TicC';

Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp    2010-04-28 09:58:18 UTC 
(rev 36515)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp    2010-04-28 13:37:27 UTC 
(rev 36516)
@@ -1393,16 +1393,6 @@
                        PostMessage(message, PoseView());
                        break;
 
-               case kContextMenuDragNDrop:
-                       //
-                       //      sent when the SlowContextPopup goes away
-                       //
-                       if (fWaitingForRefs && Dragging())
-                               PostMessage(message, PoseView());
-                       else
-                               fWaitingForRefs = false;
-                       break;
-
                case kRestoreState:
                        if (message->HasMessage("state")) {
                                BMessage state;

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp   2010-04-28 09:58:18 UTC (rev 
36515)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp   2010-04-28 13:37:27 UTC (rev 
36516)
@@ -2065,23 +2065,6 @@
                return;
 
        switch (message->what) {
-               case kContextMenuDragNDrop:
-               {
-                       BContainerWindow *window = ContainerWindow();
-                       if (window && window->Dragging()) {
-                               BPoint droppoint, dropoffset;
-                               if (message->FindPoint("_drop_point_", 
&droppoint) == B_OK) {
-                                       BMessage* dragmessage = 
window->DragMessage();
-                                       dragmessage->FindPoint("click_pt", 
&dropoffset);
-                                       dragmessage->AddPoint("_drop_point_", 
droppoint);
-                                       dragmessage->AddPoint("_drop_offset_", 
dropoffset);
-                                       HandleMessageDropped(dragmessage);
-                               }
-                               DragStop();
-                       }
-                       break;
-               }
-
                case kAddNewPoses:
                {
                        AddPosesResult *currentPoses;

Modified: haiku/trunk/src/kits/tracker/SlowContextPopup.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/SlowContextPopup.cpp   2010-04-28 09:58:18 UTC 
(rev 36515)
+++ haiku/trunk/src/kits/tracker/SlowContextPopup.cpp   2010-04-28 13:37:27 UTC 
(rev 36516)
@@ -121,22 +121,6 @@
        //      if this changes, BeMenu and RecentsMenu
        //      in Deskbar should also change
        fTypesList = NULL;
-                               
-       uint32 buttons;
-       BPoint location;
-       GetMouse(&location, &buttons);
-       //      if we are tracking a drag,
-       //      don't send this message
-       if (buttons == 0) {
-               //      send a special message to ContainerWindow
-               //      this will occur and be used only if
-               //      the dropped occurred in the pose (drop on an icon),
-               //      not in the menu
-               BMessage message(kContextMenuDragNDrop);
-               ConvertToScreen(&location);
-               message.AddPoint("_drop_point_", location);
-               fMessenger.SendMessage(&message);
-       }
 }

Other related posts:

  • » [haiku-commits] r36516 - haiku/trunk/src/kits/tracker - alex