From: youseong.ji Date: Tue, 7 May 2013 05:42:07 +0000 (+0900) Subject: Modified to be able to receive public touchevent. X-Git-Tag: submit/tizen_2.1/20130514.054411~26^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3607eea1bab2de1ca3ad592f7ab9b255d557032c;p=platform%2Fframework%2Fnative%2Fuifw.git Modified to be able to receive public touchevent. Change-Id: I6a81eb00317d24288b2e70803ba58fa34db1c130 Signed-off-by: youseong.ji --- diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp index c6428df..c8b76de 100644 --- a/src/ui/controls/FUiCtrl_TableViewItem.cpp +++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp @@ -32,6 +32,7 @@ #include "FUiCtrl_TableView.h" #include "FUi_CoordinateSystemUtils.h" #include "FUi_Math.h" +#include "FUiCtrl_LabelImpl.h" using namespace Tizen::Base; using namespace Tizen::Base::Runtime; @@ -591,7 +592,7 @@ _TableViewItem::CreateCheckBox(void) GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth); GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight); - __pItemAnnex = _Label::CreateLabelN(); + __pItemAnnex = new (std::nothrow) Label(); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -599,10 +600,10 @@ _TableViewItem::CreateCheckBox(void) GET_SHAPE_CONFIG(TABLEVIEW::ITEM_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, leftMargin); float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height); - __pItemAnnex->SetBounds(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight)); + __pItemAnnex->Construct(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L""); __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0)); - AttachSystemChild(*__pItemAnnex); + AttachSystemChild(*GetLabelCore(__pItemAnnex)); } return r; @@ -621,7 +622,7 @@ _TableViewItem::CreateRadioBox(void) GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth); GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight); - __pItemAnnex = _Label::CreateLabelN(); + __pItemAnnex = new (std::nothrow) Label(); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -629,10 +630,10 @@ _TableViewItem::CreateRadioBox(void) GET_SHAPE_CONFIG(TABLEVIEW::ITEM_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, leftMargin); float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height); - __pItemAnnex->SetBounds(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight)); + __pItemAnnex->Construct(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L""); __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0)); - AttachSystemChild(*__pItemAnnex); + AttachSystemChild(*GetLabelCore(__pItemAnnex)); } return r; @@ -651,7 +652,7 @@ _TableViewItem::CreateOnOffButton(void) GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth); GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight); - __pItemAnnex = _Label::CreateLabelN(); + __pItemAnnex = new (std::nothrow) Label(); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -661,10 +662,10 @@ _TableViewItem::CreateOnOffButton(void) leftMargin += __pDrawingProperty->scrollMargin; float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height); - __pItemAnnex->SetBounds(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight)); + __pItemAnnex->Construct(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L""); __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0)); - AttachSystemChild(*__pItemAnnex); + AttachSystemChild(*GetLabelCore(__pItemAnnex)); } return r; @@ -682,7 +683,7 @@ _TableViewItem::CreateDetailButton(void) GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_MORE_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth); GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_MORE_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight); - __pItemAnnex = _Label::CreateLabelN(); + __pItemAnnex = new (std::nothrow) Label(); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -691,15 +692,27 @@ _TableViewItem::CreateDetailButton(void) leftMargin += __pDrawingProperty->scrollMargin; float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height); - __pItemAnnex->SetBounds(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight)); + __pItemAnnex->Construct(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L""); __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0)); - AttachSystemChild(*__pItemAnnex); + AttachSystemChild(*GetLabelCore(__pItemAnnex)); } return r; } +_Label* +_TableViewItem::GetLabelCore(Label* label) +{ + if(label == null) + { + return null; + } + + _LabelImpl* pImpl = _LabelImpl::GetInstance(*label); + return &pImpl->GetCore(); +} + void _TableViewItem::ExposeContextItem(FloatRectangle itemBounds, float targetWidth) { @@ -1169,7 +1182,7 @@ _TableViewItem::OnTouchPressed(const _Control& source, const _TouchInfo& touchin { __pressedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; } - else if (&source == __pItemAnnex) + else if (&source == GetLabelCore(__pItemAnnex)) { __pressedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; @@ -1232,7 +1245,7 @@ _TableViewItem::OnTouchReleased(const _Control& source, const _TouchInfo& touchi { __releasedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; } - else if (&source == __pItemAnnex) + else if (&source == GetLabelCore(__pItemAnnex)) { __releasedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; } @@ -1418,7 +1431,7 @@ _TableViewItem::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo SetItemChanged(true); Invalidate(); } - else if (&source == __pItemAnnex) + else if (&source == GetLabelCore(__pItemAnnex)) { if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED) { @@ -1539,7 +1552,7 @@ _TableViewItem::OnChildAttached(const _Control& child) if ((__annexStyle == TABLE_VIEW_ANNEX_STYLE_MARK) || (__annexStyle == TABLE_VIEW_ANNEX_STYLE_RADIO)) { - if (__pItemAnnex == &child) + if (GetLabelCore(__pItemAnnex) == &child) { return; } @@ -1554,10 +1567,6 @@ _TableViewItem::OnChildAttached(const _Control& child) bounds.x += (leftMargin * 2) + annexWidth; pControl->SetBounds(bounds); } - else if((__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING) || (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER)) - { - pControl->SetTouchPressThreshold(SENSITIVE); - } } void @@ -1568,12 +1577,15 @@ _TableViewItem::OnChildDetached(const _Control& child) __individualSelectionControls.Remove(child, false); } - if (&child == __pSimpleItemText) + _Label* pSimpleItemTextCore = GetLabelCore(__pSimpleItemText); + _Label* pSimpleItemBitmapCore = GetLabelCore(__pSimpleItemBitmap); + + if (&child == pSimpleItemTextCore) { __pSimpleItemText = null; } - if (&child == __pSimpleItemBitmap) + if (&child == pSimpleItemBitmapCore) { __pSimpleItemBitmap = null; } @@ -1818,8 +1830,6 @@ _TableViewItem::PlayCheckBoxAnimation(void) float annexWidth = 0.0f; float annexHeight = 0.0f; - Color canvasBackgroundColor; - if (__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL) { r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBoxBg); @@ -1841,8 +1851,6 @@ _TableViewItem::PlayCheckBoxAnimation(void) pCanvas = new (std::nothrow) Canvas(); SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - r = pCanvas->Construct(bounds); pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); @@ -1874,7 +1882,7 @@ _TableViewItem::PlayCheckBoxAnimation(void) if(__pItemAnnex) { __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap); - __pItemAnnex->Invalidate(); + __pItemAnnex->Invalidate(false); } CATCH: @@ -2440,7 +2448,6 @@ _TableViewItem::DrawCheckBox(void) FloatRectangle bounds; float annexWidth = 0.0f; float annexHeight = 0.0f; - Color canvasBackgroundColor; if(__enabledState) { @@ -2479,8 +2486,6 @@ _TableViewItem::DrawCheckBox(void) pCanvas = new (std::nothrow) Canvas(); SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bounds); pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); @@ -2506,7 +2511,7 @@ _TableViewItem::DrawCheckBox(void) _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true); __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap); - __pItemAnnex->Invalidate(); + __pItemAnnex->Invalidate(false); CATCH: delete pCheckBox; @@ -2529,7 +2534,6 @@ _TableViewItem::DrawRadioBox(void) FloatRectangle bounds; float annexWidth = 0.0f; float annexHeight = 0.0f; - Color canvasBackgroundColor; if(__enabledState) { @@ -2566,8 +2570,6 @@ _TableViewItem::DrawRadioBox(void) pCanvas = new (std::nothrow) Canvas(); SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bounds); pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); @@ -2586,7 +2588,7 @@ _TableViewItem::DrawRadioBox(void) _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true); __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap); - __pItemAnnex->Invalidate(); + __pItemAnnex->Invalidate(false); CATCH: delete pRadioButton; @@ -2612,7 +2614,6 @@ _TableViewItem::DrawOnOffButton(void) float annexWidth = 0.0f; float annexHeight = 0.0f; float annexMargin = 0.0f; - Color canvasBackgroundColor; if (IsChecked() == true) { @@ -2655,8 +2656,6 @@ _TableViewItem::DrawOnOffButton(void) pCanvas = new (std::nothrow) Canvas(); SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bounds); pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); @@ -2686,7 +2685,7 @@ _TableViewItem::DrawOnOffButton(void) _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true); __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap); - __pItemAnnex->Invalidate(); + __pItemAnnex->Invalidate(false); CATCH: delete pOnOffButton; @@ -2797,7 +2796,6 @@ _TableViewItem::DrawAnnexOnOffHandler(float position) float annexMargin = 0.0f; float annexAbsoluteBoundsStart = 0.0f; float annexAbsoluteBoundsEnd = 0.0f; - Color canvasBackgroundColor; float nextHandlerBounds = 0; r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler); @@ -2822,8 +2820,6 @@ _TableViewItem::DrawAnnexOnOffHandler(float position) pCanvas = new (std::nothrow) Canvas(); SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bounds); pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); @@ -2871,7 +2867,7 @@ _TableViewItem::DrawAnnexOnOffHandler(float position) _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true); __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap); - __pItemAnnex->Invalidate(); + __pItemAnnex->Invalidate(false); CATCH: delete pOnOffButton; @@ -2900,7 +2896,6 @@ _TableViewItem::DrawDetailButton(void) FloatRectangle bounds; float annexWidth = 0.0f; float annexHeight = 0.0f; - Color canvasBackgroundColor; bool themeBackgroundBitmap = false; themeBackgroundBitmap = IS_CUSTOM_BITMAP(TABLEVIEW::CIRCLE_BUTTON_BG_NORMAL); @@ -2979,8 +2974,6 @@ _TableViewItem::DrawDetailButton(void) pCanvas = new (std::nothrow) Canvas(); SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor); - pCanvas->Construct(bounds); pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); @@ -3003,7 +2996,7 @@ _TableViewItem::DrawDetailButton(void) _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true); __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap); - __pItemAnnex->Invalidate(); + __pItemAnnex->Invalidate(false); CATCH: delete pDetail; @@ -3340,7 +3333,7 @@ _TableViewItem::DrawSimpleItem(void) } __pSimpleItemText->SetTextColor(textColor); - __pSimpleItemText->Invalidate(); + __pSimpleItemText->Invalidate(false); } } result @@ -3420,9 +3413,10 @@ _TableViewItem::SetSimpleItemContents(const Tizen::Base::String& text, const Tiz __pSimpleItemBitmap->SetBackgroundBitmap(*pBitmap); __pSimpleItemBitmap->SetBounds(bitmapRect); - if (!__pSimpleItemBitmap->HasParent()) + _Label* pSimpleItemBitmapCore = GetLabelCore(__pSimpleItemBitmap); + if (!pSimpleItemBitmapCore->HasParent()) { - r = AttachChild(*__pSimpleItemBitmap); + r = AttachChild(*pSimpleItemBitmapCore); SysTryReturn(NID_UI_CTRL, __pSimpleItemBitmap != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); } } @@ -3433,9 +3427,10 @@ _TableViewItem::SetSimpleItemContents(const Tizen::Base::String& text, const Tiz __pSimpleItemText->SetText(text); __pSimpleItemText->SetBounds(textRect); - if (!__pSimpleItemText->HasParent()) + _Label* pSimpleItemTextCore = GetLabelCore(__pSimpleItemText); + if (!pSimpleItemTextCore->HasParent()) { - r = AttachChild(*__pSimpleItemText); + r = AttachChild(*pSimpleItemTextCore); SysTryReturn(NID_UI_CTRL, __pSimpleItemText != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); } } @@ -3450,11 +3445,13 @@ _TableViewItem::CreateSimpleItemContents(bool textOnly) if (__pSimpleItemText == null) { - __pSimpleItemText = _Label::CreateLabelN(); + __pSimpleItemText = new (std::nothrow) Label(); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pSimpleItemText != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); + __pSimpleItemText->Construct(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f), L""); + __pSimpleItemText->SetTextHorizontalAlignment(ALIGNMENT_LEFT); __pSimpleItemText->SetTextVerticalAlignment(ALIGNMENT_MIDDLE); if (__itemType == TABLE_VIEW_ITEM_TYPE_TITLE) @@ -3473,9 +3470,13 @@ _TableViewItem::CreateSimpleItemContents(bool textOnly) { if (__pSimpleItemBitmap == null) { - __pSimpleItemBitmap = _Label::CreateLabelN(); + __pSimpleItemBitmap = new (std::nothrow) Label(); + + r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pSimpleItemBitmap != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); + __pSimpleItemText->Construct(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f), L""); + __pSimpleItemText->SetBackgroundColor(Color(0, 0, 0, 0)); } @@ -3537,27 +3538,25 @@ _TableViewItem::SetSectionHeaderFooterContents(const Tizen::Base::String& text, GET_COLOR_CONFIG(TABLEVIEW::GROUPITEM_TEXT_NORMAL, textColor); GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_DEFAULT_TEXT_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, contentsHeight); - __pHeaderFooterItemText = _Label::CreateLabelN(); + __pHeaderFooterItemText = new (std::nothrow) Label(); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, __pHeaderFooterItemText != null, r, r, "[%s] Propagating.", GetErrorMessage(r)); - __pHeaderFooterItemText->SetTextHorizontalAlignment(alignment); - __pHeaderFooterItemText->SetTextColor(textColor); - __pHeaderFooterItemText->SetBackgroundColor(Color(0, 0, 0, 0)); - if (isHeader) { positionY = GetBoundsF().height - contentsHeight; } + __pHeaderFooterItemText->Construct(FloatRectangle(0.0f, positionY, GetBoundsF().width, contentsHeight), text); - __pHeaderFooterItemText->SetBounds(FloatRectangle(0.0f, positionY, GetBoundsF().width, contentsHeight)); + __pHeaderFooterItemText->SetTextHorizontalAlignment(alignment); + __pHeaderFooterItemText->SetTextColor(textColor); + __pHeaderFooterItemText->SetBackgroundColor(Color(0, 0, 0, 0)); - AttachChild(*__pHeaderFooterItemText); + _Label* pHeaderFooterItemTextCore = GetLabelCore(__pHeaderFooterItemText); + AttachChild(*pHeaderFooterItemTextCore); } - __pHeaderFooterItemText->SetText(text); - return E_SUCCESS; } @@ -3567,7 +3566,7 @@ _TableViewItem::SetSectionHeaderFooterAlignment(HorizontalAlignment alignment) if (__pHeaderFooterItemText != null) { __pHeaderFooterItemText->SetTextHorizontalAlignment(alignment); - __pHeaderFooterItemText->Invalidate(); + __pHeaderFooterItemText->Invalidate(false); } return E_SUCCESS; @@ -3741,7 +3740,8 @@ _TableViewItem::AdjustAnnexBounds(void) // h align if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING || __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER || __annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED) { - if (__pItemAnnex->HasParent()) + _Label* pAnnexCore = GetLabelCore(__pItemAnnex); + if (pAnnexCore->HasParent()) { FloatRectangle annexBounds = __pItemAnnex->GetBoundsF(); float annexPositionX = annexBounds.x; diff --git a/src/ui/inc/FUiCtrl_TableViewItem.h b/src/ui/inc/FUiCtrl_TableViewItem.h index e58ae7d..b81a833 100644 --- a/src/ui/inc/FUiCtrl_TableViewItem.h +++ b/src/ui/inc/FUiCtrl_TableViewItem.h @@ -354,6 +354,8 @@ private: result CreateOnOffButton(void); result CreateDetailButton(void); + _Label* GetLabelCore(Label* label); + private: void* __pAppInfo; int __refCount; @@ -381,7 +383,7 @@ private: _TableViewItemControl* __pItemDivider; _TableViewItemControl* __pItemTopDivider; - _Label* __pItemAnnex; + Label* __pItemAnnex; _TableViewItemControl* __pItemCover; _TableViewItemControl* __pItemAnnexLeftDivider; _TableViewItemControl* __pItemAnnexRightDivider; @@ -396,13 +398,13 @@ private: bool __itemDividerEnabled; // Simple Item - _Label* __pSimpleItemText; - _Label* __pSimpleItemBitmap; + Label* __pSimpleItemText; + Label* __pSimpleItemBitmap; Tizen::Graphics::Color __simpleItemTextColor[6]; int __simpleItemTextSize; // Section header, footer - _Label* __pHeaderFooterItemText; + Label* __pHeaderFooterItemText; _Label* __pDimLayer;