From 6834052234b3af6c28a9622d9a5bab26ef047f43 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 2 Jul 2005 13:16:17 +0000 Subject: [PATCH] The BRect version of ConvertTo/FromScreen were broken in case the view didn't have a parent, but was the child of a BWindow. This fixes a bug in menus (and probably other stuff too) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13400 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/View.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index a1dc5363fc..0486dbb032 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -736,9 +736,13 @@ BView::ConvertFromScreen(BPoint pt) const void BView::ConvertToScreen(BRect *rect) const { - if (!fParent) - return; + if (!fParent) { + if (fOwner) + fOwner->ConvertToScreen(rect); + return; + } + do_owner_check_no_pick(); ConvertToParent(rect); @@ -758,9 +762,13 @@ BView::ConvertToScreen(BRect rect) const void BView::ConvertFromScreen(BRect *rect) const { - if (!fParent) - return; + if (!fParent) { + if (fOwner) + fOwner->ConvertFromScreen(rect); + return; + } + do_owner_check_no_pick(); ConvertFromParent(rect);