Commit 0cbf66c2 authored by Makoto Kato's avatar Makoto Kato
Browse files

Bug 968647 - Part 2. Listen window position change for IME. r=roc

parent 062ff17d

widget/cocoa/nsChildView.mm

+1 −2
Original line number Diff line number Diff line
@@ -1752,8 +1752,7 @@ bool nsChildView::PaintWindow(nsIntRegion aRegion) 


void nsChildView::ReportMoveEvent()

{

  if (mWidgetListener)

    mWidgetListener->WindowMoved(this, mBounds.x, mBounds.y);

   NotifyWindowMoved(mBounds.x, mBounds.y);

}



void nsChildView::ReportSizeEvent()

widget/cocoa/nsCocoaWindow.mm

+1 −2
Original line number Diff line number Diff line
@@ -1721,8 +1721,7 @@ nsCocoaWindow::ReportMoveEvent() 
  UpdateBounds();



  // Dispatch the move event to Gecko

  if (mWidgetListener)

    mWidgetListener->WindowMoved(this, mBounds.x, mBounds.y);

  NotifyWindowMoved(mBounds.x, mBounds.y);



  mInReportMoveEvent = false;

widget/gtk/nsWindow.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2368,8 +2368,7 @@ nsWindow::OnConfigureEvent(GtkWidget *aWidget, GdkEventConfigure *aEvent) 


    // XXX mozilla will invalidate the entire window after this move

    // complete.  wtf?

    if (mWidgetListener)

      mWidgetListener->WindowMoved(this, mBounds.x, mBounds.y);

    NotifyWindowMoved(mBounds.x, mBounds.y);



    return FALSE;

}

widget/qt/nsWindow.cpp

+2 −2
Original line number Diff line number Diff line
@@ -872,8 +872,8 @@ nsWindow::moveEvent(QMoveEvent* aEvent) 
        return nsEventStatus_eIgnore;

    }



    bool moved = mWidgetListener->WindowMoved(this, aEvent->pos().x(), aEvent->pos().y());

    return moved ? nsEventStatus_eConsumeNoDefault : nsEventStatus_eIgnore;

    NotifyWindowMoved(aEvent->pos().x(), aEvent->pos().y());

    return nsEventStatus_eConsumeNoDefault;

}



nsEventStatus

widget/windows/nsWindow.cpp

+3 −5
Original line number Diff line number Diff line
@@ -5798,10 +5798,10 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS* wp) 
        break;

      case nsSizeMode_Maximized:

          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, 

                 ("*** mSizeMode: nsSizeMode_Maximized\n");

                 ("*** mSizeMode: nsSizeMode_Maximized\n"));

        break;

      default:

          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** mSizeMode: ??????\n");

          PR_LOG(gWindowsLog, PR_LOG_ALWAYS, ("*** mSizeMode: ??????\n"));

        break;

    };

#endif
@@ -5825,9 +5825,7 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS* wp) 
    mBounds.x = wp->x;

    mBounds.y = wp->y;



    if (mWidgetListener) {

      mWidgetListener->WindowMoved(this, wp->x, wp->y);

    }

    NotifyWindowMoved(wp->x, wp->y);

  }



  // Handle window size changes