From 923072b2dd0e2ce17f5db74b900a1b0f0641e389 Mon Sep 17 00:00:00 2001 From: "moinuddin.s" Date: Mon, 23 Sep 2013 18:51:06 +0530 Subject: [PATCH] Fixes for prevent issues & N_SE-52780, N_SE-52804, & N_SE-52165 Signed-off-by: moinuddin.s Change-Id: Ic6d16639fdd8cc2fe8f3b1d6d2fb253305637c5b Signed-off-by: moinuddin.s --- src/ui/controls/FUiCtrl_EditDate.cpp | 2 ++ src/ui/controls/FUiCtrl_EditTime.cpp | 2 ++ src/ui/controls/FUiCtrl_EditTimePresenter.cpp | 1 + src/ui/controls/FUiCtrl_PanelImpl.cpp | 6 +++++- src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp index 53002b7..3b8fa06 100644 --- a/src/ui/controls/FUiCtrl_EditDate.cpp +++ b/src/ui/controls/FUiCtrl_EditDate.cpp @@ -824,6 +824,8 @@ _EditDate::OnChangeLayout(_ControlRotation rotation) { GetDateTimeBar()->SetVisibleState(false); GetDateTimeBar()->Close(); + + CalculateDateTimeBarPosition(); } return; diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp index 30ae6d5..5c07248 100644 --- a/src/ui/controls/FUiCtrl_EditTime.cpp +++ b/src/ui/controls/FUiCtrl_EditTime.cpp @@ -616,6 +616,8 @@ _EditTime::OnChangeLayout(_ControlRotation rotation) { GetDateTimeBar()->SetVisibleState(false); GetDateTimeBar()->Close(); + + CalculateDateTimeBarPosition(); } return; diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp index 7561f3b..f87364f 100644 --- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp @@ -1125,6 +1125,7 @@ _EditTimePresenter::OnFocusModeStateChanged(void) __isFocused = false; __focusId = DATETIME_ID_NONE; __isEnterKeyPressed = false; + __selectedId = DATETIME_ID_NONE; __pEditTime->Invalidate(); return; } diff --git a/src/ui/controls/FUiCtrl_PanelImpl.cpp b/src/ui/controls/FUiCtrl_PanelImpl.cpp index 5cad6aa..5d526f3 100644 --- a/src/ui/controls/FUiCtrl_PanelImpl.cpp +++ b/src/ui/controls/FUiCtrl_PanelImpl.cpp @@ -193,8 +193,12 @@ _PanelImpl::OnAttachedToMainTree(void) if (orientation == ORIENTATION_STATUS_LANDSCAPE || orientation == ORIENTATION_STATUS_LANDSCAPE_REVERSE) { + FloatRectangle landscapeBuilderBounds; controlOrientation = _CONTROL_ORIENTATION_LANDSCAPE; - GetBuilderBoundsF(controlOrientation, builderBounds); + if (GetBuilderBoundsF(controlOrientation, landscapeBuilderBounds)) + { + builderBounds = landscapeBuilderBounds; + } } result r = SetBounds(builderBounds); if (r != E_SUCCESS) diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp index 5eddf7c..d87d07c 100644 --- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp @@ -1027,6 +1027,8 @@ _ScrollPanelPresenter::DoFlickGestureRecognized(_TouchFlickGestureDetector& gest case _FLICK_DIRECTION_RIGHT: targetPosition = scrollArea.x - SCROLL_PANEL_OVERSCROLLING_MAX_DISTANCCE; break; + default: + break; } } -- 2.7.4