wm: Make WM_MOVE_PANEL use top-right coordinates.

src/platform/window_manager/panel_bar.cc

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "window_manager/panel_bar.h"
 
 #include <algorithm>
 
 #include <gflags/gflags.h>
 
@@ skipping 325 matching lines @@
                      << "window " << win->xid_str();
         return true;
       }
       if (msg.param(1)) {
         ExpandPanel(panel, true);  // create_anchor
       } else {
         CollapsePanel(panel);
       }
       break;
     }
-    case WmIpc::Message::WM_MOVE_PANEL: {
+    case WmIpc::Message::WM_NOTIFY_PANEL_DRAGGED: {
       XWindow xid = msg.param(0);
       Window* win = wm_->GetWindow(xid);
       if (!win) {
-        LOG(WARNING) << "Ignoring WM_MOVE_PANEL message for unknown window "
-                     << XidStr(xid);
+        LOG(WARNING) << "Ignoring WM_NOTIFY_PANEL_DRAGGED message for unknown "
+                     << "window " << XidStr(xid);
         return true;
       }
       int x = msg.param(1);
       int y = msg.param(2);
       StorePanelPosition(win, x, y);
       break;
     }
     case WmIpc::Message::WM_NOTIFY_PANEL_DRAG_COMPLETE: {
       XWindow xid = msg.param(0);
       Window* win = wm_->GetWindow(xid);
@@ skipping 151 matching lines @@
 
   if (dragged_panel_event_coalescer_.IsRunning())
     dragged_panel_event_coalescer_.Stop();
 }
 
 void PanelBar::MoveDraggedPanel() {
   if (!dragged_panel_)
     return;
 
   const int drag_x = dragged_panel_event_coalescer_.x();
-  dragged_panel_->MoveX(drag_x + dragged_panel_->titlebar_width(), false, 0);
+  dragged_panel_->MoveX((wm_->wm_ipc_version() >= 1) ?
+                          drag_x :
+                          drag_x + dragged_panel_->titlebar_width(),
+                        false, 0);
 
   // When an expanded panel is being dragged, we don't move the other
   // panels to make room for it until the drag is done.
   if (GetPanelInfoOrDie(dragged_panel_)->is_expanded)
     return;
 
   // For collapsed panels, we first find the position of the dragged panel.
   Panels::iterator dragged_it = FindPanelInVectorByWindow(
       collapsed_panels_, *(dragged_panel_->content_win()));
   CHECK(dragged_it != collapsed_panels_.end());
 
   // Next, check if the center of the panel has moved over another panel.
-  const int center_x = drag_x + 0.5 * dragged_panel_->titlebar_width();
+  const int center_x = (wm_->wm_ipc_version() >= 1) ?
+                       drag_x - 0.5 * dragged_panel_->titlebar_width() :
+                       drag_x + 0.5 * dragged_panel_->titlebar_width();
   Panels::iterator it = collapsed_panels_.begin();
   for (; it != collapsed_panels_.end(); ++it) {
     int snapped_left = 0, snapped_right = 0;
     if (it->get() == dragged_panel_) {
       // If we're comparing against ourselves, use our original position
       // rather than wherever we've currently been dragged by the user.
       PanelInfo* info = GetPanelInfoOrDie(dragged_panel_);
       snapped_left = info->snapped_right - dragged_panel_->titlebar_width();
       snapped_right = info->snapped_right;
     } else {
@@ skipping 467 matching lines @@
 
 void PanelBar::MoveExpandedPanelOnscreen(Panel* panel, int anim_ms) {
   CHECK(GetPanelInfoOrDie(panel)->is_expanded);
   if (panel->content_x() < x_)
     panel->MoveX(x_ + panel->content_width(), true, anim_ms);
   else if (panel->right() > x_ + width_)
     panel->MoveX(x_ + width_, true, anim_ms);
 }
 
 }  // namespace window_manager