diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 00:05:51 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 00:05:51 +0000 |
commit | 863cab911d2d71e4d55cc961110d0f297bb0aa78 (patch) | |
tree | 9202e92b8447eff596bc84985d953130d3111617 /views | |
parent | bbcd29efb5a1ed6bf27334454b2e641a306dad0d (diff) | |
download | chromium_src-863cab911d2d71e4d55cc961110d0f297bb0aa78.zip chromium_src-863cab911d2d71e4d55cc961110d0f297bb0aa78.tar.gz chromium_src-863cab911d2d71e4d55cc961110d0f297bb0aa78.tar.bz2 |
Fix Omnibox cursor flicker by deleting a bunch of useless code in WindowWin.
I tested running the app in Vista non-Aero, and I still got resize cursors on all edges and was able to resize the window.
BUG=13926
TEST=Mouse around on the omnibox; the cursor should not flicker.
Review URL: http://codereview.chromium.org/159245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r-- | views/widget/widget_win.h | 5 | ||||
-rw-r--r-- | views/window/window_win.cc | 41 | ||||
-rw-r--r-- | views/window/window_win.h | 1 |
3 files changed, 0 insertions, 47 deletions
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index d3665d2..9018c64 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -198,7 +198,6 @@ class WidgetWin : public Widget, MSG_WM_RBUTTONDBLCLK(OnRButtonDblClk) MSG_WM_RBUTTONDOWN(OnRButtonDown) MSG_WM_RBUTTONUP(OnRButtonUp) - MSG_WM_SETCURSOR(OnSetCursor) MSG_WM_SETFOCUS(OnSetFocus) MSG_WM_SETICON(OnSetIcon) MSG_WM_SETTEXT(OnSetText) @@ -452,10 +451,6 @@ class WidgetWin : public Widget, SetMsgHandled(FALSE); return 0; } - virtual LRESULT OnSetCursor(HWND window, UINT hittest_code, UINT message) { - SetMsgHandled(FALSE); - return 0; - } virtual void OnSetFocus(HWND focused_window) { SetMsgHandled(FALSE); } diff --git a/views/window/window_win.cc b/views/window/window_win.cc index 871e132c..13f0529 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -972,47 +972,6 @@ LRESULT WindowWin::OnNCUAHDrawFrame(UINT msg, WPARAM w_param, return 0; } -LRESULT WindowWin::OnSetCursor(HWND window, UINT hittest_code, UINT message) { - // If the window is disabled, it's because we're showing a modal dialog box. - // We need to let DefWindowProc handle the message. That's because - // DefWindowProc for WM_SETCURSOR with message = some kind of mouse button - // down message sends the top level window a WM_ACTIVATEAPP message, which we - // otherwise wouldn't get. The symptom of not doing this is that if the user - // has a window in the background with a modal dialog open, they can't click - // on the disabled background window to bring the entire stack to the front. - // This is annoying because they then have to move all the foreground windows - // out of the way to be able to activate said window. I love how on Windows, - // the answer isn't always logical. - if (!IsWindowEnabled(GetNativeView())) - return WidgetWin::OnSetCursor(window, hittest_code, message); - - int index = RC_NORMAL; - switch (hittest_code) { - case HTTOP: - case HTBOTTOM: - index = RC_VERTICAL; - break; - case HTTOPLEFT: - case HTBOTTOMRIGHT: - index = RC_NWSE; - break; - case HTTOPRIGHT: - case HTBOTTOMLEFT: - index = RC_NESW; - break; - case HTLEFT: - case HTRIGHT: - index = RC_HORIZONTAL; - break; - case HTCAPTION: - case HTCLIENT: - index = RC_NORMAL; - break; - } - SetCursor(resize_cursors_[index]); - return 0; -} - LRESULT WindowWin::OnSetIcon(UINT size_type, HICON new_icon) { // This shouldn't hurt even if we're using the native frame. ScopedRedrawLock lock(this); diff --git a/views/window/window_win.h b/views/window/window_win.h index 5f6a07b..96bed16 100644 --- a/views/window/window_win.h +++ b/views/window/window_win.h @@ -128,7 +128,6 @@ class WindowWin : public WidgetWin, virtual void OnRButtonUp(UINT ht_component, const CPoint& point); virtual LRESULT OnNCUAHDrawCaption(UINT msg, WPARAM w_param, LPARAM l_param); virtual LRESULT OnNCUAHDrawFrame(UINT msg, WPARAM w_param, LPARAM l_param); - virtual LRESULT OnSetCursor(HWND window, UINT hittest_code, UINT message); virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon); virtual LRESULT OnSetText(const wchar_t* text); virtual void OnSettingChange(UINT flags, const wchar_t* section); |