From 57b21cbaae5741815390f18640862f70c5a7ac51 Mon Sep 17 00:00:00 2001 From: Suhwan_Park Date: Thu, 4 Apr 2013 17:22:23 +0900 Subject: [PATCH] Applied OpenContextItem(), CloseContextItem(), IsContextItemOpend() API to ListView, GroupedListView Change-Id: I291554a70aab2584c09b874dacffc1a71e490e12 Signed-off-by: Suhwan_Park --- src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp | 29 +++---------------------- src/ui/controls/FUiCtrl_ListViewImpl.cpp | 26 +++------------------- 2 files changed, 6 insertions(+), 49 deletions(-) diff --git a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp index fbfb209..852b120 100644 --- a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp +++ b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp @@ -1128,42 +1128,19 @@ _GroupedListViewImpl::GetScrollInputMode(void) const result _GroupedListViewImpl::OpenContextItem(int groupIndex, int itemIndex) { - SysTryReturn(NID_UI_CTRL, (groupIndex >= 0) && (groupIndex <= (GetGroupCount() - 1)) - && (itemIndex >= 0) && (itemIndex <= (GetItemCountAt(groupIndex) - 1)), E_OUT_OF_RANGE, E_OUT_OF_RANGE, - ("[E_OUT_OF_RANGE] A specified input parameter is invalid.")); - - // temporary code - // need sweep API to Core - - return E_SUCCESS; + return GetCore().OpenContextItem(groupIndex, itemIndex); } result _GroupedListViewImpl::CloseContextItem(int groupIndex, int itemIndex) { - SysTryReturn(NID_UI_CTRL, (groupIndex >= 0) && (groupIndex <= (GetGroupCount() - 1)) - && (itemIndex >= 0) && (itemIndex <= (GetItemCountAt(groupIndex) - 1)), E_OUT_OF_RANGE, E_OUT_OF_RANGE, - ("[E_OUT_OF_RANGE] A specified input parameter is invalid.")); - - // temporary code - GetCore().ResetSweepItem(); - - return E_SUCCESS; + return GetCore().CloseContextItem(groupIndex, itemIndex); } bool _GroupedListViewImpl::IsContextItemOpened(int groupIndex, int itemIndex) const { - SysTryReturn(NID_UI_CTRL, (groupIndex >= 0) && (groupIndex <= (GetGroupCount() - 1)) - && (itemIndex >= 0) && (itemIndex <= (GetItemCountAt(groupIndex) - 1)), E_OUT_OF_RANGE, E_OUT_OF_RANGE, - ("[E_OUT_OF_RANGE] A specified input parameter is invalid.")); - - // temporary code - int sweepGroupIndex = -1; - int sweepItemIndex = -1; - GetCore().GetSweepItemIndex(sweepGroupIndex, sweepItemIndex); - - return ((groupIndex == sweepGroupIndex) && (itemIndex == sweepItemIndex)); + return GetCore().IsContextItemOpened(groupIndex, itemIndex); } void diff --git a/src/ui/controls/FUiCtrl_ListViewImpl.cpp b/src/ui/controls/FUiCtrl_ListViewImpl.cpp index 60c10cd..a6aebff 100644 --- a/src/ui/controls/FUiCtrl_ListViewImpl.cpp +++ b/src/ui/controls/FUiCtrl_ListViewImpl.cpp @@ -1044,39 +1044,19 @@ _ListViewImpl::GetScrollInputMode(void) const result _ListViewImpl::OpenContextItem(int itemIndex) { - SysTryReturn(NID_UI_CTRL, (itemIndex >= 0) && (itemIndex <= (GetItemCount() - 1)), E_OUT_OF_RANGE, E_OUT_OF_RANGE, - ("[E_OUT_OF_RANGE] A specified input parameter is invalid.")); - - // temporary code - // need sweep API to Core - - return E_SUCCESS; + return GetCore().OpenContextItem(0, itemIndex); } result _ListViewImpl::CloseContextItem(int itemIndex) { - SysTryReturn(NID_UI_CTRL, (itemIndex >= 0) && (itemIndex <= (GetItemCount() - 1)), E_OUT_OF_RANGE, E_OUT_OF_RANGE, - ("[E_OUT_OF_RANGE] A specified input parameter is invalid.")); - - // temporary code - GetCore().ResetSweepItem(); - - return E_SUCCESS; + return GetCore().CloseContextItem(0, itemIndex); } bool _ListViewImpl::IsContextItemOpened(int itemIndex) const { - SysTryReturn(NID_UI_CTRL, (itemIndex >= 0) && (itemIndex <= (GetItemCount() - 1)), false, E_OUT_OF_RANGE, - ("[E_OUT_OF_RANGE] A specified input parameter is invalid.")); - - // temporary code - int sweepGroupIndex = -1; - int sweepItemIndex = -1; - GetCore().GetSweepItemIndex(sweepGroupIndex, sweepItemIndex); - - return (itemIndex == sweepItemIndex); + return GetCore().IsContextItemOpened(0, itemIndex); } void -- 2.7.4