* @exception E_SUCCESS The method is successful.
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the IGroupedTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result ExpandGroup(int groupIndex);
* @exception E_SUCCESS The method is successful.
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the IGroupedTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result CollapseGroup(int groupIndex);
* @return An error code
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the IGroupedTableViewItemProvider call-back procedure.
*/
result ExpandAllGroups(void);
* @return An error code
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the IGroupedTableViewItemProvider call-back procedure.
*/
result CollapseAllGroups(void);
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
* @remarks If the specified item. itemIndex is -1, then the method is applied to the group item with the given index. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the IGroupedTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result ScrollToItem(int groupIndex, int itemIndex, TableViewScrollItemAlignment itemAlignment = TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_TOP);
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The item is disabled or the current state of the instance prohibits the execution of the specified operation.
* @remarks This method works only when the annex style of the item allows selection. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the IGroupedTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result SetItemChecked(int groupIndex, int itemIndex, bool check);
* @exception E_SUCCESS The method is successful.
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the IGroupedTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result SetItemEnabled(int groupIndex, int itemIndex, bool enable);
* @remarks If the specified item. itemIndex is -1, then the method is applied to the group item with the given index.
* Note that if TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE option is used to a group item, all the items in the group (including the group item itself) are
* removed from the table view. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the IGroupedTableViewItemProvider call-back procedure.
*/
result RefreshItem(int groupIndex, int itemIndex, TableViewRefreshType type);
result RefreshAllItems(void);
/**
- * Updates all the items of a table view.
+ * Updates all the items of a table view. @n
+ * This method deletes all the items in the table view and invokes the methods of the item provider again to update the table view.
*
* @since 2.0
*
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method clears all the items in the table view and invokes the methods of the item provider again to update the table view. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method will delete all the items and recreate them, so it should not be called from the inside of
+ * OnGroupedTableViewItemStateChanged() callback as this leads to self deletion. If you need to update an Item, you should use RefreshItem() method.
+ * @remarks This method should not be called from IGroupedTableViewItemProvider implementation because of recursion.
* @remarks The specific error code can be accessed using the GetLastResult() method.
*/
void UpdateTableView(void);
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation
* @remarks If you call ScrollByPixel() with negative @c pixel when position of scroll is already top of contents then it will return E_OUT_OF_RANGE.
* Likewise, in case of positive @c pixel on the bottom position of scroll it will also return E_OUT_OF_RANGE. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the IGroupedTableViewItemProvider call-back procedure.
*/
result ScrollByPixel(int pixel);
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation
* @remarks If you call ScrollByPixel() with negative @c pixel when position of scroll is already top of contents then it will return E_OUT_OF_RANGE.
* Likewise, in case of positive @c pixel on the bottom position of scroll it will also return E_OUT_OF_RANGE. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the IGroupedTableViewItemProvider call-back procedure.
*/
result ScrollByPixel(float pixel);
* @exception E_SUCCESS The method is successful.
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the ISectionTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result ScrollToItem(int sectionIndex, int itemIndex, TableViewScrollItemAlignment itemAlignment = TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_TOP);
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The item is disabled or the current state of the instance prohibits the execution of the specified operation.
* @remarks This method works only when the annex style of the item allows selection. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the ISectionTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result SetItemChecked(int sectionIndex, int itemIndex, bool check);
* @exception E_SUCCESS The method is successful.
* @exception E_OUT_OF_RANGE A specified input parameter is invalid.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method does not work during the ISectionTableViewItemProvider call-back procedure.
* @remarks This method should be called only after TableView items are created. If this method needs to be called early in the lifecycle of the TableView, then UpdateTableView() method should be called explicitly (e.g. during Tizen::Ui::Control::OnInitializing()).
*/
result SetItemEnabled(int sectionIndex, int itemIndex, bool enable);
* @remarks If the specified item. itemIndex is -1, then the method is applied to the section item with the given index.
* Note that if @c TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE option is used to a section item, all the items in the section (including the section item itself) are
* removed from the table view. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the ISectionTableViewItemProvider call-back procedure.
*/
result RefreshItem(int sectionIndex, int itemIndex, TableViewRefreshType type);
result RefreshAllItems(void);
/**
- * Updates all the items of a table view.
+ * Updates all the items of a table view. @n
+ * This method deletes all the items in the table view and invokes the methods of the item provider again to update the table view.
*
* @since 2.0
*
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method clears all the items in the table view and invokes the methods of the item provider again to update the table view. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method will delete all the items and recreate them, so it should not be called from the inside of
+ * OnSectionTableViewItemStateChanged() callback as this leads to self deletion. If you need to update an Item, you should use RefreshItem() method.
+ * @remarks This method should not be called from ISectionTableViewItemProvider implementation because of recursion.
* @remarks The specific error code can be accessed using the GetLastResult() method.
*/
void UpdateTableView(void);
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation
* @remarks If you call %ScrollByPixel() with negative @c pixel when position of scroll is already top of contents then it will return E_OUT_OF_RANGE.
* Likewise, in case of positive @c pixel on the bottom position of scroll it will also return E_OUT_OF_RANGE. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the ISectionTableViewItemProvider call-back procedure.
*/
result ScrollByPixel(int pixel);
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation
* @remarks If you call %ScrollByPixel() with negative @c pixel when position of scroll is already top of contents then it will return E_OUT_OF_RANGE.
* Likewise, in case of positive @c pixel on the bottom position of scroll it will also return E_OUT_OF_RANGE. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * This method does not work during the ISectionTableViewItemProvider call-back procedure.
*/
result ScrollByPixel(float pixel);
result RefreshAllItems(void);
/**
- * Updates all the items of a table view.
+ * Updates all the items of a table view. @n
+ * This method deletes all the items in the table view and invokes the methods of the item provider again to update the table view.
*
* @since 2.0
*
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation @b Since: @b 2.1.
- * @remarks This method clears all the items in the table view and invokes the methods of the item provider again to update the table view. @n
- * This method does not work during the ITableViewItemProvider call-back procedure.
+ * @remarks This method will delete all the items and recreate them, so it should not be called from the inside of
+ * OnTableViewItemStateChanged() callback as this leads to self deletion. If you need to update an Item, you should use RefreshItem() method.
+ * @remarks This method should not be called from ITableViewItemProvider implementation because of recursion.
* @remarks The specific error code can be accessed using the GetLastResult() method.
*/
void UpdateTableView(void);
* @exception E_SUCCESS The method is successful.
* @exception E_SYSTEM A system error has occurred.
* @exception E_INVALID_ARG The specified @c destType is not of a supported type.
- * @remarks If you have set a data binding listener, @n
- this method is returned after that listener is called.
+ * @remarks 1. If you have set a data binding listener, @n
+ this method is returned after that listener is called. @n
+ 2. The behavior of this method is dependent on the system default locale setting.
* @see IDataBindingListener
*/
result UpdateAllBindings(DataBindingDestinationType destType);
* @exception E_OBJ_NOT_FOUND The given binding ID is not registered.
* @exception E_INVALID_OPERATION The given binding's trigger is not 'explicit' type.
* @exception E_INVALID_ARG The specified @c destType is not supported in binding ID.
- * @remarks If you have set a data binding listener, @n
- this method is returned after that listener is called.
+ * @remarks 1. If you have set a data binding listener, @n
+ this method is returned after that listener is called.@n
+ 2. The behavior of this method is dependent on the system default locale setting.
* @see IDataBindingListener
*/
result UpdateBinding(const Tizen::Base::String& bindingId, DataBindingDestinationType destType);
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_NORMAL;
+ _OSP_EXPORT_ static const int CONTENT_BG_NORMAL;
/**
* The property key to get the pressed background color of the picker button of date time picker
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_PRESSED;
+ _OSP_EXPORT_ static const int CONTENT_BG_PRESSED;
/**
* The property key to get the disabled background color of the picker button of date time picker
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_DISABLED;
+ _OSP_EXPORT_ static const int CONTENT_BG_DISABLED;
/**
* The property key to get the highlighted background color of the picker button of date time picker
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_HIGHLIGHTED;
+ _OSP_EXPORT_ static const int CONTENT_BG_HIGHLIGHTED;
};
struct _OSP_EXPORT_ Edit
{
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_NORMAL;
+ _OSP_EXPORT_ static const int CONTENT_BG_NORMAL;
/**
* The property key to get the pressed background color of the picker button of edit date
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_PRESSED;
+ _OSP_EXPORT_ static const int CONTENT_BG_PRESSED;
/**
* The property key to get the disabled background color of the picker button of edit date
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_DISABLED;
+ _OSP_EXPORT_ static const int CONTENT_BG_DISABLED;
/**
* The property key to get the highlighted background color of the picker button of edit date
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_HIGHLIGHTED;
+ _OSP_EXPORT_ static const int CONTENT_BG_HIGHLIGHTED;
};
struct _OSP_EXPORT_ EditTime
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_NORMAL;
+ _OSP_EXPORT_ static const int CONTENT_BG_NORMAL;
/**
* The property key to get the pressed background color of the picker button of edit time
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_PRESSED;
+ _OSP_EXPORT_ static const int CONTENT_BG_PRESSED;
/**
* The property key to get the disabled background color of the picker button of edit time
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_DISABLED;
+ _OSP_EXPORT_ static const int CONTENT_BG_DISABLED;
/**
* The property key to get the highlighted background color of the picker button of edit time
*
* @since 2.1
*/
- _OSP_EXPORT_ static const int PICKER_BUTTON_BG_HIGHLIGHTED;
+ _OSP_EXPORT_ static const int CONTENT_BG_HIGHLIGHTED;
};
struct _OSP_EXPORT_ FastScroll
/**
* @file gl.h
- * @brief This is the header file for the OpenGL&Reg; ES 1.1.
+ * @brief This is the header file for the OpenGL® ES 1.1.
*
- * This header file contains the declarations of the OpenGL&Reg; ES 1.1.
+ * This header file contains the declarations of the OpenGL® ES 1.1.
*/
#include "glplatform.h"
SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
#else
- pFallbackFontMap->insert(_FontRsrcManager::FontMapT::value_type(fontNameTemp, out));
+ pFallbackFontMap->push_back(std::make_pair(fontNameTemp, out));
#endif
r = mgr.AddFont(fontNameTemp, out);
SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
}
}; // _FontComparerEx
+#else
+
+class _FindValueByString
+{
+public:
+ _FindValueByString(const _Util::WString& key)
+ : __key(key)
+ {
+ }
+
+ bool operator()(const std::pair<_Util::WString, Tizen::Graphics::_FontRsrcManager::SharedFontResource> pairValue)
+ {
+ return (__key == pairValue.first);
+ }
+
+ bool operator()(const std::pair<_Util::WString, _Util::WString> pairValue)
+ {
+ return (__key == pairValue.first);
+ }
+
+ const _Util::WString& __key;
+}; // _FindValueByString
+
#endif
}
#ifdef USE_HASHMAP_FOR_FONT
return (__fontRsrcMap.GetValue(fontPath, out) == E_SUCCESS);
#else
- FontMapT::const_iterator fontIterator = __fontRsrcMap.find(fontPath);
+ FontMapT::const_iterator fontIterator = std::find_if(__fontRsrcMap.begin(), __fontRsrcMap.end(), _FindValueByString(fontPath));
if (fontIterator != __fontRsrcMap.end())
{
out = fontIterator->second;
+
return true;
}
SysTryReturn(NID_GRP, r == E_SUCCESS || r == E_OBJ_ALREADY_EXIST, false, false, "[%s] Failed to add font into resource pool", GetErrorMessage(r));
#else
- __fontRsrcMap[key] = font;
+ __fontRsrcMap.push_back(std::make_pair(key, font));
#endif
return true;
#ifdef USE_HASHMAP_FOR_FONT
__fontRsrcMap.Remove(key);
#else
- __fontRsrcMap.erase(key);
+ for (FontMapT::iterator fontMapIter = __fontRsrcMap.begin(); fontMapIter != __fontRsrcMap.end(); ++fontMapIter)
+ {
+ if (fontMapIter->first == key)
+ {
+ __fontRsrcMap.erase(fontMapIter);
+ break;
+ }
+ }
#endif
}
}
#ifdef USE_HASHMAP_FOR_FONT
__appFontMap.Add(faceNameTemp, nameTemp);
#else
- __appFontMap[faceNameTemp] = nameTemp;
+ __appFontMap.push_back(std::make_pair(faceNameTemp, nameTemp));
#endif
}
}
#ifdef USE_HASHMAP_FOR_FONT
__appFontMap.GetValue(fontName, fontPath);
#else
- AppFontMapT::const_iterator appFontIterator = __appFontMap.find(fontName);
+ AppFontMapT::const_iterator appFontIterator = std::find_if(__appFontMap.begin(), __appFontMap.end(), _FindValueByString(fontName));
if (appFontIterator != __appFontMap.end())
{
return fontPath;
}
-}} // Tizen::Graphics
+}} // Tizen::Graphics
\ No newline at end of file
#ifdef USE_HASHMAP_FOR_FONT
#include <FBaseColHashMapT.h>
#else
- #include <tr1/unordered_map>
+ #include <list>
+ #include <algorithm>
#endif
#include <FBaseString.h>
typedef Tizen::Base::Collection::HashMapT <_Util::WString, SharedFontResource> FontMapT;
typedef Tizen::Base::Collection::HashMapT <_Util::WString, _Util::WString> AppFontMapT;
#else
- typedef std::tr1::unordered_map<_Util::WString, SharedFontResource> FontMapT;
- typedef std::tr1::unordered_map<_Util::WString, _Util::WString> AppFontMapT;
+ typedef std::list<std::pair<_Util::WString, SharedFontResource> > FontMapT;
+ typedef std::list<std::pair<_Util::WString, _Util::WString> > AppFontMapT;
#endif
virtual ~_FontRsrcManager(void);
#ifdef USE_HASHMAP_FOR_FONT
-#include <FBaseColHashMapT.h>
+ #include <FBaseColHashMapT.h>
#else
-#include <tr1/unordered_map>
-#include <FBaseColIListT.h>
+ #include <list>
+ #include <FBaseColIListT.h>
#endif
#include "util/FGrp_UtilType.h"
#ifdef USE_HASHMAP_FOR_FONT
typedef Tizen::Base::Collection::HashMapT <_Util::WString, SharedFontResource> FontMapT;
#else
- typedef std::tr1::unordered_map<_Util::WString, SharedFontResource> FontMapT;
+ typedef std::list<std::pair<_Util::WString, SharedFontResource> > FontMapT;
#endif
//! Enumerated definition of the font style.
if (LTRTextLength <= 0)
{
- if (pLastDisplayTextElement->IsBackGroundDrawingModeEnable())
+ if (pLastDisplayTextElement && pLastDisplayTextElement->IsBackGroundDrawingModeEnable())
{
r = canvasImpl.FillRectangle(pLastDisplayTextElement->GetBackgroundColor(), FloatRectangle(adjustedRect.x, displayRect.y, abbrevTextDim.width, displayRect.height));
SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
const int ColorKey::DateTimePicker::AM_PM_TEXT_DISABLED = _DATETIMEPICKER::AMPM_TEXT_DISABLED_COLOR;
const int ColorKey::DateTimePicker::DIVIDER_LEFT_HALF = _DATETIMEPICKER::DIVIDER_LEFT_HALF_COLOR;
const int ColorKey::DateTimePicker::DIVIDER_RIGHT_HALF = _DATETIMEPICKER::DIVIDER_RIGHT_HALF_COLOR;
-const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_NORMAL = _DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL_COLOR;
-const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_PRESSED = _DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED_COLOR;
-const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_DISABLED = _DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED_COLOR;
-const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_HIGHLIGHTED = _DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::DateTimePicker::CONTENT_BG_NORMAL = _DATETIMEPICKER::CONTENT_BG_NORMAL_COLOR;
+const int ColorKey::DateTimePicker::CONTENT_BG_PRESSED = _DATETIMEPICKER::CONTENT_BG_PRESSED_COLOR;
+const int ColorKey::DateTimePicker::CONTENT_BG_DISABLED = _DATETIMEPICKER::CONTENT_BG_DISABLED_COLOR;
+const int ColorKey::DateTimePicker::CONTENT_BG_HIGHLIGHTED = _DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED_COLOR;
const int ColorKey::Edit::BG_NORMAL = _EDIT::BG_NORMAL_COLOR;
const int ColorKey::Edit::BG_PRESSED = _EDIT::BG_PRESSED_COLOR;
const int ColorKey::Edit::BG_HIGHLIGHTED = _EDIT::BG_HIGHLIGHTED_COLOR;
const int ColorKey::EditDate::TITLE_TEXT_DISABLED = _EDITDATE::TITLE_TEXT_DISABLED_COLOR;
const int ColorKey::EditDate::DIVIDER_HALF_LEFT = _EDITDATE::DIVIDER_LEFT_HALF_COLOR;
const int ColorKey::EditDate::DIVIDER_HALF_RIGHT = _EDITDATE::DIVIDER_RIGHT_HALF_COLOR;
-const int ColorKey::EditDate::PICKER_BUTTON_BG_NORMAL = _EDITDATE::PICKER_BUTTON_BG_NORMAL_COLOR;
-const int ColorKey::EditDate::PICKER_BUTTON_BG_PRESSED = _EDITDATE::PICKER_BUTTON_BG_PRESSED_COLOR;
-const int ColorKey::EditDate::PICKER_BUTTON_BG_DISABLED = _EDITDATE::PICKER_BUTTON_BG_DISABLED_COLOR;
-const int ColorKey::EditDate::PICKER_BUTTON_BG_HIGHLIGHTED = _EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::EditDate::CONTENT_BG_NORMAL = _EDITDATE::CONTENT_BG_NORMAL_COLOR;
+const int ColorKey::EditDate::CONTENT_BG_PRESSED = _EDITDATE::CONTENT_BG_PRESSED_COLOR;
+const int ColorKey::EditDate::CONTENT_BG_DISABLED = _EDITDATE::CONTENT_BG_DISABLED_COLOR;
+const int ColorKey::EditDate::CONTENT_BG_HIGHLIGHTED = _EDITDATE::CONTENT_BG_HIGHLIGHTED_COLOR;
const int ColorKey::EditTime::BUTTON_BG_NORMAL = _EDITTIME::BUTTON_BG_NORMAL_COLOR;
const int ColorKey::EditTime::BUTTON_BG_PRESSED = _EDITTIME::BUTTON_BG_PRESSED_COLOR;
const int ColorKey::EditTime::TITLE_TEXT_NORMAL = _EDITTIME::TITLE_TEXT_NORMAL_COLOR;
const int ColorKey::EditTime::TITLE_TEXT_DISABLED = _EDITTIME::TITLE_TEXT_DISABLED_COLOR;
const int ColorKey::EditTime::BUTTON_BG_HIGHLIGHTED = _EDITTIME::BUTTON_BG_HIGHLIGHTED_COLOR;
-const int ColorKey::EditTime::PICKER_BUTTON_BG_NORMAL = _EDITTIME::PICKER_BUTTON_BG_NORMAL_COLOR;
-const int ColorKey::EditTime::PICKER_BUTTON_BG_PRESSED = _EDITTIME::PICKER_BUTTON_BG_PRESSED_COLOR;
-const int ColorKey::EditTime::PICKER_BUTTON_BG_DISABLED = _EDITTIME::PICKER_BUTTON_BG_DISABLED_COLOR;
-const int ColorKey::EditTime::PICKER_BUTTON_BG_HIGHLIGHTED = _EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::EditTime::CONTENT_BG_NORMAL = _EDITTIME::CONTENT_BG_NORMAL_COLOR;
+const int ColorKey::EditTime::CONTENT_BG_PRESSED = _EDITTIME::CONTENT_BG_PRESSED_COLOR;
+const int ColorKey::EditTime::CONTENT_BG_DISABLED = _EDITTIME::CONTENT_BG_DISABLED_COLOR;
+const int ColorKey::EditTime::CONTENT_BG_HIGHLIGHTED = _EDITTIME::CONTENT_BG_HIGHLIGHTED_COLOR;
const int ColorKey::FastScroll::INDEX_BG_NORMAL = _FASTSCROLL::INDEX_BG_NORMAL_COLOR;
const int ColorKey::FastScroll::INDEX_BG_PRESSED = _FASTSCROLL::INDEX_BG_PRESSED_COLOR;
const int ColorKey::FastScroll::INDEX_LINE_PRESSED = _FASTSCROLL::INDEX_LINE_PRESSED_COLOR;
using namespace Tizen::Graphics;
using namespace Tizen::Ui::Controls;
+/*
namespace
{
void ConvertTouchPosition(Tizen::Ui::_AccessibilityGestureType& type, float &x, float&y)
}
}
}
-
-namespace Tizen { namespace Ui {
+*/
+namespace Tizen { namespace Ui
+{
_AccessibilityGesture::_AccessibilityGesture(_AccessibilityManager& manager)
: __pManager(&manager)
{
_ImeOrientationAgent::_ImeOrientationAgent(Control& publicControl)
: __publicControl(publicControl)
, __pPublicEvent(null)
+ , __status(ORIENTATION_STATUS_PORTRAIT)
{
_PublicOrientationEvent* pPublicEvent = _PublicOrientationEvent::CreateInstanceN(publicControl);
SetLastResult(E_SUCCESS);
}
+OrientationStatus
+_ImeOrientationAgent::GetStatus(void) const
+{
+ return __status;
+}
+
void
_ImeOrientationAgent::UpdateOrientation(int angle)
{
break;
}
+ __status = status;
+
FireEvent(status);
pImpl->Invalidate(true);
}
void AddListener(IOrientationEventListener& listener);
void RemoveListener(IOrientationEventListener& listener);
+ OrientationStatus GetStatus(void) const;
+
void UpdateOrientation(int angle);
private:
private:
Control& __publicControl;
_PublicOrientationEvent* __pPublicEvent;
+ OrientationStatus __status;
}; // _ImeOrientationAgent
}} // Tizen::Ui
return false;
}
+ _KeyCode keyCode = keyInfo.GetKeyCode();
+ if (keyCode == _KEY_OEM_1)
+ {
+ return false;
+ }
+
Ecore_Event_Key* pEvent = static_cast<Ecore_Event_Key*>(keyInfo.GetUserData());
SysTryReturn(NID_UI, pEvent, false, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
return false;
}
+ _KeyCode keyCode = keyInfo.GetKeyCode();
+ if (keyCode == _KEY_OEM_1)
+ {
+ return false;
+ }
+
Ecore_Event_Key* pEvent = static_cast<Ecore_Event_Key*>(keyInfo.GetUserData());
SysTryReturn(NID_UI, pEvent, false, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
FloatPoint point = GetRelativePoint(*pControl, pTouchInfo->GetCurrentPosition());
+ if (!pControl->IsMultiTouchEnabled() && pTouchInfo->GetPointId() > 0)
+ {
+ isFiltered = false;
+ return E_SUCCESS;
+ }
+
_TouchInfo touchInfo(pTouchInfo->GetPointId(), pTouchInfo->GetTouchStatus(), point, false, pTouchInfo->GetTimeStamp());
_UiTouchEventDelivery eventDelivery = _UI_TOUCH_EVENT_DELIVERY_NO;
if (__pEvasImage != null)
{
evas_object_hide(__pEvasImage);
- evas_object_image_data_set(__pEvasImage, null);
- evas_object_del(__pEvasImage);
+ if (__pBuffer)
+ {
+ evas_object_image_data_set(__pEvasImage, null);
+ evas_object_del(__pEvasImage);
+ }
evas_object_smart_member_del(__pEvasImage);
}
if (unlikely(RectUtilIsEqual(__contentBounds, contentBounds)))
return E_SUCCESS;
- SysTryReturnResult(NID_UI_ANIM, contentBounds.width >= 0.0f && contentBounds.height >= 0.0f, E_INVALID_ARG, "Invalid argument(s) is used. The size of contents bounds must be greater than or equal to 0.0f.");
+ SysTryReturnResult(NID_UI_ANIM, contentBounds.width > 0.0f && contentBounds.height > 0.0f, E_INVALID_ARG, "Invalid argument(s) is used. The size of contents bounds must be greater than or equal to 0.0f.");
__contentBounds = contentBounds;
__useContentBounds = (__contentBounds.x != 0.0f || __contentBounds.y != 0.0f || __contentBounds.width != 1.0f || __contentBounds.height != 1.0f);
pHandler->SetImplicitAnimationEnabled(false);
- pHandler->SetBounds(FloatRectangle(bounds.x + handlerBounds.x, bounds.y + handlerBounds.y, handlerWidth, handlerHeight));
+ pHandler->SetBounds(CoordinateSystem::AlignToDevice(FloatRectangle(bounds.x + handlerBounds.x, bounds.y + handlerBounds.y, handlerWidth, handlerHeight)));
pHandler->SetShowState(true);
pHandler->SetBackBufferEnabled(true);
float arrowButtonLeftMargin = 0.0f;
float arrowButtonTopMargin = 0.0f;
float barTopMargin = 0.0f;
- float barLeftMargin = 0.0f;
+ float barLeftRightMargin = 0.0f;
float sliderHeight = 0.0f;
float sliderWidth = 0.0f;
GET_SHAPE_CONFIG(COLORPICKER::ARROW_BUTTON_LEFT_MARGIN, orientation, arrowButtonLeftMargin);
GET_SHAPE_CONFIG(COLORPICKER::ARROW_BUTON_TOP_MARGIN, orientation, arrowButtonTopMargin);
GET_SHAPE_CONFIG(COLORPICKER::BAR_TOP_MARGIN, orientation, barTopMargin);
- GET_SHAPE_CONFIG(COLORPICKER::BAR_LEFT_MARGIN, orientation, barLeftMargin);
+ GET_SHAPE_CONFIG(COLORPICKER::BAR_LEFT_RIGHT_MARGIN, orientation, barLeftRightMargin);
GET_SHAPE_CONFIG(COLORPICKER::SLIDER_HEIGHT, orientation, sliderHeight);
GET_FIXED_VALUE_CONFIG(COLORPICKER::BLOCK_MARGIN, orientation, __blockMargin);
GET_SHAPE_CONFIG(COLORPICKER::BLOCK_HEIGHT, orientation, __blockHeight);
//Set contents position
__componentBounds[HUE_ARROWLEFT].SetBounds(arrowButtonLeftMargin, btnStartY, arrowButtonWidth, arrowButtonHeight);
- __componentBounds[HUE_BAR].SetBounds(arrowButtonLeftMargin + arrowButtonWidth + barLeftMargin, barStartY, sliderWidth, sliderHeight);
+ __componentBounds[HUE_BAR].SetBounds(arrowButtonLeftMargin + arrowButtonWidth + barLeftRightMargin, barStartY, sliderWidth, sliderHeight);
- __componentBounds[HUE_ARROWRIGHT].SetBounds(__componentBounds[HUE_BAR].x + sliderWidth + barLeftMargin, btnStartY,
+ __componentBounds[HUE_ARROWRIGHT].SetBounds(__componentBounds[HUE_BAR].x + sliderWidth + barLeftRightMargin, btnStartY,
arrowButtonWidth, arrowButtonHeight);
btnStartY += __blockHeight;
__componentBounds[SAT_ARROWLEFT].SetBounds(arrowButtonLeftMargin, btnStartY, arrowButtonWidth, arrowButtonHeight);
- __componentBounds[SAT_BAR].SetBounds(arrowButtonLeftMargin + arrowButtonWidth + barLeftMargin, barStartY + __blockHeight,
+ __componentBounds[SAT_BAR].SetBounds(arrowButtonLeftMargin + arrowButtonWidth + barLeftRightMargin, barStartY + __blockHeight,
sliderWidth, sliderHeight);
- __componentBounds[SAT_ARROWRIGHT].SetBounds(__componentBounds[SAT_BAR].x + sliderWidth + barLeftMargin, btnStartY,
+ __componentBounds[SAT_ARROWRIGHT].SetBounds(__componentBounds[SAT_BAR].x + sliderWidth + barLeftRightMargin, btnStartY,
arrowButtonWidth, arrowButtonHeight);
btnStartY += __blockHeight;
__componentBounds[LUM_ARROWLEFT].SetBounds(arrowButtonLeftMargin, btnStartY, arrowButtonWidth, arrowButtonHeight);
- __componentBounds[LUM_BAR].SetBounds(arrowButtonLeftMargin + arrowButtonWidth + barLeftMargin, barStartY + __blockHeight * 2,
+ __componentBounds[LUM_BAR].SetBounds(arrowButtonLeftMargin + arrowButtonWidth + barLeftRightMargin, barStartY + __blockHeight * 2,
sliderWidth, sliderHeight);
- __componentBounds[LUM_ARROWRIGHT].SetBounds(__componentBounds[LUM_BAR].x + sliderWidth + barLeftMargin, btnStartY,
+ __componentBounds[LUM_ARROWRIGHT].SetBounds(__componentBounds[LUM_BAR].x + sliderWidth + barLeftRightMargin, btnStartY,
arrowButtonWidth, arrowButtonHeight);
float differentialY = (handlerHeight - sliderHeight) / 2.0f;
using namespace Tizen::Media;
using namespace Tizen::Ui::Animations;
+namespace {
+static const float TOUCH_PRESS_THRESHOLD_INSENSITIVE = 0.16f;
+}
+
namespace Tizen { namespace Ui { namespace Controls
{
SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to Install.", GetErrorMessage(r));
pContextMenu->AcquireHandle();
- pContextMenu->SetTouchPressThreshold(0.08f);
+ pContextMenu->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
if (pContextMenu->GetAccessibilityContainer() != null)
{
GET_SHAPE_CONFIG(CONTEXTMENU::LIST_MIN_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, minWidth);
GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, minHeight);
pContextMenu->__pScrollPanel = _ScrollPanel::CreateScrollPanelN(FloatRectangle(0.0f, 0.0f, minWidth, minHeight), SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL, false, false);
+ pContextMenu->__pScrollPanel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
pContextMenu->AttachChild(*(pContextMenu->__pScrollPanel));
}
using namespace Tizen::Base::Runtime;
using namespace Tizen::Graphics::_Text;
+namespace {
+static const float TOUCH_PRESS_THRESHOLD_INSENSITIVE = 0.16f;
static const int CONTEXT_MENU_LIST_ELEMENT_TEXT = 0;
static const int CONTEXT_MENU_LIST_ELEMENT_BITMAP = 1;
+}
namespace Tizen { namespace Ui { namespace Controls
{
int bitmapY = (__itemHeight - __itemBitmapHeight ) / 2;
pLabel->SetBounds(FloatRectangle(__leftMargin, bitmapY, __itemBitmapWidth, __itemBitmapHeight));
+ pLabel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
pItem->AttachChild(*pLabel);
_AccessibilityContainer* pContainer = pLabel->GetAccessibilityContainer();
if (pContainer)
GET_SHAPE_CONFIG(LABEL::TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, labelTopMargin);
textArea.width += 2.0f * labelLeftMargin;
textArea.height += 2.0f * labelTopMargin;
- itemSize.height = __itemHeight + __dividerHeight;
+ itemSize.height = __itemHeight + (__dividerHeight * 2.0f);
itemSize.width = __leftMargin + textArea.width + __rightMargin + bitmapWidth;
itemSize.width = itemSize.width < __itemMinWidth ? __itemMinWidth : itemSize.width;
pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
pLabel->SetTextConfig(__itemFontSize, LABEL_TEXT_STYLE_NORMAL);
+ pLabel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
pItem->AttachChild(*pLabel);
_AccessibilityContainer* pContainer = pLabel->GetAccessibilityContainer();
if (pContainer)
__itemWidth = __itemWidth < itemSize.width ? itemSize.width : __itemWidth;
+ pItem->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
return pItem;
}
{
__pContextMenu->GetScrollPanel()->SetBounds(FloatRectangle(bodyRect.x + bodyLeftMargin, bodyRect.y + bodyTopMargin, __layoutSize.width, __layoutSize.height));
int itemCount = __pModel->GetItemCount();
- float itemHeight = __itemHeight + __dividerHeight;
- float layoutClientHeight = itemCount * itemHeight - __dividerHeight;
+ float itemHeight = __itemHeight + (__dividerHeight * 2.0f);
+ float layoutClientHeight = itemCount * itemHeight - (__dividerHeight * 2.0f);
__pContextMenu->GetScrollPanel()->SetClientAreaHeight(layoutClientHeight);
}
int itemMaxCount = CalculateShowItemCount();
int itemCount = __pModel->GetItemCount();
- float itemHeight = __itemHeight + __dividerHeight;
+ float itemHeight = __itemHeight + (__dividerHeight * 2.0f);
FloatDimension layoutSize(__itemWidth, 0.0f);
- float layoutClientHeight = itemCount * itemHeight - __dividerHeight;
- float layoutMaxHeight = itemMaxCount * itemHeight - __dividerHeight;
+ float layoutClientHeight = itemCount * itemHeight - (__dividerHeight * 2.0f);
+ float layoutMaxHeight = itemMaxCount * itemHeight - (__dividerHeight * 2.0f);
if (layoutClientHeight > layoutMaxHeight)
{
__scrollEnable = true;
return;
}
- float itemHeight = __itemHeight + __dividerHeight;
+ float itemHeight = __itemHeight + (__dividerHeight * 2.0f);
float drawItemY = 0.0f;
float x = __pContextMenu->GetBodyRect().x + __leftMargin;
cursorRect = __pCopyPasteManager->GetCursorBoundsF(false);
absCursorRect = __pCopyPasteManager->GetCursorBoundsF(true);
touchPoint.x = cursorRect.x + (point.x - __touchPressedPoint.x);
- touchPoint.y = cursorRect.y + cursorRect.height + (point.y - __touchPressedPoint.y);
+ if (totalLine == 1)
+ {
+ touchPoint.y = cursorRect.y + cursorRect.height/2;
+ }
+ else
+ {
+ touchPoint.y = cursorRect.y + cursorRect.height + (point.y - __touchPressedPoint.y);
+ }
cursorPos = __pCopyPasteManager->GetCursorPositionAt(touchPoint);
if (cursorPos != -1)
if (GetDateTimeBar() != null)
{
- CalculateDateTimeBarPosition();
GetDateTimeBar()->SetVisibleState(false);
GetDateTimeBar()->Close();
}
bool
_EditDate::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
{
- FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
-
SetFocused(true);
- if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
- {
- CalculateDateTimeBarPosition();
- }
-
return __pEditDatePresenter->OnTouchPressed(source, touchinfo);
}
bool
_EditDate::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
{
+ FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
+
+ if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
+ {
+ CalculateDateTimeBarPosition();
+ }
+
return __pEditDatePresenter->OnTouchReleased(source, touchinfo);
}
, __isCursorInitialized(false)
, __isCursorDisabled(false)
, __isInitialized(false)
- , __isInitializing(false)
, __isMovingCursorByTouchMove(false)
, __isTouchMoving(false)
, __isTouchPressed(false)
, __isKeypadHiding(false)
, __blockStartPos(0)
, __cursorPos(0)
- , __maximumFlexibleHeight(-1.0f)
, __prevTotalTextHeight(-1.0f)
, __textLength(0)
, __composingTextLength(0)
__pTextObject->SetBounds(__textObjectBounds);
__pTextObject->HideRearSpace(TEXT_OBJECT_SPACE_HIDE_TYPE_NONE);
- __maximumFlexibleHeight = GetMaxLineCount() * __pFont->GetMaxHeight() + __verticalMargin;
-
__pEditVEDelegator = new (std::nothrow) _EditAnimationProvider();
SysTryCatch(NID_UI_CTRL, __pEditVEDelegator, , E_OUT_OF_MEMORY, "Memory allocation failed.");
{
result r = E_SUCCESS;
- __isInitializing = true;
-
Resize();
InitializeParentPanel();
if ((__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN) == false && (__pEdit->GetEditStyle() & EDIT_STYLE_FLEXIBLE))
{
- r = AdjustFlexibleHeight();
- SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Faild to adjust flexible height.");
+ AdjustFlexibleHeight();
}
ReplaceTextIntoPasswordHyphenString();
return E_SYSTEM;
}
- if (__maximumFlexibleHeight > 0 && __maximumFlexibleHeight <= __initialBounds.height)
- {
- return E_SYSTEM;
- }
-
__pTextObject->Compose();
if (__prevTotalTextHeight == __pTextObject->GetTotalHeightF()) // if text height has not changed.
{
result r = E_SUCCESS;
- if (!__isInitializing)
- {
- return E_SUCCESS;
- }
-
_ExpandableEditAreaEventStatus expandableEditAreaStatus = _EXPANDABLE_EDITAREA_EVENT_ADDED;
if (__pEdit->GetBounds().height > bounds.height)
{
{
result r = E_SUCCESS;
- if (!__isInitializing)
- {
- return E_SUCCESS;
- }
-
_ExpandableEditAreaEventStatus expandableEditAreaStatus = _EXPANDABLE_EDITAREA_EVENT_ADDED;
if (__pEdit->GetBoundsF().height > bounds.height)
{
float
_EditPresenter::CalculateMaximumFlexibleHeight(void)
{
- float maxHeight = __maximumFlexibleHeight;
+ float maxHeight = 0.0f;
float expectedEditHeight = __pTextObject->GetTotalHeightF() + __verticalMargin;
int maximumFlexibleLineNumber = GetMaxLineCount();
- // if height is longer than max height.
- if (maxHeight > 0 && expectedEditHeight >= maxHeight)
- {
- maxHeight = __maximumFlexibleHeight;
- }
- else if (maximumFlexibleLineNumber > 0) // if max line number is set.
+ if (maximumFlexibleLineNumber > 0) // if max line number is set.
{
maxHeight = maximumFlexibleLineNumber * __pTextObject->GetLineHeightAtF(0) + __verticalMargin;
if (GetDateTimeBar() != null)
{
- CalculateDateTimeBarPosition();
GetDateTimeBar()->SetVisibleState(false);
GetDateTimeBar()->Close();
}
bool
_EditTime::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
{
- FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
-
SetFocused(true);
- if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
- {
- CalculateDateTimeBarPosition();
- }
-
return __pEditTimePresenter->OnTouchPressed(source, touchinfo);
}
bool
_EditTime::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
{
+ FloatRectangle absoluteBounds = GetAbsoluteBoundsF();
+
+ if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height)
+ {
+ CalculateDateTimeBarPosition();
+ }
+
return __pEditTimePresenter->OnTouchReleased(source, touchinfo);
}
{
return __pOriAgent->GetStatus();
}
+ else if (__pImeOriAgent)
+ {
+ return __pImeOriAgent->GetStatus();
+ }
return ORIENTATION_STATUS_NONE;
}
{
return __pOrientationAgent->GetStatus();
}
+ else if (__pImeOrientationAgent)
+ {
+ return __pImeOrientationAgent->GetStatus();
+ }
return ORIENTATION_STATUS_NONE;
}
, __pEmptyText(null)
, __redrawListView(true)
, __isBoundsChanged(false)
+ , __needReloadItems(false)
, __pItemNeedsLazyDeletion(null)
, __pPropagatedTouchEventListener(null)
{
{
result r = E_SUCCESS;
+ if (__needReloadItems)
+ {
+ return r;
+ }
+
int groupCount = GetCore().GetGroupCount();
int itemCount = GetCore().GetItemCountAt(groupIndex);
result
_GroupedListViewImpl::UpdateList(void)
{
+ __needReloadItems = true;
+
// for lazy delete item
SetItemNeedsLazyDeletion();
Show();
}
+ __needReloadItems = false;
+
SetLastResultReturn(r);
}
, __pEmptyText(null)
, __redrawListView(true)
, __isBoundsChanged(false)
+ , __needReloadItems(false)
, __pItemNeedsLazyDeletion(null)
, __pPropagatedTouchEventListener(null)
{
{
result r = E_SUCCESS;
+ if (__needReloadItems)
+ {
+ return r;
+ }
+
int itemCount = GetCore().GetItemCountAt(0);
if ((index < 0) || (index > itemCount) || ((type != LIST_REFRESH_TYPE_ITEM_ADD) && (index == itemCount)))
result
_ListViewImpl::UpdateList(void)
{
+ __needReloadItems = true;
+
// for lazy delete item
SetItemNeedsLazyDeletion();
Show();
}
+ __needReloadItems = false;
+
SetLastResultReturn(r);
}
#include "FUi_CoordinateSystemUtils.h"
#include "FUiCtrl_ButtonImpl.h"
#include "FUiCtrl_Button.h"
+#include "FUiCtrl_Label.h"
#include "FUiCtrl_Scroll.h"
+#include "FUiCtrl_ScrollPanel.h"
#include "FUiCtrl_MessageBox.h"
#include "FUiCtrl_MessageBoxPresenter.h"
, __pBodyTextObject(null)
, __titleBounds(0.0f, 0.0f, 0.0f, 0.0f)
, __textBounds(0.0f, 0.0f, 0.0f, 0.0f)
+ , __pLabel(null)
, __pScroll(null)
+ , __pScrollPanel(null)
, __fontStyle(0)
, __fontSize(0.0f)
, __scrollPos(0.0f)
__pBodyTextObject = null;
}
+ if (__pLabel != null)
+ {
+ __pScrollPanel->DetachChild(*__pLabel);
+ delete __pLabel;
+ __pLabel = null;
+ }
+
+ if (__pScrollPanel != null)
+ {
+ __pMessageBox->DetachChild(*__pScrollPanel);
+ delete __pScrollPanel;
+ __pScrollPanel = null;
+ }
+
if (__pScroll != null)
{
__pMessageBox->DetachSystemChild(*__pScroll);
float maxHeight = 0.0f;
float textTopMargin = 0.0f;
- float textLeftMargin = 0.0f;
- float textRightMargin = 0.0f;
float titleTopMargin = 0.0f;
float titleLeftMargin = 0.0f;
float transTopMargin = 0.0f;
float transBottomMargin = 0.0f;
- float transLeftMargin = 0.0f;
- float transRightMargin = 0.0f;
+ float labelHeight = 0.0f;
GET_SHAPE_CONFIG(MESSAGEBOX::DEFAULT_WIDTH, orientation, defaultWidth);
GET_SHAPE_CONFIG(MESSAGEBOX::BOTTOM_HEIGHT, orientation, bottomHeight);
GET_SHAPE_CONFIG(MESSAGEBOX::MAX_HEIGHT, orientation, maxHeight);
GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_TOP_MRAGIN, orientation, textTopMargin);
- GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_LEFT_MARGIN, orientation, textLeftMargin);
- GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_RIGHT_MARGIN, orientation, textRightMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_TEXT_TOP_MARGIN, orientation, titleTopMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_TEXT_LEFT_MARGIN, orientation, titleLeftMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_TOP_MARGIN, orientation, transTopMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_BOTTOM_MARGIN, orientation, transBottomMargin);
- GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_LEFT_MARGIN, orientation, transLeftMargin);
- GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_RIGHT_MARGIN, orientation, transRightMargin);
- __textBounds.width = defaultWidth - (textLeftMargin + textRightMargin + transLeftMargin + transRightMargin);
+ __textBounds.width = defaultWidth - GetLeftRightLabelMargin();
// TitleText
if (__pMessageBox->HasTitle() == true)
__pTitleTextObject->SetBounds(__titleBounds);
__pTitleTextObject->Compose();
-
- __titleBounds.height = __pTitleTextObject->GetTotalHeightF();
-
+ __titleBounds.height = titleHeight - titleTopMargin;
}
// Text
__pBodyTextObject->SetBounds(__textBounds);
+
__pBodyTextObject->Compose();
// Text bounds
- __pBodyTextObject->SetBounds(__textBounds);
+ __pScrollPanel->SetBounds(__textBounds);
- // Scroll in Text
- if (__pBodyTextObject->GetTotalHeightF() > __textObjHeight)
- {
- float maxH = __pBodyTextObject->GetTotalHeightF();
+ labelHeight = __pBodyTextObject->GetTotalHeightF();
- if (__pScroll == null)
- {
- __pScroll = _Scroll::CreateScrollN(*__pMessageBox,
- SCROLL_DIRECTION_VERTICAL,
- true,
- true,
- false,
- false,
- __textObjHeight,
- maxH,
- 0.0f);
-
- SysTryReturnResult(NID_UI_CTRL, __pScroll != null, E_OUT_OF_MEMORY, "[E_SYSTEM] Failed to create the scroll.");
-
- __pMessageBox->AttachSystemChild(*__pScroll);
- }
+ if (labelHeight < __textObjHeight)
+ {
+ __pLabel->SetBounds(FloatRectangle(0.0f, (__textObjHeight - labelHeight)/2.0f, __textBounds.width, labelHeight));
}
- else if (__pScroll != null)
+ else
{
- __pMessageBox->DetachSystemChild(*__pScroll);
- delete __pScroll;
- __pScroll = null;
+ __pLabel->SetBounds(FloatRectangle(0.0f, 0.0f, __textBounds.width, labelHeight));
}
for (int i = 0; i < __buttonNum; i++)
float textTopMargin = 0.0f;
float textTopMarginNoButton = 0.0f;
float textLeftMargin = 0.0f;
- float textRightMargin = 0.0f;
float titleTopMargin = 0.0f;
float titleLeftMargin = 0.0f;
float transLeftMargin = 0.0f;
float transRightMargin = 0.0f;
+ float labelHeight = 0.0f;
+
_ControlOrientation orientation;
__pMessageBox = &msgbox;
GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_TOP_MRAGIN, orientation, textTopMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_TOP_MRAGIN_NO_BUTTON, orientation, textTopMarginNoButton);
GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_LEFT_MARGIN, orientation, textLeftMargin);
- GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_RIGHT_MARGIN, orientation, textRightMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_TEXT_TOP_MARGIN, orientation, titleTopMargin);
GET_SHAPE_CONFIG(MESSAGEBOX::TITLE_TEXT_LEFT_MARGIN, orientation, titleLeftMargin);
// TitleText
if (__pMessageBox->HasTitle() == true)
{
- r = SetFontInfo(FONT_STYLE_PLAIN, titleTextSize);
- SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Failed to set font.", GetErrorMessage(r));
-
__pTitleTextObject = new (std::nothrow) TextObject();
SysTryReturn(NID_UI_CTRL, __pTitleTextObject != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Unable to create TitleTextObject.");
__pTitleTextObject->Construct();
- TextSimple* pSimpleTextForTitleText = new (std::nothrow) TextSimple(const_cast <wchar_t*>(__pMessageBox->GetTitleText().GetPointer()),
- __pMessageBox->GetTitleText().GetLength(),
- TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
- SysTryCatch(NID_UI_CTRL, pSimpleTextForTitleText != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
-
- __pTitleTextObject->AppendElement(*pSimpleTextForTitleText);
- __pTitleTextObject->SetForegroundColor(__pMessageBox->GetTitleTextColor(), 0, __pTitleTextObject->GetTextLength());
- __pTitleTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_NONE);
- __pTitleTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
- __pTitleTextObject->SetTextObjectEllipsisType(TEXT_OBJECT_ELLIPSIS_TYPE_TAIL);
-
- __pTitleTextObject->SetFont(_pFont, 0, __pTitleTextObject->GetTextLength());
- __pTitleTextObject->SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT);
- __pTitleTextObject->SetBounds(FloatRectangle(titleLeftMargin + transLeftMargin,
+ FloatRectangle bounds = FloatRectangle(titleLeftMargin + transLeftMargin,
titleTopMargin + transTopMargin,
defaultWidth - (titleLeftMargin + titleRightMargin + transLeftMargin + transRightMargin),
- titleHeight - titleTopMargin));
- __pTitleTextObject->Compose();
+ titleHeight - titleTopMargin);
+
+ labelHeight = GetLabelHeight(__pTitleTextObject, const_cast <wchar_t*>(__pMessageBox->GetTitleText().GetPointer()),
+ __pMessageBox->GetTitleText().GetLength(), bodyTextSize, bounds);
__titleBounds = FloatRectangle(titleLeftMargin + transLeftMargin,
titleTopMargin + transTopMargin,
defaultWidth - (titleLeftMargin + titleRightMargin + transLeftMargin + transRightMargin),
- __pTitleTextObject->GetTotalHeightF());
-
+ titleHeight - titleTopMargin);
}
else
{
titleHeight = 0;
}
- // Text
- r = SetFontInfo(FONT_STYLE_PLAIN, bodyTextSize);
- SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to set font.", GetErrorMessage(r));
-
- __pBodyTextObject = new (std::nothrow) TextObject();
- SysTryCatch(NID_UI_CTRL, __pBodyTextObject != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
-
- __pBodyTextObject->Construct();
-
- pSimpleTextForBodyText = new (std::nothrow) TextSimple(const_cast <wchar_t*>(__pMessageBox->GetText().GetPointer()),
- __pMessageBox->GetText().GetLength(),
- TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
- SysTryCatch(NID_UI_CTRL, pSimpleTextForBodyText != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
-
- __pBodyTextObject->AppendElement(*pSimpleTextForBodyText);
- __pBodyTextObject->SetForegroundColor(__pMessageBox->GetTextColor(), 0, __pBodyTextObject->GetTextLength());
- __pBodyTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_WORD);
- __pBodyTextObject->SetFont(_pFont, 0, __pBodyTextObject->GetTextLength());
- __pBodyTextObject->SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT|TEXT_OBJECT_ALIGNMENT_MIDDLE);
- __pBodyTextObject->SetBounds(FloatRectangle(textLeftMargin + transLeftMargin,
- titleHeight + textTopMargin + transTopMargin,
- defaultWidth - (textLeftMargin + textRightMargin + transLeftMargin + transRightMargin),
- maxHeight - titleHeight));
- __pBodyTextObject->Compose();
-
// Text bounds
__textBounds.SetBounds(textLeftMargin + transLeftMargin,
titleHeight + textTopMargin + transTopMargin,
- defaultWidth - (textLeftMargin + textRightMargin + transLeftMargin + transRightMargin),
+ defaultWidth - GetLeftRightLabelMargin(),
__textObjHeight);
+
if ((__pMessageBox->HasTitle() == false) && (__pMessageBox->GetMsgBoxStyle() == MSGBOX_STYLE_NONE))
{
__textBounds.y = transTopMargin + textTopMarginNoButton;
}
- __pBodyTextObject->SetBounds(__textBounds);
- // Scroll in Text
- if (__pBodyTextObject->GetTotalHeightF() > __textObjHeight)
- {
- float maxH = __pBodyTextObject->GetTotalHeightF();
+ __pLabel = _Label::CreateLabelN();
+ SysTryCatch(NID_UI_CTRL, __pLabel != null, , E_OUT_OF_MEMORY, "[E_SYSTEM] Failed to create the scroll.");
- __pScroll = _Scroll::CreateScrollN(*__pMessageBox,
- SCROLL_DIRECTION_VERTICAL,
- true,
- true,
- false,
- false,
- __textObjHeight,
- maxH,
- 0.0f);
+ __pBodyTextObject = new (std::nothrow) TextObject();
+ SysTryCatch(NID_UI_CTRL, __pBodyTextObject != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+ __pBodyTextObject->Construct();
+ labelHeight = GetLabelHeight(__pBodyTextObject, const_cast <wchar_t*>(__pMessageBox->GetText().GetPointer()),
+ __pMessageBox->GetText().GetLength(), bodyTextSize, __textBounds);
- SysTryCatch(NID_UI_CTRL, __pScroll != null, , E_OUT_OF_MEMORY, "[E_SYSTEM] Failed to create the scroll.");
+ if (__pMessageBox->GetText().GetLength() > 0)
+ {
+ __textObjHeight = __pBodyTextObject->GetLineHeightAtF(0) * 3.0;
+ __textBounds.height = __textObjHeight;
+ }
- __pMessageBox->AttachSystemChild(*__pScroll);
+ if (labelHeight < __textObjHeight)
+ {
+ __pLabel->SetBounds(FloatRectangle(0.0f, (__textObjHeight - labelHeight)/2.0f, __textBounds.width, labelHeight));
}
+ else
+ {
+ __pLabel->SetBounds(FloatRectangle(0.0f, 0.0f, __textBounds.width, labelHeight));
+ }
+
+
+ __pLabel->SetText(__pMessageBox->GetText());
+ __pLabel->SetTextConfig(bodyTextSize, LABEL_TEXT_STYLE_NORMAL);
+ __pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+ __pLabel->SetMargin(0.0f, 0.0f, 0.0f, 0.0f);
+
+ __pScrollPanel = _ScrollPanel::CreateScrollPanelN(__textBounds, SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL, true);
+
+ SysTryCatch(NID_UI_CTRL, __pScrollPanel != null, , E_OUT_OF_MEMORY, "[E_SYSTEM] Failed to create the scroll.");
+ __pScrollPanel->SetBounds(__textBounds);
+ __pScrollPanel->AttachChild(*__pLabel);
+ __pMessageBox->AttachChild(*__pScrollPanel);
r = CreateButtons();
SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
return r;
}
+float
+_MessageBoxPresenter::GetLabelHeight(TextObject* textObject, wchar_t* text, int length, float bodyTextSize, FloatRectangle bounds)
+{
+ TextSimple* pSimpleTextForBodyText = null;
+
+ // Text
+ result r = SetFontInfo(FONT_STYLE_PLAIN, bodyTextSize);
+ SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to set font.", GetErrorMessage(r));
+
+ textObject->Construct();
+
+ pSimpleTextForBodyText = new (std::nothrow) TextSimple(text, length, TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
+ SysTryCatch(NID_UI_CTRL, pSimpleTextForBodyText != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+
+ textObject->AppendElement(*pSimpleTextForBodyText);
+ textObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_WORD);
+ textObject->SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
+ textObject->SetFont(_pFont, 0, textObject->GetTextLength());
+ textObject->SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT|TEXT_OBJECT_ALIGNMENT_MIDDLE);
+ textObject->SetBounds(bounds);
+ textObject->Compose();
+
+ return textObject->GetTotalHeightF();
+CATCH:
+ delete pSimpleTextForBodyText;
+ return 0.0f;
+}
+
+float
+_MessageBoxPresenter::GetLeftRightLabelMargin(void)
+{
+ float textLeftMargin = 0.0f;
+ float textRightMargin = 0.0f;
+ float transLeftMargin = 0.0f;
+ float transRightMargin = 0.0f;
+
+ _ControlOrientation orientation = __pMessageBox->GetOrientation();
+
+ GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_LEFT_MARGIN, orientation, textLeftMargin);
+ GET_SHAPE_CONFIG(MESSAGEBOX::TEXT_RIGHT_MARGIN, orientation, textRightMargin);
+ GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_LEFT_MARGIN, orientation, transLeftMargin);
+ GET_SHAPE_CONFIG(MESSAGEBOX::BG_IMAGE_TRANSPARENT_RIGHT_MARGIN, orientation, transRightMargin);
+
+ return textLeftMargin + textRightMargin + transLeftMargin + transRightMargin;
+}
+
void
_MessageBoxPresenter::OnFontChanged(Font* pFont)
{
__pTitleTextObject->SetFont(_pFont, 0, __pTitleTextObject->GetTextLength());
__pTitleTextObject->SetForegroundColor(__pMessageBox->GetTitleTextColor(), 0, __pTitleTextObject->GetTextLength());
+ __pTitleTextObject->SetBounds(__titleBounds);
__pTitleTextObject->Draw(*_CanvasImpl::GetInstance(*pCanvas));
}
- // Draw Text
- if (__pBodyTextObject != null)
- {
- r = SetFontInfo(FONT_STYLE_PLAIN, textSize);
- SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
- __pBodyTextObject->SetFont(_pFont, 0, __pBodyTextObject->GetTextLength());
- __pBodyTextObject->SetForegroundColor(__pMessageBox->GetTextColor(), 0, __pBodyTextObject->GetTextLength());
-
- __pBodyTextObject->Draw(*_CanvasImpl::GetInstance(*pCanvas));
- }
-
+ __pLabel->SetTextColor(__pMessageBox->GetTextColor());
//fall thtrough
CATCH:
delete pCanvas;
#include "FUi_CoordinateSystemUtils.h"
#include "FUi_ResourceManager.h"
#include "FUi_UiTouchEvent.h"
+#include "FUiCtrl_Label.h"
+#include "FUiCtrl_ScrollPanel.h"
#include "FUiCtrl_ProgressPopupPresenter.h"
#include "FUiCtrl_ProgressPopup.h"
, __pBodyTextObject(null)
, __titleBounds(0.0f, 0.0f, 0.0f, 0.0f)
, __textBounds(0.0f, 0.0f, 0.0f, 0.0f)
+ , __pLabel(null)
+ , __pScrollPanel(null)
, __pAnimation(null)
, __pAnimationFrameList(null)
, __fontStyle(0)
__pBodyTextObject = null;
}
+ if (__pLabel != null)
+ {
+ __pScrollPanel->DetachChild(*__pLabel);
+ delete __pLabel;
+ __pLabel = null;
+ }
+
+ if (__pScrollPanel != null)
+ {
+ __pProgressPopup->DetachChild(*__pScrollPanel);
+ delete __pScrollPanel;
+ __pScrollPanel = null;
+ }
+
if (__pAnimationFrameList != null)
{
delete __pAnimationFrameList;
if (__pBodyTextObject == null) //add for landscape
{
+ __pLabel = _Label::CreateLabelN();
+ SysTryCatch(NID_UI_CTRL, __pLabel != null, , E_OUT_OF_MEMORY, "[E_SYSTEM] Failed to create the scroll.");
__pBodyTextObject = new (std::nothrow) TextObject();
SysTryReturnVoidResult(NID_UI_CTRL, __pBodyTextObject != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
GET_SHAPE_CONFIG(MESSAGEBOX::BOTTOM_HEIGHT, orientation, bottomHeight);
}
- __pBodyTextObject->SetBounds(FloatRectangle(textLeftMargin + transLeftMargin,
- titleHeight + textTopMargin + transTopMargin + animationWidth + noTitleHeight,
- defaultWidth - (textLeftMargin + textRightMargin + transLeftMargin + transRightMargin),
- maxHeight - titleHeight - bottomHeight - animationWidth));
- __pBodyTextObject->Compose();
-
// Calculate Text bounds
__textBounds.SetBounds(textLeftMargin + transLeftMargin,
titleHeight + textTopMargin + transTopMargin + animationWidth + noTitleHeight,
defaultWidth - (textLeftMargin + textRightMargin + transLeftMargin + transRightMargin),
- __textObjectHeight);
+ maxHeight - titleHeight - bottomHeight - animationWidth);
__pBodyTextObject->SetBounds(__textBounds);
+
+ if (__pProgressPopup->GetText().GetLength() > 0)
+ {
+ __pBodyTextObject->Compose();
+ __textObjectHeight = __pBodyTextObject->GetLineHeightAtF(0) * 3.0;
+ __textBounds.height = __textObjectHeight;
+ }
+
+ if (__pBodyTextObject->GetTotalHeightF() < __textObjectHeight)
+ {
+ __pLabel->SetBounds(FloatRectangle(0.0f, (__textObjectHeight - __pBodyTextObject->GetTotalHeightF())/2.0f, __textBounds.width, __pBodyTextObject->GetTotalHeightF()));
+ }
+ else
+ {
+ __pLabel->SetBounds(FloatRectangle(0.0f, 0.0f, __textBounds.width, __pBodyTextObject->GetTotalHeightF()));
+ }
+
+
+ __pLabel->SetText(__pProgressPopup->GetText());
+ __pLabel->SetTextConfig(bodyTextSize, LABEL_TEXT_STYLE_NORMAL);
+ __pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+ __pLabel->SetMargin(0.0f, 0.0f, 0.0f, 0.0f);
+
+ if (__pScrollPanel == null)
+ {
+ __pScrollPanel = _ScrollPanel::CreateScrollPanelN(__textBounds, SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL, true);
+ SysTryCatch(NID_UI_CTRL, __pScrollPanel != null, , E_OUT_OF_MEMORY, "[E_SYSTEM] Failed to create the scroll.");
+
+ __pScrollPanel->SetBounds(__textBounds);
+ __pScrollPanel->AttachChild(*__pLabel);
+ __pProgressPopup->AttachChild(*__pScrollPanel);
+ }
+ else
+ {
+ __pScrollPanel->SetBounds(__textBounds);
+ }
}
return;
delete __pBodyTextObject;
__pBodyTextObject = null;
+ delete __pLabel;
+ __pLabel = null;
+
+ delete __pScrollPanel;
+ __pScrollPanel = null;
+
return;
}
__pTitleTextObject->Draw(*_CanvasImpl::GetInstance(*pCanvas));
}
- // Draw Body text
- if (__pBodyTextObject != null)
+ if (__pLabel != null)
{
- r = SetFontInfo(FONT_STYLE_PLAIN, bodyTextSize);
- SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
-
- __pBodyTextObject->SetFont(_pFont, 0, __pBodyTextObject->GetTextLength());
-
- __pBodyTextObject->Draw(*_CanvasImpl::GetInstance(*pCanvas));
+ __pLabel->SetTextColor(__pProgressPopup->GetTextColor());
}
- //fall thtrough
-CATCH:
- delete pCanvas;
-
return;
}
{
if ((__enableScrollingEffect || __enableOverScrollingEffect) && __scrollingEffectVisibility)
{
- if (__pFrontScrollingEffectVe->GetOpacity() != SCROLL_OPACITY_DARK_DIM && !__fadeOut)
+ if (__scrollPositionCurr < 0.0f)
{
- SetScrollingEffectOpacity(SCROLL_OPACITY_DARK_DIM);
+ SetScrollingEffectVisibility(false);
+ }
+ else if (__scrollPositionCurr > (__scrollRange - __viewRange))
+ {
+ SetScrollingEffectVisibility(false);
+ }
+ else
+ {
+ if (__pFrontScrollingEffectVe->GetOpacity() != SCROLL_OPACITY_DARK_DIM && !__fadeOut)
+ {
+ SetScrollingEffectVisibility(true);
+ }
}
}
, __isCancelActionInProgress(false)
, __isUserGuideTextColor(false)
, __isKeypadOpening(false)
+ , __isupdateContentBounds(false)
, __keypadAction(CORE_KEYPAD_ACTION_SEARCH)
, __pBackgroundBitmap(null)
, __backgroundColor(Color())
, __pTextEvent(null)
, __pSearchBarEvent(null)
, __pLanguageEvent(null)
- , __isupdateContentBounds(false)
{
for (int i = 0; i < SEARCHBAR_BUTTON_COLOR_MAX; i++)
{
SysTryCatch(NID_UI_CTRL, __pReplacedSearchFieldNormalBitmap != null, r = GetLastResult(), GetLastResult(),"[%s] Propagating.",
GetErrorMessage(GetLastResult()));
+ delete pSearchFieldBitmap;
+ pSearchFieldBitmap = null;
+
+ r = GET_BITMAP_CONFIG_N(SEARCHBAR::ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pSearchFieldBitmap);
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r,"[%s] Propagating.", GetErrorMessage(r));
+
GET_COLOR_CONFIG(SEARCHBAR::ICON_BG_DISABLED, searchFieldIconColor);
__pReplacedSearchFieldDisabledBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSearchFieldBitmap, Color::GetColor(COLOR_ID_MAGENTA), searchFieldIconColor);
result r = E_SUCCESS;
char enterText[2] = {'\n', };
String enterTextComma(",");
- String enterTextColon(":");
- if ((commitText == enterText) || (commitText == enterTextComma) || (commitText == enterTextColon))
+ String enterTextSemiColon(";");
+ if ((commitText == enterText) || (commitText == enterTextComma) || (commitText == enterTextSemiColon))
{
CoreKeypadAction keypadaction = GetKeypadAction();
__pTokenEdit->SendKeypadEvent(keypadaction, CORE_KEYPAD_EVENT_STATUS_ENTERACTION);
}
//Uncomment below to Block Copy & Paste functionality in Token Edit mode
- //if (__pressedTokenIndex != -1)
- //{
- // return true;
- //}
+ if (__pressedTokenIndex != -1)
+ {
+ return true;
+ }
return _EditPresenter::OnTapGestureDetected();
}
__isLongPressed = true;
//Uncomment below to Block Copy & Paste functionality in Token Edit mode
- //if (__pressedTokenIndex != -1)
- //{
- // return true;
- //}
+ if (__pressedTokenIndex != -1)
+ {
+ return true;
+ }
return _EditPresenter::OnLongPressGestureDetected();
}
{
class DisplayContext;
-class _VisualElementSurfaceImpl
+class _OSP_EXPORT_ _VisualElementSurfaceImpl
: public Tizen::Base::Object
{
protected:
bool __isCursorDisabled;
// todo : check InitAtFirstDrawing
bool __isInitialized;
- bool __isInitializing;
// todo : check
bool __isMovingCursorByTouchMove;
bool __isTouchMoving;
int __blockStartPos;
int __cursorPos;
- float __maximumFlexibleHeight;
float __prevTotalTextHeight;
int __textLength;
int __composingTextLength;
bool __redrawListView;
bool __isBoundsChanged;
+ bool __needReloadItems;
_ListViewItem* __pItemNeedsLazyDeletion;
class _GroupedListViewPropagatedTouchEventListener;
bool __redrawListView;
bool __isBoundsChanged;
+ bool __needReloadItems;
_ListViewItem* __pItemNeedsLazyDeletion;
class _ListViewPropagatedTouchEventListener;
#include "FUi_UiTouchEvent.h"
#include "FUiCtrl_PopupPresenter.h"
+namespace Tizen { namespace Graphics { namespace _Text {
+ class TextObject;
+}}} // Tizen::Graphics::_Text
namespace Tizen { namespace Ui { namespace Controls
{
class Button;
class _MessageBox;
+class _Label;
class _Scroll;
+class _ScrollPanel;
/**
* @class _MessageBoxPresenter
void SetReturnValue(MessageBoxModalResult rtn);
int GetReturnValue(void) const;
+ float GetLabelHeight(Tizen::Graphics::_Text::TextObject* textObject, wchar_t* text, int length, float fontSize, FloatRectangle bounds);
+ float GetLeftRightLabelMargin(void);
+
// Inner class
private:
class _MessageBoxButtonListener
Tizen::Graphics::FloatRectangle __titleBounds;
Tizen::Graphics::FloatRectangle __textBounds;
+ Tizen::Ui::Controls::_Label* __pLabel;
Tizen::Ui::Controls::_Scroll* __pScroll;
+ Tizen::Ui::Controls::_ScrollPanel* __pScrollPanel;
unsigned long __fontStyle;
float __fontSize;
{
class _ProgressPopup;
+class _Label;
+class _ScrollPanel;
/**
Tizen::Graphics::FloatRectangle __titleBounds;
Tizen::Graphics::FloatRectangle __textBounds;
+ Tizen::Ui::Controls::_Label* __pLabel;
+ Tizen::Ui::Controls::_ScrollPanel* __pScrollPanel;
+
_Animation* __pAnimation;
Tizen::Base::Collection::ArrayList* __pAnimationFrameList;
_Button* __pCancelButton;
_Control* __pContainer;
_Control* __pContentControl;
- bool __isupdateContentBounds;
int __actionId;
int __searchBarStyle;
bool __isCancelActionInProgress;
bool __isUserGuideTextColor;
bool __isKeypadOpening;
-
+ bool __isupdateContentBounds;
CoreKeypadAction __keypadAction;
Tizen::Graphics::Bitmap* __pBackgroundBitmap;
DECLARE_SHAPE_CONFIG(ARROW_BUTTON_LEFT_MARGIN, 1);
DECLARE_SHAPE_CONFIG(ARROW_BUTON_TOP_MARGIN, 2);
DECLARE_SHAPE_CONFIG(BAR_TOP_MARGIN, 3);
- DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN, 4);
+ DECLARE_SHAPE_CONFIG(BAR_LEFT_RIGHT_MARGIN, 4);
DECLARE_SHAPE_CONFIG(SLIDER_HEIGHT, 5);
DECLARE_SHAPE_CONFIG(ARROW_BUTTON_WIDTH, 6);
DECLARE_SHAPE_CONFIG(ARROW_BUTTON_HEIGHT, 7);
DECLARE_COLOR_CONFIG(DIVIDER_RIGHT_HALF, 16)
DECLARE_COLOR_CONFIG(TITLE_NORMAL, 17)
DECLARE_COLOR_CONFIG(TITLE_DISABLED, 18)
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, 19);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, 20);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, 21);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, 22);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL, 19);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED, 20);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED, 21);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, 22);
DECLARE_IMAGE_CONFIG(AMPM_BG_NORMAL, 1)
DECLARE_IMAGE_CONFIG(AMPM_BG_PRESSED, 2)
DECLARE_IMAGE_CONFIG(COLON_BG_NORMAL, 9)
DECLARE_IMAGE_CONFIG(BG_NORMAL, 10);
DECLARE_IMAGE_CONFIG(BG_EFFECT, 11);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL,12);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED,13);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED,14);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,15);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL,16);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED,17);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED,18);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,12);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,13);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,14);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED,15);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL,16);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED,17);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED,18);
DECLARE_SHAPE_CONFIG(FOOTER_HEIGHT, 1)
DECLARE_SHAPE_CONFIG(INPUTPAD_HEIGHT, 2)
DECLARE_COLOR_CONFIG(TITLE_TEXT_DISABLED,5);
DECLARE_COLOR_CONFIG(DIVIDER_LEFT_HALF,6);
DECLARE_COLOR_CONFIG(DIVIDER_RIGHT_HALF,7);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL,8);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED,9);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED,10);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,11);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL,1);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED,2);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED,3);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,4);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL,5);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED,6);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED,7);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL,8);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,9);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,10);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,11);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,1);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,2);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,3);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED,4);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL,5);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED,6);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED,7);
DECLARE_SHAPE_CONFIG(WIDTH,1);
DECLARE_SHAPE_CONFIG(HEIGHT,2);
DECLARE_SHAPE_CONFIG(DATE_HEIGHT,3);
DECLARE_COLOR_CONFIG(TITLE_TEXT_NORMAL,10);
DECLARE_COLOR_CONFIG(TITLE_TEXT_DISABLED,11);
DECLARE_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED,12);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL,13);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED,14);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED,15);
- DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,16);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL,13);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,14);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,15);
+ DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,16);
DECLARE_IMAGE_CONFIG(COLON_BG_NORMAL,1);
DECLARE_IMAGE_CONFIG(BUTTON_BG_NORMAL,2);
DECLARE_IMAGE_CONFIG(BUTTON_BG_PRESSED,3);
DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED,6);
DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED,7);
DECLARE_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED,8);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL,9);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED,10);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED,11);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,12);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL,13);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED,14);
- DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED,15);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,9);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,10);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,11);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED,12);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL,13);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED,14);
+ DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED,15);
DECLARE_SHAPE_CONFIG(WIDTH,1);
DECLARE_SHAPE_CONFIG(HEIGHT,2);
DECLARE_SHAPE_CONFIG(TIME_WIDTH,3);
DECLARE_IMAGE_CONFIG(BAR_EFFECT, 4);
DECLARE_SHAPE_CONFIG(BAR_HEIGHT, 1);
DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN, 2);
- DECLARE_SHAPE_CONFIG(BAR_TOP_MARGIN, 3);
- DECLARE_SHAPE_CONFIG(BAR_OFFSET, 4);
- DECLARE_SHAPE_CONFIG(MINIMUM_SIZE, 5);
- DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH, 6);
- DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 7);
+ DECLARE_SHAPE_CONFIG(BAR_OFFSET, 3);
+ DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH, 4);
+ DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 5);
DECLARE_END_UI_CONFIG(PROGRESS);
#endif //_FUI_RESOURCE_PROGRESS_CONFIG_H_
\ No newline at end of file
DECLARE_IMAGE_CONFIG(BG_EFFECT, 5);
DECLARE_IMAGE_CONFIG(ICON_NORMAL, 6);
DECLARE_IMAGE_CONFIG(ICON_EFFECT_NORMAL, 7);
+ DECLARE_IMAGE_CONFIG(ICON_DISABLED, 8);
DECLARE_SHAPE_CONFIG(HORIZONTAL_MARGIN, 1);
DECLARE_SHAPE_CONFIG(VERTICAL_MARGIN, 2);
DECLARE_SHAPE_CONFIG(TEXT_HORIZONTAL_MARGIN, 3);
DECLARE_SHAPE_CONFIG(BUTTON_TEXT_SIZE, 15);
DECLARE_END_UI_CONFIG(SEARCHBAR);
-#endif //_FUI_RESOURCE_SEARCH_BAR_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_SEARCH_BAR_CONFIG_H_
DECLARE_SHAPE_CONFIG(ICON_LEFT_MARGIN, 13);
DECLARE_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 14);
DECLARE_SHAPE_CONFIG(TITLE_TEXT_POSITION_X, 15);
- DECLARE_SHAPE_CONFIG(TITLE_TEXT_POSITION_Y, 16);
- DECLARE_SHAPE_CONFIG(TITLE_TEXT_SIZE, 17);
- DECLARE_SHAPE_CONFIG(TITLE_TEXT_HEIGHT, 18);
- DECLARE_SHAPE_CONFIG(OVERLAY_WIDTH, 19);
- DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT, 20);
- DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT_WITHOUT_ARROW, 21);
- DECLARE_SHAPE_CONFIG(OVERLAY_BOTTOM_MARGIN, 22);
- DECLARE_SHAPE_CONFIG(OVERLAY_MARGIN, 23);
- DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE, 24);
- DECLARE_SHAPE_CONFIG(NUMBER_SIZE, 25);
- DECLARE_SHAPE_CONFIG(TEXT_SIZE, 26);
- DECLARE_SHAPE_CONFIG(MINIMUM_SIZE_WITHOUT_ICON, 27);
- DECLARE_SHAPE_CONFIG(MINIMUM_SIZE_WITH_ICON, 28);
- DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 29);
- DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 30);
- DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 31);
- DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 32);
-
- DECLARE_FIXED_VALUE_CONFIG(TITLE_TEXT_LENGTH_MAX, 1);
+ DECLARE_SHAPE_CONFIG(TITLE_TEXT_SIZE, 16);
+ DECLARE_SHAPE_CONFIG(TITLE_TEXT_HEIGHT, 17);
+ DECLARE_SHAPE_CONFIG(OVERLAY_WIDTH, 18);
+ DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT, 19);
+ DECLARE_SHAPE_CONFIG(OVERLAY_HEIGHT_WITHOUT_ARROW, 20);
+ DECLARE_SHAPE_CONFIG(OVERLAY_BOTTOM_MARGIN, 21);
+ DECLARE_SHAPE_CONFIG(OVERLAY_MARGIN, 22);
+ DECLARE_SHAPE_CONFIG(OVERLAY_TEXT_SIZE, 23);
+ DECLARE_SHAPE_CONFIG(NUMBER_SIZE, 24);
+ DECLARE_SHAPE_CONFIG(TEXT_SIZE, 25);
+ DECLARE_SHAPE_CONFIG(BAR_LEFT_MARGIN_WITH_ICON, 26);
+ DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITHOUT_ICON, 27);
+ DECLARE_SHAPE_CONFIG(MINIMUM_WIDTH_WITH_ICON, 28);
+ DECLARE_SHAPE_CONFIG(MINIMUM_HEIGHT, 29);
+
DECLARE_END_UI_CONFIG(SLIDER);
#endif //_FUI_RESOURCE_SLIDER_CONFIG_H_
ADD_SHAPE_CONFIG(ARROW_BUTTON_LEFT_MARGIN, 16);
ADD_SHAPE_CONFIG(ARROW_BUTON_TOP_MARGIN, 19);
ADD_SHAPE_CONFIG(BAR_TOP_MARGIN, 26);
- ADD_SHAPE_CONFIG(BAR_LEFT_MARGIN, 16);
- ADD_SHAPE_CONFIG(SLIDER_HEIGHT, 60);
+ ADD_SHAPE_CONFIG(BAR_LEFT_RIGHT_MARGIN, 15);
+ ADD_SHAPE_CONFIG(SLIDER_HEIGHT, 63);
ADD_SHAPE_CONFIG(ARROW_BUTTON_WIDTH, 74);
ADD_SHAPE_CONFIG(ARROW_BUTTON_HEIGHT, 74);
- ADD_SHAPE_CONFIG(HANDLER_WIDTH, 22);
- ADD_SHAPE_CONFIG(HANDLER_HEIGHT, 70);
+ ADD_SHAPE_CONFIG(HANDLER_WIDTH, 27);
+ ADD_SHAPE_CONFIG(HANDLER_HEIGHT, 72);
ADD_SHAPE_CONFIG(BLOCK_HEIGHT, 112);
ADD_FIXED_VALUE_CONFIG(BLOCK_MARGIN, 1);
- ADD_SHAPE_CONFIG(BAR_WIDTH, 476);
+ ADD_SHAPE_CONFIG(BAR_WIDTH, 477);
ADD_SHAPE_CONFIG(DIVIDER_MARGIN, 16);
ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 656);
ADD_DIMENSION_CONFIG(ARROW_BUTTON_ARROW_ICON_SIZE, 45, 45);
START_UI_CONFIG_MODE(1280x720);
{
ADD_SHAPE_CONFIG(ARROW_BUTTON_LEFT_MARGIN, 184);
- ADD_SHAPE_CONFIG(BAR_WIDTH, 700);
+ ADD_SHAPE_CONFIG(BAR_WIDTH, 702);
ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 1216);
ADD_DIMENSION_CONFIG(DEFAULT_SIZE, 1248, 336);
}
}
__pMapContainer->GetColorMap()->ChangeValue(resourceKey, pItem);
}
+ else
+ {
+ SysLog(NID_UI, "%s is not initialized", tempkey);
+ }
+ }
+ else
+ {
+ SysLog(NID_UI, "%s is invalid", tempkey);
}
delete [] key;
}
pItem->SetImageFileName(pValue);
__pMapContainer->GetImageMap()->ChangeValue(resourceKey, pItem);
}
+ else
+ {
+ SysLog(NID_UI, "%s is not initialized", tempkey);
+ }
+ }
+ else
+ {
+ SysLog(NID_UI, "%s is invalid", tempkey);
}
delete [] key;
}
__pImageKeyTable->Add(ResourceKey(key), _COLORPICKER::HANDLER_NORMAL_IMAGE);
}
{
+ const char* key ="DATETIMEPICKER::BG_NORMAL";
+ __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::BG_NORMAL_IMAGE);
+ }
+ {
const char* key ="DATETIMEPICKER::AMPM_BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::AMPM_BG_NORMAL_IMAGE);
}
__pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::AMPM_BG_DISABLED_IMAGE);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL";
- __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL_IMAGE);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_NORMAL";
+ __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_NORMAL_IMAGE);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED";
- __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED_IMAGE);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_PRESSED";
+ __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_PRESSED_IMAGE);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED";
- __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED_IMAGE);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_DISABLED_IMAGE);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED";
- __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED_IMAGE);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED";
+ __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED_IMAGE);
}
{
const char* key ="EDIT::BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _EDIT::CLEAR_ICON_PRESSED_IMAGE);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_NORMAL";
- __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_NORMAL_IMAGE);
+ const char* key ="EDITDATE::CONTENT_BG_NORMAL";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_NORMAL_IMAGE);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_PRESSED";
- __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_PRESSED_IMAGE);
+ const char* key ="EDITDATE::CONTENT_BG_PRESSED";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_PRESSED_IMAGE);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_DISABLED";
- __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_DISABLED_IMAGE);
+ const char* key ="EDITDATE::CONTENT_BG_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_DISABLED_IMAGE);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED";
- __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED_IMAGE);
+ const char* key ="EDITDATE::CONTENT_BG_HIGHLIGHTED";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_HIGHLIGHTED_IMAGE);
}
{
const char* key ="EDITTIME::BUTTON_BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _EDITTIME::BUTTON_BG_HIGHLIGHTED_IMAGE);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_NORMAL";
- __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_NORMAL_IMAGE);
+ const char* key ="EDITTIME::CONTENT_BG_NORMAL";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_NORMAL_IMAGE);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_PRESSED";
- __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_PRESSED_IMAGE);
+ const char* key ="EDITTIME::CONTENT_BG_PRESSED";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_PRESSED_IMAGE);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_DISABLED";
- __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_DISABLED_IMAGE);
+ const char* key ="EDITTIME::CONTENT_BG_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_DISABLED_IMAGE);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED";
- __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED_IMAGE);
+ const char* key ="EDITTIME::CONTENT_BG_HIGHLIGHTED";
+ __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_HIGHLIGHTED_IMAGE);
}
{
const char* key ="FASTSCROLL::INDEX_BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
}
{
+ const char* key ="FOOTER::TAB_ITEM_BG_NORMAL";
+ __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_BG_NORMAL_IMAGE);
+ }
+ {
+ const char* key ="FOOTER::TAB_ITEM_BG_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_BG_DISABLED_IMAGE);
+ }
+ {
+ const char* key ="FOOTER::TAB_ITEM_BG_PRESSED";
+ __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_BG_PRESSED_IMAGE);
+ }
+ {
+ const char* key ="FOOTER::TAB_ITEM_BG_HIGHLIGHTED";
+ __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_BG_HIGHLIGHTED_IMAGE);
+ }
+ {
+ const char* key ="FOOTER::TAB_ITEM_BG_SELECTED";
+ __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_BG_SELECTED_IMAGE);
+ }
+ {
const char* key ="HEADER::BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _HEADER::BG_NORMAL_IMAGE);
}
__pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_NORMAL_IMAGE);
}
{
+ const char* key ="SEARCHBAR::ICON_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::ICON_DISABLED_IMAGE);
+ }
+ {
const char* key ="SLIDER::BAR_BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _SLIDER::BAR_BG_NORMAL_IMAGE);
}
__pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::SEARCH_ICON_NORMAL_IMAGE);
}
{
+ const char* key ="TABLEVIEW::RADIOBUTTON_BUTTON_NORMAL";
+ __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::RADIOBUTTON_BUTTON_NORMAL_IMAGE);
+ }
+ {
+ const char* key ="TABLEVIEW::RADIOBUTTON_BUTTON_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::RADIOBUTTON_BUTTON_DISABLED_IMAGE);
+ }
+ {
+ const char* key ="TABLEVIEW::RADIOBUTTON_BUTTON_PRESSED";
+ __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::RADIOBUTTON_BUTTON_PRESSED_IMAGE);
+ }
+ {
+ const char* key ="TABLEVIEW::CHECKBOX_CHECK_MARK_PRESSED";
+ __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::CHECKBOX_CHECK_MARK_PRESSED_IMAGE);
+ }
+ {
const char* key ="TOKENEDIT::BG_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _TOKENEDIT::BG_NORMAL_IMAGE);
}
__pColorKeyTable->Add(ResourceKey(key), _DATETIMEBAR::TEXT_PRESSED_COLOR);
}
{
+ const char* key ="DATETIMEPICKER::DISPLAY_BG_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::DISPLAY_BG_NORMAL_COLOR);
+ }
+ {
+ const char* key ="DATETIMEPICKER::TITLE_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::TITLE_NORMAL_COLOR);
+ }
+ {
+ const char* key ="DATETIMEPICKER::TITLE_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::TITLE_DISABLED_COLOR);
+ }
+ {
const char* key ="DATETIMEPICKER::BG_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::BG_NORMAL_COLOR);
}
__pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::DIVIDER_RIGHT_HALF_COLOR);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL";
- __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL_COLOR);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_NORMAL_COLOR);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED";
- __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED_COLOR);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_PRESSED";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_PRESSED_COLOR);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED";
- __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED_COLOR);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_DISABLED_COLOR);
}
{
- const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED";
- __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR);
+ const char* key ="DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED";
+ __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED_COLOR);
}
{
const char* key ="EDIT::BG_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _EDIT::CURSOR_NORMAL_COLOR);
}
{
+ const char* key ="EDITDATE::TITLE_TEXT_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::TITLE_TEXT_DISABLED_COLOR);
+ }
+ {
const char* key ="EDITDATE::TEXT_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _EDITDATE::TEXT_NORMAL_COLOR);
}
__pColorKeyTable->Add(ResourceKey(key), _EDITDATE::DIVIDER_RIGHT_HALF_COLOR);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_NORMAL";
- __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_NORMAL_COLOR);
+ const char* key ="EDITDATE::CONTENT_BG_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_NORMAL_COLOR);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_PRESSED";
- __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_PRESSED_COLOR);
+ const char* key ="EDITDATE::CONTENT_BG_PRESSED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_PRESSED_COLOR);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_DISABLED";
- __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_DISABLED_COLOR);
+ const char* key ="EDITDATE::CONTENT_BG_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_DISABLED_COLOR);
}
{
- const char* key ="EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED";
- __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR);
+ const char* key ="EDITDATE::CONTENT_BG_HIGHLIGHTED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_HIGHLIGHTED_COLOR);
}
{
const char* key ="EDITTIME::BUTTON_BG_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _EDITTIME::BUTTON_BG_HIGHLIGHTED_COLOR);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_NORMAL";
- __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_NORMAL_COLOR);
+ const char* key ="EDITTIME::CONTENT_BG_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_NORMAL_COLOR);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_PRESSED";
- __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_PRESSED_COLOR);
+ const char* key ="EDITTIME::CONTENT_BG_PRESSED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_PRESSED_COLOR);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_DISABLED";
- __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_DISABLED_COLOR);
+ const char* key ="EDITTIME::CONTENT_BG_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_DISABLED_COLOR);
}
{
- const char* key ="EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED";
- __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR);
+ const char* key ="EDITTIME::CONTENT_BG_HIGHLIGHTED";
+ __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_HIGHLIGHTED_COLOR);
}
{
const char* key ="FASTSCROLL::INDEX_BG_NORMAL";
const char* key ="HEADER::BUTTON_TRANSLUCENT_BG_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_TRANSLUCENT_BG_NORMAL_COLOR);
}
-
{
const char* key ="HEADER::BUTTON_TRANSLUCENT_BG_DISABLED";
__pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_TRANSLUCENT_BG_DISABLED_COLOR);
const char* key ="HEADER::TAB_ITEM_BG_PRESSED";
__pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_PRESSED_COLOR);
}
-
{
const char* key ="HEADER::TAB_ITEM_BG_HIGHLIGHTED";
__pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_HIGHLIGHTED_COLOR);
__pColorKeyTable->Add(ResourceKey(key), _HEADER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL_COLOR);
}
{
+ const char* key ="HEADER::TAB_ITEM_BG_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_NORMAL_COLOR);
+ }
+ {
+ const char* key ="HEADER::TAB_ITEM_BG_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_DISABLED_COLOR);
+ }
+ {
+ const char* key ="HEADER::TAB_ITEM_BG_PRESSED";
+ __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_PRESSED_COLOR);
+ }
+ {
+ const char* key ="HEADER::TAB_ITEM_BG_HIGHLIGHTED";
+ __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_HIGHLIGHTED_COLOR);
+ }
+ {
+ const char* key ="HEADER::TAB_ITEM_BG_SELECTED";
+ __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_SELECTED_COLOR);
+ }
+ {
const char* key ="ICONLIST::EMPTY_TEXT_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _ICONLIST::EMPTY_TEXT_NORMAL_COLOR);
}
__pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::ICON_BG_DISABLED_COLOR);
}
{
+ const char* key ="SEARCHBAR::EDIT_TEXT_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_TEXT_NORMAL_COLOR);
+ }
+ {
+ const char* key ="SEARCHBAR::EDIT_TEXT_DISABLED";
+ __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_TEXT_DISABLED_COLOR);
+ }
+ {
+ const char* key ="SEARCHBAR::EDIT_TEXT_HIGHLIGHTED";
+ __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_TEXT_HIGHLIGHTED_COLOR);
+ }
+ {
const char* key ="SEARCHBAR::CONTENT_AREA_BG_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::CONTENT_AREA_BG_NORMAL_COLOR);
}
__pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::ITEM_ANNEX_DETAIL_BG_HIGHLIGHTED_COLOR);
}
{
+ const char* key ="TABLEVIEW::GROUPITEM_BG_NORMAL";
+ __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BG_NORMAL_COLOR);
+ }
+ {
const char* key ="TABLEVIEW::GROUPITEM_TEXT_NORMAL";
__pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_TEXT_NORMAL_COLOR);
}
ADD_COLOR_CONFIG(TITLE_NORMAL, $B052L5);
ADD_COLOR_CONFIG(TITLE_DISABLED, $B052L5);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, $W011);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, $B042);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, $W011);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, $W161);
+ ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011);
+ ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042);
+ ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011);
+ ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161);
ADD_IMAGE_CONFIG(AMPM_BG_NORMAL, #00_button_01.#.png);
ADD_IMAGE_CONFIG(AMPM_BG_PRESSED, #00_button_01.#.png);
ADD_IMAGE_CONFIG(BG_NORMAL, #00_list_group_bg.#.png);
ADD_IMAGE_CONFIG(BG_EFFECT, #00_list_group_bg_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
START_UI_CONFIG_MODE(720x1280);
{
ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $B052L5);
ADD_COLOR_CONFIG(DIVIDER_LEFT_HALF, $B0224);
ADD_COLOR_CONFIG(DIVIDER_RIGHT_HALF, $B0222);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, $W011);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, $B042);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, $W011);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, $W161);
+ ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011);
+ ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042);
+ ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011);
+ ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
START_UI_CONFIG_MODE(720x1280);
{
ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B042);
ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $W011);
ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, $W011);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, $B042);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, $W011);
- ADD_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, $W161);
+ ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011);
+ ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042);
+ ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011);
+ ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161);
ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $F031L1);
ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $F031L1P);
ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $F031L1D);
ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, #00_button_01_ef.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png);
ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED, #00_picker_button.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
- ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png);
+ ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png);
START_UI_CONFIG_MODE(720x1280);
{
ADD_SHAPE_CONFIG(BOTTOM_HEIGHT, 118); // 20130403
ADD_SHAPE_CONFIG(TEXT_SIZE, 38); // 20130403
- ADD_SHAPE_CONFIG(TEXT_HEIGHT, 88); // 20130403
+ ADD_SHAPE_CONFIG(TEXT_HEIGHT, 132); // 20130403
ADD_SHAPE_CONFIG(TEXT_LEFT_MARGIN, 29); // 20130403
ADD_SHAPE_CONFIG(TEXT_RIGHT_MARGIN, 29); // 20130403
ADD_SHAPE_CONFIG(TITLE_TEXT_TOP_MARGIN, 20); //20130403
ADD_SHAPE_CONFIG(TITLE_TEXT_LEFT_MARGIN, 29); //20130403
ADD_SHAPE_CONFIG(TITLE_TEXT_RIGHT_MARGIN, 29); //20130403
- ADD_SHAPE_CONFIG(BODY_TEXT_HEIGHT, 88); //20130403
+ ADD_SHAPE_CONFIG(BODY_TEXT_HEIGHT, 132); //20130403
ADD_SHAPE_CONFIG(TOP_BORDER, 6); // Compatibility 2.0
ADD_SHAPE_CONFIG(BOTTOM_BORDER, 30); // Compatibility 2.0
ADD_IMAGE_CONFIG(BG_EFFECT, #00_search_edit_field_bg_ef.#.png);
ADD_IMAGE_CONFIG(ICON_NORMAL, #00_search_icon.png);
+ ADD_IMAGE_CONFIG(ICON_DISABLED, #00_search_icon.png);
ADD_IMAGE_CONFIG(ICON_EFFECT_NORMAL, #00_search_icon_ef.png);
projects / platform / framework / native / uifw.git / commitdiff
