summaryrefslogtreecommitdiffstats
path: root/views/widget/widget.cc
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 19:06:15 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 19:06:15 +0000
commit8647714eef4b0eb718c5b2682f14c9b0f5ecce13 (patch)
treee38a7ec5f5839f3f2ffbe5c546bac5406e09258a /views/widget/widget.cc
parent02fe9c2b6adab15311c621a611d2405f1ea6551b (diff)
downloadchromium_src-8647714eef4b0eb718c5b2682f14c9b0f5ecce13.zip
chromium_src-8647714eef4b0eb718c5b2682f14c9b0f5ecce13.tar.gz
chromium_src-8647714eef4b0eb718c5b2682f14c9b0f5ecce13.tar.bz2
Simple WindowManager that can move/resize window.
Fixes TouchFrame's NonClientHitTest to ignore VirtualKeyboard area. Move mouse capture logic to Window Manager so that nested mouse capture with nested NWVs works correctly. Note1: This is a tentative WM that allows us to move/resize window in views desktop until we have real window manager based on aura/layer API. Note2: There is an compositor related issue and doesn't work well when compositor is enabled. I'll look into it after this CL. Review URL: http://codereview.chromium.org/7530017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget.cc')
-rw-r--r--views/widget/widget.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 133947a..691ab97 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -766,6 +766,11 @@ bool Widget::SetInitialFocus() {
return !!v;
}
+bool Widget::ConvertPointFromAncestor(
+ const Widget* ancestor, gfx::Point* point) const {
+ return native_widget_->ConvertPointFromAncestor(ancestor, point);
+}
+
View* Widget::GetChildViewParent() {
return GetContentsView() ? GetContentsView() : GetRootView();
}
@@ -951,7 +956,6 @@ bool Widget::OnMouseEvent(const MouseEvent& event) {
void Widget::OnMouseCaptureLost() {
if (is_mouse_button_pressed_)
GetRootView()->OnMouseCaptureLost();
- static_cast<internal::RootView*>(GetRootView())->set_capture_view(NULL);
is_mouse_button_pressed_ = false;
}