From dbd3f1ca022a630aefcbd9633ee8463b56925604 Mon Sep 17 00:00:00 2001 From: Choi Munseok Date: Mon, 20 May 2013 11:55:31 +0900 Subject: [PATCH] Fix to adjust the position of the partial Frame Change-Id: I34787574042d20087d66be6e73a0ead9f8521d46 Signed-off-by: Choi Munseok --- src/ui/controls/FUiCtrl_FormImpl.cpp | 30 +++++++++++++++++------------- src/ui/controls/FUiCtrl_FrameImpl.cpp | 30 +++++++++++++++++------------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp index e49a12e..6d4bb33 100644 --- a/src/ui/controls/FUiCtrl_FormImpl.cpp +++ b/src/ui/controls/FUiCtrl_FormImpl.cpp @@ -1138,7 +1138,7 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation) pFrameImpl->GetCore().SetMovable(true); FloatPoint prevPoint = pFrameImpl->GetPositionF(); - FloatDimension prevSize = pFrameImpl->GetSizeF(); + //FloatDimension prevSize = pFrameImpl->GetSizeF(); FloatPoint curPoint(0.0f, 0.0f); @@ -1146,10 +1146,11 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation) { if (prevPoint.x < 0.0f) { - float prevGap = prevSize.width + prevPoint.x; - float curGap = portraitSize.width / portraitSize.height * prevGap; + //float prevGap = prevSize.width + prevPoint.x; + //float curGap = portraitSize.width / portraitSize.height * prevGap; - curPoint.x = curGap - prevSize.width; + //curPoint.x = curGap - prevSize.width; + curPoint.x = portraitSize.height / portraitSize.width * prevPoint.x; } else { @@ -1158,10 +1159,11 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation) if (prevPoint.y < 0.0f) { - float prevGap = prevSize.height + prevPoint.y; - float curGap = portraitSize.height / portraitSize.width * prevGap; + //float prevGap = prevSize.height + prevPoint.y; + //float curGap = portraitSize.height / portraitSize.width * prevGap; - curPoint.y = curGap - prevSize.height; + //curPoint.y = curGap - prevSize.height; + curPoint.y = portraitSize.width / portraitSize.height * prevPoint.y; } else { @@ -1172,10 +1174,11 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation) { if (prevPoint.x < 0.0f) { - float prevGap = prevSize.width + prevPoint.x; - float curGap = portraitSize.height / portraitSize.width * prevGap; + //float prevGap = prevSize.width + prevPoint.x; + //float curGap = portraitSize.height / portraitSize.width * prevGap; - curPoint.x = curGap - prevSize.width; + //curPoint.x = curGap - prevSize.width; + curPoint.x = portraitSize.width / portraitSize.height * prevPoint.x; } else { @@ -1184,10 +1187,11 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation) if (prevPoint.y < 0.0f) { - float prevGap = prevSize.height + prevPoint.y; - float curGap = portraitSize.width / portraitSize.height * prevGap; + //float prevGap = prevSize.height + prevPoint.y; + //float curGap = portraitSize.width / portraitSize.height * prevGap; - curPoint.y = curGap - prevSize.height; + //curPoint.y = curGap - prevSize.height; + curPoint.y = portraitSize.height / portraitSize.width * prevPoint.y; } else { diff --git a/src/ui/controls/FUiCtrl_FrameImpl.cpp b/src/ui/controls/FUiCtrl_FrameImpl.cpp index 810c0cc..2d48513 100644 --- a/src/ui/controls/FUiCtrl_FrameImpl.cpp +++ b/src/ui/controls/FUiCtrl_FrameImpl.cpp @@ -362,7 +362,7 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation) SetMovable(true); FloatPoint prevPoint = GetPositionF(); - FloatDimension prevSize = GetSizeF(); + //FloatDimension prevSize = GetSizeF(); FloatPoint curPoint(0.0f, 0.0f); @@ -370,10 +370,11 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation) { if (prevPoint.x < 0.0f) { - float prevGap = prevSize.width + prevPoint.x; - float curGap = screenSize.width / screenSize.height * prevGap; + //float prevGap = prevSize.width + prevPoint.x; + //float curGap = screenSize.width / screenSize.height * prevGap; - curPoint.x = curGap - prevSize.width; + //curPoint.x = curGap - prevSize.width; + curPoint.x = screenSize.height / screenSize.width * prevPoint.x; } else { @@ -382,10 +383,11 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation) if (prevPoint.y < 0.0f) { - float prevGap = prevSize.height + prevPoint.y; - float curGap = screenSize.height / screenSize.width * prevGap; + //float prevGap = prevSize.height + prevPoint.y; + //float curGap = screenSize.height / screenSize.width * prevGap; - curPoint.y = curGap - prevSize.height; + //curPoint.y = curGap - prevSize.height; + curPoint.y = screenSize.width / screenSize.height * prevPoint.y; } else { @@ -396,10 +398,11 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation) { if (prevPoint.x < 0.0f) { - float prevGap = prevSize.width + prevPoint.x; - float curGap = screenSize.height / screenSize.width * prevGap; + //float prevGap = prevSize.width + prevPoint.x; + //float curGap = screenSize.height / screenSize.width * prevGap; - curPoint.x = curGap - prevSize.width; + //curPoint.x = curGap - prevSize.width; + curPoint.x = screenSize.width / screenSize.height * prevPoint.x; } else { @@ -408,10 +411,11 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation) if (prevPoint.y < 0.0f) { - float prevGap = prevSize.height + prevPoint.y; - float curGap = screenSize.width / screenSize.height * prevGap; + //float prevGap = prevSize.height + prevPoint.y; + //float curGap = screenSize.width / screenSize.height * prevGap; - curPoint.y = curGap - prevSize.height; + //curPoint.y = curGap - prevSize.height; + curPoint.y = screenSize.height / screenSize.width * prevPoint.y; } else { -- 2.7.4