From 495949fc2c4320f7981017ebbfacc7641d68729d Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 3 Mar 2008 12:29:07 +0000 Subject: [PATCH] x_offset -> xOffset git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24213 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Menu.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index c409ba9666..08293d773a 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -1641,28 +1641,28 @@ BMenu::_UpdateStateOpenSelect(BMenuItem* item, BPoint position, fSelected->Submenu()->Bounds()); fSelected->Submenu()->UnlockLooper(); - float x_offset; + float xOffset; // navAreaRectAbove and navAreaRectBelow have the same X // position and width, so it doesn't matter which one we use to // calculate the X offset if (menuBounds.left < submenuBounds.left) - x_offset = position.x - navAreaRectAbove.left; + xOffset = position.x - navAreaRectAbove.left; else - x_offset = navAreaRectAbove.right - position.x; + xOffset = navAreaRectAbove.right - position.x; bool inNavArea; if (inNavAreaRectAbove) { - float y_offset = navAreaRectAbove.bottom - position.y; + float yOffset = navAreaRectAbove.bottom - position.y; float ratio = navAreaRectAbove.Width() / navAreaRectAbove.Height(); - inNavArea = y_offset <= x_offset / ratio; + inNavArea = yOffset <= xOffset / ratio; } else { - float y_offset = navAreaRectBelow.bottom - position.y; + float yOffset = navAreaRectBelow.bottom - position.y; float ratio = navAreaRectBelow.Width() / navAreaRectBelow.Height(); - inNavArea = y_offset >= (navAreaRectBelow.Height() - x_offset / ratio); + inNavArea = yOffset >= (navAreaRectBelow.Height() - xOffset / ratio); } bigtime_t systime = system_time();