From 6a3acc6f303907df981565b10b8d16b1b4c0260c Mon Sep 17 00:00:00 2001 From: "jaewon7.cho" Date: Thu, 11 Apr 2013 11:01:52 +0900 Subject: [PATCH] Delete carriage return Change-Id: Ia04d1099680ab7782cb1c83f73d1e38a0a95d240 Signed-off-by: jaewon7.cho --- src/ui/FUi_Window.cpp | 2 +- src/ui/controls/FUiCtrl_CustomListItemImpl.cpp | 58 +++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp index 60f0c1e..9965e52 100644 --- a/src/ui/FUi_Window.cpp +++ b/src/ui/FUi_Window.cpp @@ -98,7 +98,7 @@ _Window::~_Window(void) delete __pLayer; __pLayer = NULL; } - + delete __pDimmingLayer; __pDimmingLayer = null; diff --git a/src/ui/controls/FUiCtrl_CustomListItemImpl.cpp b/src/ui/controls/FUiCtrl_CustomListItemImpl.cpp index 001a0fc..dee6767 100644 --- a/src/ui/controls/FUiCtrl_CustomListItemImpl.cpp +++ b/src/ui/controls/FUiCtrl_CustomListItemImpl.cpp @@ -460,54 +460,54 @@ _CustomListItemImpl::GetElementViewById(int elementId) const void _CustomListItemImpl::SetNormalItemBackgroundBitmap(const Bitmap& bitmap) { - TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; - - if (__pBitmaps[status]) - { - delete __pBitmaps[status]; - } - - __pBitmaps[status] = _BitmapImpl::CloneN(bitmap); - - SetBackgroundBitmap(bitmap, status); + TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; + + if (__pBitmaps[status]) + { + delete __pBitmaps[status]; + } + + __pBitmaps[status] = _BitmapImpl::CloneN(bitmap); + + SetBackgroundBitmap(bitmap, status); return; } void _CustomListItemImpl::SetFocusedItemBackgroundBitmap(const Bitmap& bitmap) { - TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; - - if (__pBitmaps[status]) - { - delete __pBitmaps[status]; - } - - __pBitmaps[status] = _BitmapImpl::CloneN(bitmap); - - SetBackgroundBitmap(bitmap, status); + TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; + + if (__pBitmaps[status]) + { + delete __pBitmaps[status]; + } + + __pBitmaps[status] = _BitmapImpl::CloneN(bitmap); + + SetBackgroundBitmap(bitmap, status); return; } void _CustomListItemImpl::SetHighlightedItemBackgroundBitmap(const Bitmap& bitmap) { - TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED; + TableViewItemDrawingStatus status = TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED; if (__pBitmaps[status]) { - delete __pBitmaps[status]; + delete __pBitmaps[status]; } __pBitmaps[status] = _BitmapImpl::CloneN(bitmap); - SetBackgroundBitmap(bitmap, status); - return; -} - -void -_CustomListItemImpl::SetBackgroundBitmap(const Bitmap& bitmap, TableViewItemDrawingStatus status) -{ + SetBackgroundBitmap(bitmap, status); + return; +} + +void +_CustomListItemImpl::SetBackgroundBitmap(const Bitmap& bitmap, TableViewItemDrawingStatus status) +{ if (__pTableViewItemData) { bool returnValue = __pTableViewItemData->SetBackgroundBitmap(__pBitmaps[status], status); -- 2.7.4