* @exception E_INVALID_ARG The specified input parameter is invalid. @n
* The specified @c size cannot be a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.
* @see GetTextSize()
*/
result SetTextSize(int size);
* @exception E_INVALID_ARG The specified input parameter is invalid. @n
* The specified @c size cannot be a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.0f.
* @see GetTextSizeF()
*/
result SetTextSize(float size);
* @exception E_INVALID_ARG The specified input parameter is invalid. @n
* The @c size cannot be a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.
* @see GetTextSize()
*/
result SetTextSize(int size);
* @exception E_INVALID_ARG The specified input parameter is invalid. @n
* The @c size cannot be a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.0f.
* @see GetTextSizeF()
*/
result SetTextSize(float size);
* @exception E_INVALID_ARG The specified @c size is invalid, @n
* or the specified @c size is a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.
* @see GetTextSize()
*/
result SetTextSize(int size);
* @exception E_INVALID_ARG The specified @c size is invalid, @n
* or the specified @c size is a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.0f.
* @see GetTextSizeF()
*/
result SetTextSize(float size);
* else @c false
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of a specified operation. @n
- * If the style of %Form is not ::FORM_STYLE_INDICATOR_AUTO_HIDE,
+ * If the style of %Form is not ::FORM_STYLE_PORTRAIT_INDICATOR_AUTO_HIDE,
* the method returns @c E_INVALID_OPERATION.
* @remarks If this method is not explicitly called, the notification tray is opened.
* @see IsNotificationTrayOpenEnabled()
* else @c false
* @exception E_SUCCESS The method is successful.
* @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of a specified operation. @n
- * If the style of %Form is not ::FORM_STYLE_INDICATOR_AUTO_HIDE,
+ * If the style of %Form is not ::FORM_STYLE_PORTRAIT_INDICATOR_AUTO_HIDE,
* the method returns @c E_INVALID_OPERATION.
* @remarks The specific error code can be accessed using the GetLastResult() method.
* @see SetNotificationTrayOpenEnabled()
* @exception E_INVALID_ARG The specified input parameter is invalid. @n
* The specified @c size cannot be a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.
* @see GetTextSize()
*/
result SetTextSize(int size);
* @exception E_INVALID_ARG The specified input parameter is invalid. @n
* The specified @c size cannot be a negative integer.
* @exception E_SYSTEM A system error has occurred.
+ * @remarks The specified @c size should be greater than or equal to minimum font size which is 4.0f.
* @see GetTextSizeF()
*/
result SetTextSize(float size);
* @param[in] listener The event listener to add
* @exception E_SUCCESS The method is successful.
* @exception E_OBJ_ALREADY_EXIST The listener is already added.
- * @see RemoveRotationGestureEventListener()
+ * @see RemovePinchGestureEventListener()
*/
result AddPinchGestureEventListener(Tizen::Ui::ITouchPinchGestureEventListener& listener);
* @param[in] listener The listener to remove
* @exception E_SUCCESS The method is successful.
* @exception E_OBJ_NOT_FOUND The specified @c listener is not found.
- * @see AddRotationGestureEventListener()
+ * @see AddPinchGestureEventListener()
*/
result RemovePinchGestureEventListener(Tizen::Ui::ITouchPinchGestureEventListener& listener);
if (this->_pFont)
{
pFont = _FontImpl::CloneN(*(this->_pFont));
- SysTryCatch(NID_GRP, pFont, r = E_OUT_OF_MEMORY, E_OPERATION_FAILED, "[E_OUT_OF_MEMORY] Failed to create Font instance.");
+ SysTryCatch(NID_GRP, pFont, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Failed to create Font instance.");
}
else
{
- // make font instance with the attribute of system default font
- // shkim, TODO
+ pFont = new Font();
+ SysTryCatch(NID_GRP, pFont, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Failed to allocate memory.");
+
+ const float defaultFontSize = _ResUtil::ConvertToVirCoordY(16.0f);
+ result r = pFont->Construct(FONT_STYLE_PLAIN, defaultFontSize);
+ SysTryCatch(NID_GRP, IsSucceeded(r), , r, "[%s] Propagating.", GetErrorMessage(r));
}
SetLastResult(r);
SysAssertf(__pAccessibilityContainerImpl != null, "Not constructed properly by platform.");
ClearLastResult();
AccessibilityElement* pElement = __pAccessibilityContainerImpl->GetChildElement(name);
- SysTryReturn(NID_UI, pElement, null, E_SYSTEM, "[E_SYSTEM] Getting a child by name is failed..");
+ SysTryReturn(NID_UI, pElement, null, E_SYSTEM, "[E_SYSTEM] Getting a child by name is failed.. name : %ls", name.GetPointer());
return pElement;
}
return false;
}
}
-
+bool
+_AccessibilityContainer::IsContains(const _AccessibilityElement& element)
+{
+ result r = E_SUCCESS;
+ _AccessibilityElement* pElement = null;
+ int count = __elementList.GetCount();
+ for (int i = 0; i < count ;i++)
+ {
+ r = __elementList.GetAt(i, pElement);
+ if (pElement == &element)
+ {
+ return true;
+ }
+ }
+ return false;
+}
_AccessibilityElement*
_AccessibilityContainer::GetChildElement(const String& name) const
{
__pStatusId = null;
delete [] __pValueId;
__pValueId = null;
+ if (__pParent && this == __pParent->GetCurrentFocusedElement())
+ {
+ _AccessibilityManager::GetInstance()->RequestAutoReading(_ACCESSIBILITY_AUTO_READING_MODE_FIRST_ITEM);
+ }
}
result
_AccessibilityElement::Construct(const String& name, const FloatRectangle& bounds)
}
if (__start)
{
- return;
+ Stop();
}
__start = true;
__mode = mode;
}
if (__pTargetContainer == &container)
{
+ if(__pTargetContainer)
+ {
+ __pTargetContainer->SetCurrentFocusedElement(null);
+ }
__pTargetContainer = null;
__pTargetElement = null;
}
{
pElement = null;
__pTargetElement = null;
+ if(__pTargetContainer)
+ {
+ __pTargetContainer->SetCurrentFocusedElement(null);
+ }
__pTargetContainer = null;
+
}
else
{
void
_AccessibilityManager::RequestToDrawFocusUi()
{
- if (__pTargetContainer)
+ if (__targetControlHandle.IsValid() && __pTargetContainer->IsContains(*__pTargetElement))
{
//HidePopup();
DrawFocusUi(*__pTargetElement);
{
__pTtsPlayer->Deactivate();
EraseFocusUi();
+ if(__pTargetContainer)
+ {
+ __pTargetContainer->SetCurrentFocusedElement(null);
+ }
__pTargetContainer = null;
__pTargetElement = null;
__pTitleElement = null;
_AccessibilityManager::ResetFocusInformation(void)
{
EraseFocusUi();
-
+ if(__pTargetContainer)
+ {
+ __pTargetContainer->SetCurrentFocusedElement(null);
+ }
__pTargetContainer = null;
__pTargetElement = null;
__pTitleElement = null;
SysTryReturn(NID_UI, pRootControlElement, null, E_SYSTEM, "[E_SYSTEM] pRootControlElement is null.");
_ControlVisualElement* pHitTestElm = pRootControlElement->GetControlChildAtPoint(ptf);
- SysTryReturn(NID_UI, pHitTestElm, null, E_SYSTEM, "[E_SYSTEM] pHitTestElm is null.");
+ if (pHitTestElm == null)
+ {
+ SysSecureLog(NID_UI, "pHitTestElm is null, point(%f, %f)", ptf.x, ptf.y);
+ return null;
+ }
pTouchedControl = static_cast <_Control*>(pHitTestElm->GetUserData());
SysLog(NID_UI, "%ls %ls", indent.GetPointer(), publicDescription.GetPointer());
}
+ _ControlManager* pControlManager = _ControlManager::GetInstance();
+ SysTryReturn(NID_UI, pControlManager, null, E_SYSTEM, "[E_SYSTEM] _ControlManager does not exist.");
+
+ bool focused = false;
+ _Control* pFocusedControl = pControlManager->GetFocusControl();
+ if (pFocusedControl && (pFocusedControl == this))
+ {
+ focused = true;
+ }
+
// Core
- SysLog(NID_UI, "%ls 0x%x(%d %ls) enable(%d) enableState(%d) visible(%d) visibleState(%d) focusable(%d) clip(%d) movable(%d) resizable(%d) inputEnableState(%d)",
+ SysLog(NID_UI, "%ls 0x%x(%d %ls) enable(%d) enableState(%d) visible(%d) visibleState(%d) focusable(%d) focused(%d) clip(%d) movable(%d) resizable(%d) inputEnableState(%d)",
indent.GetPointer(), this, __controlHandle.ToInt(), GetName().GetPointer(), IsEnabled(), GetEnableState(), IsVisible(), GetVisibleState(),
- IsFocusable(), IsClipToParent(), IsMovable(), IsResizable(), GetInputEnableState());
+ IsFocusable(), focused, IsClipToParent(), IsMovable(), IsResizable(), GetInputEnableState());
Rectangle bounds = GetBounds();
Dimension min = GetMinimumSize();
{
}
+void
+_Control::OnDescendantControlFocusMoved(const _Control& control)
+{
+}
+
bool
_Control::IsChildControlFocusManage(void) const
{
{
_Control* pEnumeratorControl = null;
pEnum->GetCurrent(pEnumeratorControl);
- _ContainerImpl* pTempContainerImpl = dynamic_cast<_ContainerImpl*>(static_cast <_ControlImpl* >(pEnumeratorControl->GetUserData()));
- if (pTempContainerImpl != null && (nextContainerIndex < i))
+ if (nextContainerIndex < i)
{
if (pEnumeratorControl->IsChildControlFocusManage() == false)
{
}
void
+_ControlImpl::OnDescendantControlFocusMoved(const _Control& control)
+{
+ GetCore().OnDescendantControlFocusMoved(control);
+}
+
+void
_ControlImpl::OnFocusModeStateChanged(void)
{
GetCore().OnFocusModeStateChanged();
#include "FUi_UiEventManager.h"
#include "FUi_TouchManager.h"
#include "FUi_DimmingManager.h"
+#include "FUi_IControlManagerEventListener.h"
#include "FUi_TouchLongPressGestureDetector.h"
#include "FUi_TouchTapGestureDetector.h"
#include "FUi_KeyEventManager.h"
#include "FUiCtrl_Frame.h"
#include "FUiCtrl_IndicatorManager.h"
+using namespace std;
using namespace Tizen::App;
using namespace Tizen::App::Package;
using namespace Tizen::Base;
result r = _SettingInfoImpl::RemoveSettingEventListenerForInternal(*__pInstance);
SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+ __pInstance->CallControlManagerEventListener();
+
delete __pInstance;
__pInstance = null;
}
, __defaultFontName(L"")
, __screenDpi(0)
, __pClipboardOwner(null)
+ , __pControlManagerEventListenerList(new (std::nothrow) LinkedListT<_IControlManagerEventListener*>)
{
result r = GetAppCoordinateSystem(__isCoordinateSystemLogical, __logicalCoordinateSystem, __logicalBaseScreenSize);
SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] System error occurred.");
return r;
}
+void
+_ControlManager::CallControlManagerEventListener(void)
+{
+ unique_ptr<IEnumeratorT<_IControlManagerEventListener*> > pEnumerator(__pControlManagerEventListenerList->GetEnumeratorN());
+ if (pEnumerator)
+ {
+ while (pEnumerator->MoveNext() == E_SUCCESS)
+ {
+ _IControlManagerEventListener* pListener = null;
+ pEnumerator->GetCurrent(pListener);
+
+ if (pListener)
+ {
+ pListener->OnControlManagerTerminating();
+ }
+ }
+ }
+}
+
result
_ControlManager::CloseWindow(_Window& window) // [ToDo] exception check.
{
return GetCurrentFrame();
}
+result
+_ControlManager::AddControlManagerEventListener(_IControlManagerEventListener& listener)
+{
+ bool exist = __pControlManagerEventListenerList->Contains(&listener);
+ SysTryReturn(NID_UI, exist == false, E_OBJ_ALREADY_EXIST, E_OBJ_ALREADY_EXIST, "[%s] Propagating.", GetErrorMessage(E_OBJ_ALREADY_EXIST));
+
+ __pControlManagerEventListenerList->Add(&listener);
+
+ return E_SUCCESS;
+}
+
+result
+_ControlManager::RemoveControlManagerEventListener(_IControlManagerEventListener& listener)
+{
+ result r = __pControlManagerEventListenerList->Remove(&listener);
+ SysTryReturn(NID_UI, r == E_SUCCESS, E_OBJ_NOT_FOUND, E_OBJ_NOT_FOUND, "[%s] Propagating.", GetErrorMessage(E_OBJ_NOT_FOUND));
+
+ return E_SUCCESS;
+}
+
_Control*
_ControlManager::GetTopmostTouchedControl(const Point& point)
{
{
ClearLastResult();
- result r = __pGestureList->Remove(&(const_cast<_TouchGestureDetector&>(gesture)));
- SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
- return E_SUCCESS;
+ return __pGestureList->Remove(&(const_cast<_TouchGestureDetector&>(gesture)));
}
IListT <_TouchGestureDetector*>*
const wchar_t* KEYBOARD_INSERTED_EVENT = L"KEYBOARD_INSERTED";
const int DEVICE_COUNT = 999;
bool touchPressed[DEVICE_COUNT] = {false,};
+bool keyPressed[_KEY_HARDWARE_MAX] = {false,};
Evas_Object*
GetEvasObject(const _Control& control)
if (_KeyEvent::GetKeyCode(pEv->keyname) == _KEY_INVALID)
{
- SysLog(NID_UI, "KeyCode is Invalid");
+ SysLog(NID_UI, "KeyCode %s is invalid", pEv->keyname);
return ECORE_CALLBACK_PASS_ON;
}
SysSecureLog(NID_UI, "KeyName = %s, KeyCode = %d, KeyModifier = %x", pEv->keyname, _KeyEvent::GetKeyCode(pEv->keyname), _KeyEvent::GetKeyModifier(pEv->modifiers));
event.Send();
+ keyPressed[_KeyEvent::GetKeyCode(pEv->keyname)] = true;
+
SetLastResult(E_SUCCESS);
return ECORE_CALLBACK_PASS_ON;
if (_KeyEvent::GetKeyCode(pEv->keyname) == _KEY_INVALID)
{
- SysLog(NID_UI, "KeyCode is Invalid");
+ SysLog(NID_UI, "KeyCode %s is invalid", pEv->keyname);
+ return ECORE_CALLBACK_PASS_ON;
+ }
+
+ if (keyPressed[_KeyEvent::GetKeyCode(pEv->keyname)] != true)
+ {
+ SysLog(NID_UI, "KeyCode %s is not pressed", pEv->keyname);
return ECORE_CALLBACK_PASS_ON;
}
SysSecureLog(NID_UI, "KeyName = %s, KeyCode = %d, KeyModifier = %x", pEv->keyname, _KeyEvent::GetKeyCode(pEv->keyname), _KeyEvent::GetKeyModifier(pEv->modifiers));
event.Send();
+ keyPressed[_KeyEvent::GetKeyCode(pEv->keyname)] = false;
+
SetLastResult(E_SUCCESS);
return ECORE_CALLBACK_PASS_ON;
for(int i=0; i<DEVICE_COUNT; i++)
{
- touchPressed[pEv->multi.device] = false;
+ touchPressed[i] = false;
}
pTouchManager->ResetTouchInfo();
bool findNextFocusControl = false;
_Control* pNextFocusControl = null;
int count = 0;
+ int loopCount = pFocusControlList->GetCount() + 1;
while (pEnum->MoveNext() == E_SUCCESS)
{
_Control* pEnumeratorControl = null;
else
{
count ++;
- if ((pFocusControlList->GetCount()) == count)
+ if (loopCount == count)
{
return;
}
if (pParentControl)
{
pParentControl->OnChildControlFocusMoved(*pNextFocusControl);
+ while(pParentControl)
+ {
+ pParentControl->OnDescendantControlFocusMoved(*pNextFocusControl);
+ pParentControl = pParentControl->GetParent();
+ }
}
pNextFocusControl->DrawFocus();
}
}
void
+_ResourceManager::LoadBlackPalette(void)
+{
+ ADD_PALETTE(BASIC::foreground, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::background, 0xFF000000);
+ ADD_PALETTE(BASIC::B011, 0xFF000000);
+ ADD_PALETTE(BASIC::B012, 0xFF000000);
+ ADD_PALETTE(BASIC::B013, 0xFF000000);
+ ADD_PALETTE(BASIC::B014, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::B015, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B016, 0xFF000000);
+ ADD_PALETTE(BASIC::B017, 0xFF000000);
+ ADD_PALETTE(BASIC::B018, 0xFF6590FF);
+ ADD_PALETTE(BASIC::B0211, 0xFF000000);
+ ADD_PALETTE(BASIC::B0211D, 0xFF000000);
+ ADD_PALETTE(BASIC::B0212, 0xFF1C1E28);
+ ADD_PALETTE(BASIC::B0213, 0xFF404040);
+ ADD_PALETTE(BASIC::B0214, 0xFF222C47);
+ ADD_PALETTE(BASIC::B0215, 0xFF1D263C);
+ ADD_PALETTE(BASIC::B0216, 0xFF222C47);
+ ADD_PALETTE(BASIC::B0217, 0xFF11131B);
+ ADD_PALETTE(BASIC::B0217D, 0x7F11131B);
+ ADD_PALETTE(BASIC::B0221, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::B0222, 0x3FFFFFFF);
+ ADD_PALETTE(BASIC::B0223, 0x00000000);
+ ADD_PALETTE(BASIC::B0224, 0xFF27282B);
+ ADD_PALETTE(BASIC::B0225, 0xFF2A5181);
+ ADD_PALETTE(BASIC::B0226, 0xFF4B73A3);
+ ADD_PALETTE(BASIC::B0227, 0xFF000000);
+ ADD_PALETTE(BASIC::B0228, 0xFF1A5274);
+ ADD_PALETTE(BASIC::B0232, 0x00000000);
+ ADD_PALETTE(BASIC::B0233, 0x00000000);
+ ADD_PALETTE(BASIC::B031, 0x00000000);
+ ADD_PALETTE(BASIC::B041, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::B041P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B042, 0xFF2A39AC);
+ ADD_PALETTE(BASIC::B043, 0x00001BEA);
+ ADD_PALETTE(BASIC::B044, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::B0511, 0xFF313F66);
+ ADD_PALETTE(BASIC::B0511P, 0xFF2A39AC);
+ ADD_PALETTE(BASIC::B0512, 0x00000000);
+ ADD_PALETTE(BASIC::B0513, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B0514, 0xFF313F66);
+ ADD_PALETTE(BASIC::B0514P1, 0xFF303FB2);
+ ADD_PALETTE(BASIC::B0514P2, 0xFF5163E9);
+ ADD_PALETTE(BASIC::B0514L3, 0xFF6590FF);
+ ADD_PALETTE(BASIC::B0515L1, 0xFF464C5E);
+ ADD_PALETTE(BASIC::B0515L2, 0x7F454442);
+ ADD_PALETTE(BASIC::B0516, 0x00000000);
+ ADD_PALETTE(BASIC::B0517, 0x00000000);
+ ADD_PALETTE(BASIC::B0517P1, 0x00000000);
+ ADD_PALETTE(BASIC::B0517P2, 0x00000000);
+ ADD_PALETTE(BASIC::B0518, 0xFF2E4468);
+ ADD_PALETTE(BASIC::B0518P, 0x00000000);
+ ADD_PALETTE(BASIC::B0519, 0xFFF25D28);
+ ADD_PALETTE(BASIC::B0520, 0xFF2E4468);
+ ADD_PALETTE(BASIC::B0520P, 0xFF3C649B);
+ ADD_PALETTE(BASIC::B052L1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L1P, 0xFF5D83FF);
+ ADD_PALETTE(BASIC::B052L1D, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L2, 0x00000000);
+ ADD_PALETTE(BASIC::B052L2P, 0x005787B8);
+ ADD_PALETTE(BASIC::B052L3, 0x00000000);
+ ADD_PALETTE(BASIC::B052L3P, 0x00000000);
+ ADD_PALETTE(BASIC::B052L4, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L4P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L4D, 0x66FAFAFA);
+ ADD_PALETTE(BASIC::B052L5, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L6, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L6D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::B052L6P1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L6P2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L7, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L8, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L8P, 0xFF5D83FF);
+ ADD_PALETTE(BASIC::B052L8D, 0x66FAFAFA);
+ ADD_PALETTE(BASIC::B052L9, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L9P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L9D, 0x66FAFAFA);
+ ADD_PALETTE(BASIC::B052L10, 0x00000000);
+ ADD_PALETTE(BASIC::B0531, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B0532, 0x00000000);
+ ADD_PALETTE(BASIC::B0533, 0x00000000);
+ ADD_PALETTE(BASIC::B0534, 0x00000000);
+ ADD_PALETTE(BASIC::B0535, 0x00000000);
+ ADD_PALETTE(BASIC::B0536, 0x00000000);
+ ADD_PALETTE(BASIC::B0537, 0x00000000);
+ ADD_PALETTE(BASIC::B0541, 0xFF6B728A);
+ ADD_PALETTE(BASIC::B0541P, 0xFF0D1D96);
+ ADD_PALETTE(BASIC::B0541D, 0x996B728A);
+ ADD_PALETTE(BASIC::B0542, 0x00000000);
+ ADD_PALETTE(BASIC::B0542P, 0x00000000);
+ ADD_PALETTE(BASIC::B0543, 0x00000000);
+ ADD_PALETTE(BASIC::B0544, 0x00000000);
+ ADD_PALETTE(BASIC::B0545, 0x00000000);
+ ADD_PALETTE(BASIC::B0551, 0x00000000);
+ ADD_PALETTE(BASIC::B0552, 0x00000000);
+ ADD_PALETTE(BASIC::B0553, 0xFFA5A5A5);
+ ADD_PALETTE(BASIC::B0554, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::B0555, 0x00000000);
+ ADD_PALETTE(BASIC::B0556, 0x00000000);
+ ADD_PALETTE(BASIC::B0557, 0x00000000);
+ ADD_PALETTE(BASIC::B0558, 0x00000000);
+ ADD_PALETTE(BASIC::B061L1, 0xFF1D263C);
+ ADD_PALETTE(BASIC::B061L2, 0xFF49577B);
+ ADD_PALETTE(BASIC::B061L3, 0xFF969A9C);
+ ADD_PALETTE(BASIC::B061L4, 0xFF1D263C);
+ ADD_PALETTE(BASIC::B061L5, 0xFF222222);
+ ADD_PALETTE(BASIC::B061L6, 0xFF333537);
+ ADD_PALETTE(BASIC::B0621L1, 0x00000000);
+ ADD_PALETTE(BASIC::B0621L2, 0x00000000);
+ ADD_PALETTE(BASIC::B0622L1, 0x001D263C);
+ ADD_PALETTE(BASIC::B0622L2, 0x3FFFFFFF);
+ ADD_PALETTE(BASIC::B0623L1, 0xFF1D263C);
+ ADD_PALETTE(BASIC::B0623L2, 0xFF626675);
+ ADD_PALETTE(BASIC::B0624L1, 0xFF1D263C);
+ ADD_PALETTE(BASIC::B0624L2, 0xFF626675);
+ ADD_PALETTE(BASIC::B0624L3, 0xFF313F66);
+ ADD_PALETTE(BASIC::B0624L4, 0xFF000000);
+ ADD_PALETTE(BASIC::B0624L5, 0xFF5783FF);
+ ADD_PALETTE(BASIC::B0624L6, 0xFF5783FF);
+ ADD_PALETTE(BASIC::B063L1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L1D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::B063L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L3, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::B063L4, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L5, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L5D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::B063L6, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L6P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L6D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::B063L7, 0xFF656565);
+ ADD_PALETTE(BASIC::B063L8, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::B063L8P, 0x00000000);
+ ADD_PALETTE(BASIC::B063L8D, 0x996E6F76);
+ ADD_PALETTE(BASIC::B063L9, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B064L1, 0xFF6890FF);
+ ADD_PALETTE(BASIC::B064L2, 0xFFD7D7D7);
+ ADD_PALETTE(BASIC::B064L2P, 0xFFD7D7D7);
+ ADD_PALETTE(BASIC::B064L2D, 0xFFD7D7D7);
+ ADD_PALETTE(BASIC::B064L3, 0xFF000000);
+ ADD_PALETTE(BASIC::B064L3P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B064L3D, 0x7F000000);
+ ADD_PALETTE(BASIC::B065L1, 0x00000000);
+ ADD_PALETTE(BASIC::B065L2, 0x00000000);
+ ADD_PALETTE(BASIC::B065L3, 0x00000000);
+ ADD_PALETTE(BASIC::B065L3P, 0x00000000);
+ ADD_PALETTE(BASIC::B065L4, 0xFFEEEEEE);
+ ADD_PALETTE(BASIC::B065L4D, 0x99EEEEEE);
+ ADD_PALETTE(BASIC::B065L4P, 0xFF2A39AC);
+ ADD_PALETTE(BASIC::B065L5, 0x00000000);
+ ADD_PALETTE(BASIC::B071, 0xFF393B41);
+ ADD_PALETTE(BASIC::B0721, 0xFFA09F9A);
+ ADD_PALETTE(BASIC::B0722, 0xFF5D83FF);
+ ADD_PALETTE(BASIC::B0723, 0xFF212428);
+ ADD_PALETTE(BASIC::B0724, 0xFF404040);
+ ADD_PALETTE(BASIC::B0725, 0xFF4F66A7);
+ ADD_PALETTE(BASIC::B0726, 0xFF404040);
+ ADD_PALETTE(BASIC::B0731, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::B0732, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B0741, 0xFFA09F9A);
+ ADD_PALETTE(BASIC::B0742, 0xFF5D83FF);
+ ADD_PALETTE(BASIC::B0743, 0xFF212428);
+ ADD_PALETTE(BASIC::B0744, 0xFF404040);
+ ADD_PALETTE(BASIC::B0745, 0x00000000);
+ ADD_PALETTE(BASIC::B0751, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::F011L1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F011L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F011L1D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::F011L2, 0xFF6890FF);
+ ADD_PALETTE(BASIC::F011L2D, 0x996890FF);
+ ADD_PALETTE(BASIC::F011L3, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L3D, 0x996E6F76);
+ ADD_PALETTE(BASIC::F011L4, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L4D, 0x996E6F76);
+ ADD_PALETTE(BASIC::F011L5, 0xFF5D83FF);
+ ADD_PALETTE(BASIC::F011L6, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F011L7, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L7D, 0x996E6F76);
+ ADD_PALETTE(BASIC::F011L8, 0xFFD10000);
+ ADD_PALETTE(BASIC::F011L9, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::F011L10, 0xFFF9F9F9);
+ ADD_PALETTE(BASIC::F011L11, 0xFF808080);
+ ADD_PALETTE(BASIC::F011L12, 0xFF4093F7);
+ ADD_PALETTE(BASIC::F011L13, 0x00000000);
+ ADD_PALETTE(BASIC::F011L14, 0x00000000);
+ ADD_PALETTE(BASIC::F011L15, 0xFFD10000);
+ ADD_PALETTE(BASIC::F011L16, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L17, 0xFF8B8B8B);
+ ADD_PALETTE(BASIC::F011L18, 0xFF686868);
+ ADD_PALETTE(BASIC::F011L19, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L20, 0x00000000);
+ ADD_PALETTE(BASIC::F011L21, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L22, 0xFF6E6F76);
+ ADD_PALETTE(BASIC::F011L23, 0xFF1382FF);
+ ADD_PALETTE(BASIC::F021L1i, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F021L1iP, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F021L1iD, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::F022L1i, 0xFF6C6E77);
+ ADD_PALETTE(BASIC::F022L2i, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::F022L2iD, 0x992B3AAF);
+ ADD_PALETTE(BASIC::F031L1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L1D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::F031L2, 0x00000000);
+ ADD_PALETTE(BASIC::F031L2P, 0x00000000);
+ ADD_PALETTE(BASIC::F031L2D, 0x00000000);
+ ADD_PALETTE(BASIC::F031L3, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L3P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L3D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::F032L1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L1D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::F032L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L2P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L2D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::F032L3, 0xFFF9F9F9);
+ ADD_PALETTE(BASIC::F032L3P, 0xFFF9F9F9);
+ ADD_PALETTE(BASIC::F041i, 0xFF5D6176);
+ ADD_PALETTE(BASIC::F041iD, 0x995D6176);
+ ADD_PALETTE(BASIC::F051, 0xFF485D93);
+ ADD_PALETTE(BASIC::F052, 0xFF3A72FF);
+ ADD_PALETTE(BASIC::F053, 0xFF485D93);
+ ADD_PALETTE(BASIC::F053P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F053D, 0x99485D93);
+ ADD_PALETTE(BASIC::F054, 0xFF202432);
+ ADD_PALETTE(BASIC::F055, 0xFF3A72FF);
+ ADD_PALETTE(BASIC::W011, 0xFF4B4D56);
+ ADD_PALETTE(BASIC::W011D, 0x994B4D56);
+ ADD_PALETTE(BASIC::W012, 0xFF095FD4);
+ ADD_PALETTE(BASIC::W012D, 0x99095FD4);
+ ADD_PALETTE(BASIC::W012P, 0xFF232F91);
+ ADD_PALETTE(BASIC::W013, 0x00000000);
+ ADD_PALETTE(BASIC::W0141, 0xFFDB0000);
+ ADD_PALETTE(BASIC::W0141P, 0xFFA10808);
+ ADD_PALETTE(BASIC::W0141D, 0x99DB0000);
+ ADD_PALETTE(BASIC::W015, 0xFF343432);
+ ADD_PALETTE(BASIC::W021L1, 0xFF000000);
+ ADD_PALETTE(BASIC::W021L1P, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::W021L2, 0xFF425790);
+ ADD_PALETTE(BASIC::W021L2P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W021L3, 0xFF425790);
+ ADD_PALETTE(BASIC::W021L3P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W021L4, 0xFFF0F0F0);
+ ADD_PALETTE(BASIC::W031L1, 0xFF000000);
+ ADD_PALETTE(BASIC::W031L1D, 0x99000000);
+ ADD_PALETTE(BASIC::W031L2, 0xFF000000);
+ ADD_PALETTE(BASIC::W031L2D, 0x99000000);
+ ADD_PALETTE(BASIC::W032, 0xFF5D6176);
+ ADD_PALETTE(BASIC::W032P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W032D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::W041, 0xFFE1DDD1);
+ ADD_PALETTE(BASIC::W051, 0xFF000000);
+ ADD_PALETTE(BASIC::W0611, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W0611P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W0611D, 0x99FAFAFA);
+ ADD_PALETTE(BASIC::W062L1, 0xFF555861);
+ ADD_PALETTE(BASIC::W062L1D, 0x99555861);
+ ADD_PALETTE(BASIC::W062L2, 0xFF415BFE);
+ ADD_PALETTE(BASIC::W062L2D, 0x7F415BFE);
+ ADD_PALETTE(BASIC::W062L3, 0xFFD8D7D2);
+ ADD_PALETTE(BASIC::W062L3D, 0x4CD8D7D2);
+ ADD_PALETTE(BASIC::W062L4, 0xFF3677C3);
+ ADD_PALETTE(BASIC::W062L4D, 0x4C3677C3);
+ ADD_PALETTE(BASIC::W062L5, 0xFFC7D3E3);
+ ADD_PALETTE(BASIC::W0631, 0xFFEEEEEE);
+ ADD_PALETTE(BASIC::W0632, 0xFF4C5158);
+ ADD_PALETTE(BASIC::W0641, 0xFF6B6D79);
+ ADD_PALETTE(BASIC::W0641P, 0xFF2A39AC);
+ ADD_PALETTE(BASIC::W0641D, 0x996B6D79);
+ ADD_PALETTE(BASIC::W0651, 0xFF3A3A3A);
+ ADD_PALETTE(BASIC::W0711, 0xFF525767);
+ ADD_PALETTE(BASIC::W0712, 0xFF4267A9);
+ ADD_PALETTE(BASIC::W0713, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::W0714, 0xFF263E5F);
+ ADD_PALETTE(BASIC::W0715, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::W0721, 0x00000000);
+ ADD_PALETTE(BASIC::W0811, 0xFF253296);
+ ADD_PALETTE(BASIC::W0812, 0x00000000);
+ ADD_PALETTE(BASIC::W0813, 0xFF595959);
+ ADD_PALETTE(BASIC::W082, 0x00000000);
+ ADD_PALETTE(BASIC::W083, 0x00000000);
+ ADD_PALETTE(BASIC::W084, 0xB2FAFAFA);
+ ADD_PALETTE(BASIC::W084P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W085, 0x00000000);
+ ADD_PALETTE(BASIC::W091, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::W092, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W101, 0xFF4884D6);
+ ADD_PALETTE(BASIC::W111, 0xFFC8CEDB);
+ ADD_PALETTE(BASIC::W112L1, 0xFF8995AE);
+ ADD_PALETTE(BASIC::W112L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W1121, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W1122, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W1123, 0x4C000000);
+ ADD_PALETTE(BASIC::W1211, 0x00000000);
+ ADD_PALETTE(BASIC::W1212, 0x00000000);
+ ADD_PALETTE(BASIC::W1221, 0xFF000000);
+ ADD_PALETTE(BASIC::W1222, 0xFF878580);
+ ADD_PALETTE(BASIC::W1223, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::W131, 0xFF343739);
+ ADD_PALETTE(BASIC::W132, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::W141, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W151, 0x66000000);
+ ADD_PALETTE(BASIC::W152, 0xFF42434B);
+ ADD_PALETTE(BASIC::W153, 0xFF2B3AAF);
+ ADD_PALETTE(BASIC::W154, 0xFF1C1E28);
+ ADD_PALETTE(BASIC::W161, 0xFF001BEA);
+}
+
+void
+_ResourceManager::LoadWhitePalette(void)
+{
+ ADD_PALETTE(BASIC::foreground, 0xFF000000);
+ ADD_PALETTE(BASIC::background, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B011, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B012, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B013, 0xFF000000);
+ ADD_PALETTE(BASIC::B014, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::B015, 0xFF202327);
+ ADD_PALETTE(BASIC::B016, 0xFF000000);
+ ADD_PALETTE(BASIC::B017, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B018, 0xFF6590FF);
+ ADD_PALETTE(BASIC::B0211, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B0211D, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B0212, 0xFFEDEBE4);
+ ADD_PALETTE(BASIC::B0213, 0xFF5B5656);
+ ADD_PALETTE(BASIC::B0214, 0xFFDCDAD3);
+ ADD_PALETTE(BASIC::B0215, 0xFFDEDCD5);
+ ADD_PALETTE(BASIC::B0216, 0xFFBDBBB5);
+ ADD_PALETTE(BASIC::B0217, 0xFFEFEDE5);
+ ADD_PALETTE(BASIC::B0217D, 0x7FEFEDE5);
+ ADD_PALETTE(BASIC::B0221, 0xFF8A8A8A);
+ ADD_PALETTE(BASIC::B0222, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::B0223, 0xFFD3D1CB);
+ ADD_PALETTE(BASIC::B0224, 0xFFB9B8B2);
+ ADD_PALETTE(BASIC::B0225, 0xFF2A5181);
+ ADD_PALETTE(BASIC::B0226, 0xFF4B73A3);
+ ADD_PALETTE(BASIC::B0227, 0xFF000000);
+ ADD_PALETTE(BASIC::B0228, 0xFF1A5274);
+ ADD_PALETTE(BASIC::B0232, 0x00000000);
+ ADD_PALETTE(BASIC::B0233, 0x00000000);
+ ADD_PALETTE(BASIC::B031, 0x00000000);
+ ADD_PALETTE(BASIC::B041, 0xFF5787C2);
+ ADD_PALETTE(BASIC::B041P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B042, 0xFF0079D4);
+ ADD_PALETTE(BASIC::B043, 0xFF5787C2);
+ ADD_PALETTE(BASIC::B044, 0xFF2A89C2);
+ ADD_PALETTE(BASIC::B0511, 0xFFEDEBE4);
+ ADD_PALETTE(BASIC::B0511P, 0xFF0E66AA);
+ ADD_PALETTE(BASIC::B0512, 0x00000000);
+ ADD_PALETTE(BASIC::B0513, 0xFF202327);
+ ADD_PALETTE(BASIC::B0514, 0xFFEDEBE4);
+ ADD_PALETTE(BASIC::B0514P1, 0xFF0E66AA);
+ ADD_PALETTE(BASIC::B0514P2, 0xFF007BDA);
+ ADD_PALETTE(BASIC::B0514L3, 0xFF6590FF);
+ ADD_PALETTE(BASIC::B0515L1, 0xFFDEDCD5);
+ ADD_PALETTE(BASIC::B0515L2, 0x7F626262);
+ ADD_PALETTE(BASIC::B0516, 0x00000000);
+ ADD_PALETTE(BASIC::B0517, 0x00000000);
+ ADD_PALETTE(BASIC::B0517P1, 0x00000000);
+ ADD_PALETTE(BASIC::B0517P2, 0x00000000);
+ ADD_PALETTE(BASIC::B0518, 0x003567A3);
+ ADD_PALETTE(BASIC::B0518P, 0x00000000);
+ ADD_PALETTE(BASIC::B0519, 0xFFF25D28);
+ ADD_PALETTE(BASIC::B0520, 0xFF3567A3);
+ ADD_PALETTE(BASIC::B0520P, 0xFF2A89C2);
+ ADD_PALETTE(BASIC::B052L1, 0xFF656565);
+ ADD_PALETTE(BASIC::B052L1P, 0xFF007BDA);
+ ADD_PALETTE(BASIC::B052L1D, 0x7F656565);
+ ADD_PALETTE(BASIC::B052L2, 0xFF525252);
+ ADD_PALETTE(BASIC::B052L2P, 0xFF4093F7);
+ ADD_PALETTE(BASIC::B052L3, 0x00000000);
+ ADD_PALETTE(BASIC::B052L3P, 0x00000000);
+ ADD_PALETTE(BASIC::B052L4, 0xFF282828);
+ ADD_PALETTE(BASIC::B052L4P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L4D, 0x7F282828);
+ ADD_PALETTE(BASIC::B052L5, 0xFF282828);
+ ADD_PALETTE(BASIC::B052L6, 0xFF282828);
+ ADD_PALETTE(BASIC::B052L6D, 0x7F282828);
+ ADD_PALETTE(BASIC::B052L6P1, 0xFF0E68AD);
+ ADD_PALETTE(BASIC::B052L6P2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L7, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L8, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L8P, 0xFF4093F7);
+ ADD_PALETTE(BASIC::B052L8D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::B052L9, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L9P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B052L9D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::B052L10, 0x00000000);
+ ADD_PALETTE(BASIC::B0531, 0xFF202327);
+ ADD_PALETTE(BASIC::B0532, 0x00000000);
+ ADD_PALETTE(BASIC::B0533, 0x00000000);
+ ADD_PALETTE(BASIC::B0534, 0x00000000);
+ ADD_PALETTE(BASIC::B0535, 0x00000000);
+ ADD_PALETTE(BASIC::B0536, 0x00000000);
+ ADD_PALETTE(BASIC::B0537, 0x00000000);
+ ADD_PALETTE(BASIC::B0541, 0xFFF7F5ED);
+ ADD_PALETTE(BASIC::B0541P, 0xFF007AD8);
+ ADD_PALETTE(BASIC::B0541D, 0x7FF7F5ED);
+ ADD_PALETTE(BASIC::B0542, 0x00000000);
+ ADD_PALETTE(BASIC::B0542P, 0x00000000);
+ ADD_PALETTE(BASIC::B0543, 0x00000000);
+ ADD_PALETTE(BASIC::B0544, 0x00000000);
+ ADD_PALETTE(BASIC::B0545, 0x00000000);
+ ADD_PALETTE(BASIC::B0551, 0x00000000);
+ ADD_PALETTE(BASIC::B0552, 0x00000000);
+ ADD_PALETTE(BASIC::B0553, 0xFF0C0F14);
+ ADD_PALETTE(BASIC::B0554, 0xFF414447);
+ ADD_PALETTE(BASIC::B0555, 0x00000000);
+ ADD_PALETTE(BASIC::B0556, 0x00000000);
+ ADD_PALETTE(BASIC::B0557, 0x00000000);
+ ADD_PALETTE(BASIC::B0558, 0x00000000);
+ ADD_PALETTE(BASIC::B061L1, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B061L2, 0xFFDBD9CE);
+ ADD_PALETTE(BASIC::B061L3, 0xFFD6D3C9);
+ ADD_PALETTE(BASIC::B061L4, 0xFF444444);
+ ADD_PALETTE(BASIC::B061L5, 0xFF222222);
+ ADD_PALETTE(BASIC::B061L6, 0xFF17191C);
+ ADD_PALETTE(BASIC::B0621L1, 0x00000000);
+ ADD_PALETTE(BASIC::B0621L2, 0x00000000);
+ ADD_PALETTE(BASIC::B0622L1, 0x00444444);
+ ADD_PALETTE(BASIC::B0622L2, 0x3FFFFFFF);
+ ADD_PALETTE(BASIC::B0623L1, 0xFF2D2D2D);
+ ADD_PALETTE(BASIC::B0623L2, 0xFF5B5B5B);
+ ADD_PALETTE(BASIC::B0624L1, 0xFFCDCDCD);
+ ADD_PALETTE(BASIC::B0624L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B0624L3, 0xFF303337);
+ ADD_PALETTE(BASIC::B0624L4, 0xFF000000);
+ ADD_PALETTE(BASIC::B0624L5, 0xFF007BDA);
+ ADD_PALETTE(BASIC::B0624L6, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L1, 0xFF000000);
+ ADD_PALETTE(BASIC::B063L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L1D, 0x7F000000);
+ ADD_PALETTE(BASIC::B063L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L3, 0xFF808080);
+ ADD_PALETTE(BASIC::B063L4, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L5, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B063L5D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::B063L6, 0xFF454545);
+ ADD_PALETTE(BASIC::B063L6P, 0xFF454545);
+ ADD_PALETTE(BASIC::B063L6D, 0x7F454545);
+ ADD_PALETTE(BASIC::B063L7, 0xFFBABABA);
+ ADD_PALETTE(BASIC::B063L8, 0xFF808080);
+ ADD_PALETTE(BASIC::B063L8P, 0x00000000);
+ ADD_PALETTE(BASIC::B063L8D, 0x7F808080);
+ ADD_PALETTE(BASIC::B063L9, 0xFF252525);
+ ADD_PALETTE(BASIC::B064L1, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::B064L2, 0xFF808080);
+ ADD_PALETTE(BASIC::B064L2P, 0xFF808080);
+ ADD_PALETTE(BASIC::B064L2D, 0xFF808080);
+ ADD_PALETTE(BASIC::B064L3, 0xFF3A3A3A);
+ ADD_PALETTE(BASIC::B064L3P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B064L3D, 0x7F3A3A3A);
+ ADD_PALETTE(BASIC::B065L1, 0x00000000);
+ ADD_PALETTE(BASIC::B065L2, 0x00000000);
+ ADD_PALETTE(BASIC::B065L3, 0x00000000);
+ ADD_PALETTE(BASIC::B065L3P, 0x00000000);
+ ADD_PALETTE(BASIC::B065L4, 0xFFF7F5ED);
+ ADD_PALETTE(BASIC::B065L4D, 0x7FF7F5ED);
+ ADD_PALETTE(BASIC::B065L4P, 0xFF007AD8);
+ ADD_PALETTE(BASIC::B065L5, 0x00000000);
+ ADD_PALETTE(BASIC::B071, 0xFFC6C4BE);
+ ADD_PALETTE(BASIC::B0721, 0xFFA09F9A);
+ ADD_PALETTE(BASIC::B0722, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::B0723, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::B0724, 0xFFD1CFC9);
+ ADD_PALETTE(BASIC::B0725, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::B0726, 0xFFE2DFD5);
+ ADD_PALETTE(BASIC::B0731, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::B0732, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::B0741, 0xFFA09F9A);
+ ADD_PALETTE(BASIC::B0742, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::B0743, 0xFFE6E3D8);
+ ADD_PALETTE(BASIC::B0744, 0xFFC5C2B7);
+ ADD_PALETTE(BASIC::B0745, 0x00000000);
+ ADD_PALETTE(BASIC::B0751, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::F011L1, 0xFF000000);
+ ADD_PALETTE(BASIC::F011L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F011L1D, 0x7F000000);
+ ADD_PALETTE(BASIC::F011L2, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::F011L2D, 0x7F3B73B6);
+ ADD_PALETTE(BASIC::F011L3, 0xFF4F4F4F);
+ ADD_PALETTE(BASIC::F011L3D, 0xFF4F4F4F);
+ ADD_PALETTE(BASIC::F011L4, 0xFF4F4F4F);
+ ADD_PALETTE(BASIC::F011L4D, 0x7F4F4F4F);
+ ADD_PALETTE(BASIC::F011L5, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::F011L6, 0xFF808080);
+ ADD_PALETTE(BASIC::F011L7, 0xFF686866);
+ ADD_PALETTE(BASIC::F011L7D, 0xCC686866);
+ ADD_PALETTE(BASIC::F011L8, 0xFFC24747);
+ ADD_PALETTE(BASIC::F011L9, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::F011L10, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F011L11, 0xFF808080);
+ ADD_PALETTE(BASIC::F011L12, 0xFF4093F7);
+ ADD_PALETTE(BASIC::F011L13, 0x00000000);
+ ADD_PALETTE(BASIC::F011L14, 0x00000000);
+ ADD_PALETTE(BASIC::F011L15, 0xFFE94949);
+ ADD_PALETTE(BASIC::F011L16, 0xFF8B8B8B);
+ ADD_PALETTE(BASIC::F011L17, 0xFF8B8B8B);
+ ADD_PALETTE(BASIC::F011L18, 0xFF686868);
+ ADD_PALETTE(BASIC::F011L19, 0xFF8B8B8B);
+ ADD_PALETTE(BASIC::F011L20, 0x00000000);
+ ADD_PALETTE(BASIC::F011L21, 0xFF808080);
+ ADD_PALETTE(BASIC::F011L22, 0xFF9A9A9A);
+ ADD_PALETTE(BASIC::F011L23, 0xFF1382FF);
+ ADD_PALETTE(BASIC::F021L1i, 0xFF808080);
+ ADD_PALETTE(BASIC::F021L1iP, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F021L1iD, 0x7F808080);
+ ADD_PALETTE(BASIC::F022L1i, 0xFFB8B8B8);
+ ADD_PALETTE(BASIC::F022L2i, 0xFF4C85C9);
+ ADD_PALETTE(BASIC::F022L2iD, 0x4C4C85C9);
+ ADD_PALETTE(BASIC::F031L1, 0xFF3A3A3A);
+ ADD_PALETTE(BASIC::F031L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L1D, 0x7F3A3A3A);
+ ADD_PALETTE(BASIC::F031L2, 0x00000000);
+ ADD_PALETTE(BASIC::F031L2P, 0x00000000);
+ ADD_PALETTE(BASIC::F031L2D, 0x00000000);
+ ADD_PALETTE(BASIC::F031L3, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L3P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F031L3D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::F032L1, 0xFF656565);
+ ADD_PALETTE(BASIC::F032L1P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L1D, 0x7F656565);
+ ADD_PALETTE(BASIC::F032L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L2P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::F032L2D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::F032L3, 0xFFF9F9F9);
+ ADD_PALETTE(BASIC::F032L3P, 0xFFF9F9F9);
+ ADD_PALETTE(BASIC::F041i, 0xFF808080);
+ ADD_PALETTE(BASIC::F041iD, 0x7F808080);
+ ADD_PALETTE(BASIC::F051, 0xFF90A9C7);
+ ADD_PALETTE(BASIC::F052, 0xFF007BDB);
+ ADD_PALETTE(BASIC::F053, 0xFF808080);
+ ADD_PALETTE(BASIC::F053P, 0xFF000000);
+ ADD_PALETTE(BASIC::F053D, 0x7F808080);
+ ADD_PALETTE(BASIC::F054, 0xFFE3E1D9);
+ ADD_PALETTE(BASIC::F055, 0xFF007BDA);
+ ADD_PALETTE(BASIC::W011, 0xFFF7F5ED);
+ ADD_PALETTE(BASIC::W011D, 0x7FF7F5ED);
+ ADD_PALETTE(BASIC::W012, 0xFF0058D0);
+ ADD_PALETTE(BASIC::W012D, 0x7F0058D0);
+ ADD_PALETTE(BASIC::W012P, 0xFF0051BF);
+ ADD_PALETTE(BASIC::W013, 0x00000000);
+ ADD_PALETTE(BASIC::W0141, 0xFFC12C21);
+ ADD_PALETTE(BASIC::W0141P, 0xFFC12C21);
+ ADD_PALETTE(BASIC::W0141D, 0x7FC12C21);
+ ADD_PALETTE(BASIC::W015, 0xFF343432);
+ ADD_PALETTE(BASIC::W021L1, 0xFFF8F6EF);
+ ADD_PALETTE(BASIC::W021L1P, 0xFF5787C2);
+ ADD_PALETTE(BASIC::W021L2, 0xFF0E68AD);
+ ADD_PALETTE(BASIC::W021L2P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W021L3, 0xFF0E68AD);
+ ADD_PALETTE(BASIC::W021L3P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W021L4, 0xFF000000);
+ ADD_PALETTE(BASIC::W031L1, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W031L1D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::W031L2, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W031L2D, 0x7FFAFAFA);
+ ADD_PALETTE(BASIC::W032, 0xFF878580);
+ ADD_PALETTE(BASIC::W032P, 0xFF000000);
+ ADD_PALETTE(BASIC::W032D, 0x7F878580);
+ ADD_PALETTE(BASIC::W041, 0xFF17191C);
+ ADD_PALETTE(BASIC::W051, 0xFF000000);
+ ADD_PALETTE(BASIC::W0611, 0xFF3B73B6);
+ ADD_PALETTE(BASIC::W0611P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W0611D, 0x7F3B73B6);
+ ADD_PALETTE(BASIC::W062L1, 0xFFC5C5C5);
+ ADD_PALETTE(BASIC::W062L1D, 0x4CC5C5C5);
+ ADD_PALETTE(BASIC::W062L2, 0xFF007DDE);
+ ADD_PALETTE(BASIC::W062L2D, 0x7F007DDE);
+ ADD_PALETTE(BASIC::W062L3, 0xFF615F5B);
+ ADD_PALETTE(BASIC::W062L3D, 0x4C615F5B);
+ ADD_PALETTE(BASIC::W062L4, 0xFF70A9EE);
+ ADD_PALETTE(BASIC::W062L4D, 0x4C70A9EE);
+ ADD_PALETTE(BASIC::W062L5, 0xFF223148);
+ ADD_PALETTE(BASIC::W0631, 0xFF656565);
+ ADD_PALETTE(BASIC::W0632, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W0641, 0xFFF7F5ED);
+ ADD_PALETTE(BASIC::W0641P, 0xFF0079D4);
+ ADD_PALETTE(BASIC::W0641D, 0x7FF7F5ED);
+ ADD_PALETTE(BASIC::W0651, 0xFFBFBFBF);
+ ADD_PALETTE(BASIC::W0711, 0xFF769DCC);
+ ADD_PALETTE(BASIC::W0712, 0x00000000);
+ ADD_PALETTE(BASIC::W0713, 0xFF4093F7);
+ ADD_PALETTE(BASIC::W0714, 0x00000000);
+ ADD_PALETTE(BASIC::W0715, 0xFF2889FF);
+ ADD_PALETTE(BASIC::W0721, 0x00000000);
+ ADD_PALETTE(BASIC::W0811, 0xFF5787C2);
+ ADD_PALETTE(BASIC::W0812, 0x00000000);
+ ADD_PALETTE(BASIC::W0813, 0xFF494949);
+ ADD_PALETTE(BASIC::W082, 0x00000000);
+ ADD_PALETTE(BASIC::W083, 0x00000000);
+ ADD_PALETTE(BASIC::W084, 0xB2FAFAFA);
+ ADD_PALETTE(BASIC::W084P, 0xFFFAFAFA);
+ ADD_PALETTE(BASIC::W085, 0x00000000);
+ ADD_PALETTE(BASIC::W091, 0xFF444444);
+ ADD_PALETTE(BASIC::W092, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::W101, 0xFF5893E4);
+ ADD_PALETTE(BASIC::W111, 0xFFE7E5DE);
+ ADD_PALETTE(BASIC::W112L1, 0xFFB4B4B4);
+ ADD_PALETTE(BASIC::W112L2, 0xFFFFFFFF);
+ ADD_PALETTE(BASIC::W1121, 0xFF000000);
+ ADD_PALETTE(BASIC::W1122, 0xFF000000);
+ ADD_PALETTE(BASIC::W1123, 0x4C000000);
+ ADD_PALETTE(BASIC::W1211, 0x00000000);
+ ADD_PALETTE(BASIC::W1212, 0x00000000);
+ ADD_PALETTE(BASIC::W1221, 0x00000000);
+ ADD_PALETTE(BASIC::W1222, 0x00000000);
+ ADD_PALETTE(BASIC::W1223, 0x00000000);
+ ADD_PALETTE(BASIC::W131, 0xFF959595);
+ ADD_PALETTE(BASIC::W132, 0xFF5787C2);
+ ADD_PALETTE(BASIC::W141, 0xFF808080);
+ ADD_PALETTE(BASIC::W151, 0xFF95948F);
+ ADD_PALETTE(BASIC::W152, 0xFF878787);
+ ADD_PALETTE(BASIC::W153, 0xFF5787C2);
+ ADD_PALETTE(BASIC::W154, 0xFFEFECE0);
+ ADD_PALETTE(BASIC::W161, 0xFF007BDA);
+}
+
+#undef ADD_PALETTE
+
+void
+_ResourceManager::LoadDefaultPalette(void)
+{
+}
+void
_ResourceManager::LoadPaletteInformation(const Tizen::Base::String& systemTheme)
{
if(systemTheme == L"black")
{
- ADD_PALETTE(BASIC::foreground, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::background, 0xFF000000);
- ADD_PALETTE(BASIC::B011, 0xFF000000);
- ADD_PALETTE(BASIC::B012, 0xFF000000);
- ADD_PALETTE(BASIC::B013, 0xFF000000);
- ADD_PALETTE(BASIC::B014, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B015, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B016, 0xFF000000);
- ADD_PALETTE(BASIC::B017, 0xFF000000);
- ADD_PALETTE(BASIC::B018, 0xFF6590FF);
- ADD_PALETTE(BASIC::B0211, 0xFF000000);
- ADD_PALETTE(BASIC::B0211D, 0xFFDBD9D4);
- ADD_PALETTE(BASIC::B0212, 0xFF1C1E28);
- ADD_PALETTE(BASIC::B0213, 0xFF404040);
- ADD_PALETTE(BASIC::B0214, 0xFF222C47);
- ADD_PALETTE(BASIC::B0215, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0216, 0xFF222C47);
- ADD_PALETTE(BASIC::B0217, 0xFF11131B);
- ADD_PALETTE(BASIC::B0217D, 0x7F11131B);
- ADD_PALETTE(BASIC::B0221, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B0222, 0x3FFFFFFF);
- ADD_PALETTE(BASIC::B0223, 0xFF000000);
- ADD_PALETTE(BASIC::B0224, 0xFF27282B);
- ADD_PALETTE(BASIC::B0225, 0xFF2A5181);
- ADD_PALETTE(BASIC::B0226, 0xFF4B73A3);
- ADD_PALETTE(BASIC::B0227, 0xFF000000);
- ADD_PALETTE(BASIC::B0228, 0xFF1A5274);
- ADD_PALETTE(BASIC::B0232, 0x00000000);
- ADD_PALETTE(BASIC::B0233, 0x00000000);
- ADD_PALETTE(BASIC::B031, 0x00000000);
- ADD_PALETTE(BASIC::B041, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::B041P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B042, 0xFF2A39AC);
- ADD_PALETTE(BASIC::B043, 0xFF001BEA);
- ADD_PALETTE(BASIC::B044, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::B0511, 0xFF313F66);
- ADD_PALETTE(BASIC::B0511P, 0xFF2A39AC);
- ADD_PALETTE(BASIC::B0512, 0x00000000);
- ADD_PALETTE(BASIC::B0513, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B0514, 0xFF313F66);
- ADD_PALETTE(BASIC::B0514P1, 0xFF303FB2);
- ADD_PALETTE(BASIC::B0514P2, 0xFF5163E9);
- ADD_PALETTE(BASIC::B0514L2, 0xFF6590FF);
- ADD_PALETTE(BASIC::B0515L1, 0xFF464C5E);
- ADD_PALETTE(BASIC::B0515L2, 0x7F454442);
- ADD_PALETTE(BASIC::B0516, 0x00000000);
- ADD_PALETTE(BASIC::B0517, 0x00000000);
- ADD_PALETTE(BASIC::B0517P1, 0x00000000);
- ADD_PALETTE(BASIC::B0517P2, 0x00000000);
- ADD_PALETTE(BASIC::B0518, 0xFF2E4468);
- ADD_PALETTE(BASIC::B0518P, 0x00000000);
- ADD_PALETTE(BASIC::B0519, 0xFFF25D28);
- ADD_PALETTE(BASIC::B0520, 0xFF2E4468);
- ADD_PALETTE(BASIC::B0520P, 0xFF3C649B);
- ADD_PALETTE(BASIC::B052L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L1P, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B052L1D, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L2, 0x00000000);
- ADD_PALETTE(BASIC::B052L2P, 0x005787B8);
- ADD_PALETTE(BASIC::B052L3, 0x00000000);
- ADD_PALETTE(BASIC::B052L3P, 0x00000000);
- ADD_PALETTE(BASIC::B052L4, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L4P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L4D, 0x66FAFAFA);
- ADD_PALETTE(BASIC::B052L5, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L6P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L7, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L8, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L8P, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B052L8D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B052L9, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L9P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L9D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B052L10, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0531, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B0532, 0x00000000);
- ADD_PALETTE(BASIC::B0533, 0x00000000);
- ADD_PALETTE(BASIC::B0534, 0x00000000);
- ADD_PALETTE(BASIC::B0535, 0x00000000);
- ADD_PALETTE(BASIC::B0536, 0x00000000);
- ADD_PALETTE(BASIC::B0537, 0x00000000);
- ADD_PALETTE(BASIC::B0541, 0xFF6B728A);
- ADD_PALETTE(BASIC::B0541P, 0xFF0D1D96);
- ADD_PALETTE(BASIC::B0541D, 0x7F6B728A);
- ADD_PALETTE(BASIC::B0542, 0x00000000);
- ADD_PALETTE(BASIC::B0542P, 0x00000000);
- ADD_PALETTE(BASIC::B0543, 0x00000000);
- ADD_PALETTE(BASIC::B0544, 0x00000000);
- ADD_PALETTE(BASIC::B0545, 0x00000000);
- ADD_PALETTE(BASIC::B0551, 0x00000000);
- ADD_PALETTE(BASIC::B0552, 0x00000000);
- ADD_PALETTE(BASIC::B0553, 0xFFA5A5A5);
- ADD_PALETTE(BASIC::B0554, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B0555, 0x00000000);
- ADD_PALETTE(BASIC::B0556, 0x00000000);
- ADD_PALETTE(BASIC::B0557, 0x00000000);
- ADD_PALETTE(BASIC::B0558, 0x00000000);
- ADD_PALETTE(BASIC::B061L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B061L2, 0xFF49577B);
- ADD_PALETTE(BASIC::B061L3, 0xFF969A9C);
- ADD_PALETTE(BASIC::B061L4, 0xFF1D263C);
- ADD_PALETTE(BASIC::B061L5, 0xFF222222);
- ADD_PALETTE(BASIC::B061L6, 0xFF333537);
- ADD_PALETTE(BASIC::B0621L1, 0x00000000);
- ADD_PALETTE(BASIC::B0621L2, 0x00000000);
- ADD_PALETTE(BASIC::B0622L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0622L2, 0xFF626675);
- ADD_PALETTE(BASIC::B0623L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0623L2, 0xFF626675);
- ADD_PALETTE(BASIC::B0624L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0624L2, 0xFF626675);
- ADD_PALETTE(BASIC::B0624L3, 0xFF313F66);
- ADD_PALETTE(BASIC::B0624L4, 0xFF000000);
- ADD_PALETTE(BASIC::B0624L5, 0xFF5783FF);
- ADD_PALETTE(BASIC::B0624L6, 0xFF5783FF);
- ADD_PALETTE(BASIC::B063L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L1P, 0x00000000);
- ADD_PALETTE(BASIC::B063L1D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L3, 0xFF6E6F76);
- ADD_PALETTE(BASIC::B063L4, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L5, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L5D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L6P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L6D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L7, 0xFF656565);
- ADD_PALETTE(BASIC::B063L8, 0xFF6E6F76);
- ADD_PALETTE(BASIC::B063L8P, 0x00000000);
- ADD_PALETTE(BASIC::B063L8D, 0x7F6E6F76);
- ADD_PALETTE(BASIC::B063L9, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B064L1, 0xFF6890FF);
- ADD_PALETTE(BASIC::B064L2, 0xFFD7D7D7);
- ADD_PALETTE(BASIC::B064L2P, 0xFFD7D7D7);
- ADD_PALETTE(BASIC::B064L2D, 0xFFD7D7D7);
- ADD_PALETTE(BASIC::B064L3, 0xFF000000);
- ADD_PALETTE(BASIC::B064L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B064L3D, 0x7F000000);
- ADD_PALETTE(BASIC::B065L1, 0x00000000);
- ADD_PALETTE(BASIC::B065L2, 0x00000000);
- ADD_PALETTE(BASIC::B065L3, 0x00000000);
- ADD_PALETTE(BASIC::B065L3P, 0x00000000);
- ADD_PALETTE(BASIC::B065L4, 0xFFEEEEEE);
- ADD_PALETTE(BASIC::B065L4D, 0x99EEEEEE);
- ADD_PALETTE(BASIC::B065L4P, 0xFF2A39AC);
- ADD_PALETTE(BASIC::B065L5, 0x00000000);
- ADD_PALETTE(BASIC::B071, 0xFF393B41);
- ADD_PALETTE(BASIC::B0721, 0xFFA09F9A);
- ADD_PALETTE(BASIC::B0722, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B0723, 0xFF212428);
- ADD_PALETTE(BASIC::B0724, 0xFF404040);
- ADD_PALETTE(BASIC::B0725, 0xFF4F66A7);
- ADD_PALETTE(BASIC::B0726, 0xFF404040);
- ADD_PALETTE(BASIC::B0731, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::B0732, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0741, 0xFFA09F9A);
- ADD_PALETTE(BASIC::B0742, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B0743, 0xFF212428);
- ADD_PALETTE(BASIC::B0744, 0xFF404040);
- ADD_PALETTE(BASIC::B0745, 0x00000000);
- ADD_PALETTE(BASIC::B0751, 0xFF3B73B6);
- ADD_PALETTE(BASIC::F011L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L1D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F011L2, 0xFF6890FF);
- ADD_PALETTE(BASIC::F011L2D, 0x7F6890FF);
- ADD_PALETTE(BASIC::F011L3, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L3D, 0x7F6E6F76);
- ADD_PALETTE(BASIC::F011L4, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L4D, 0x7F6E6F76);
- ADD_PALETTE(BASIC::F011L5, 0xFF5D83FF);
- ADD_PALETTE(BASIC::F011L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L7, 0XFF6E6F76);
- ADD_PALETTE(BASIC::F011L7D, 0X7F6E6F76);
- ADD_PALETTE(BASIC::F011L8, 0xFFD10000);
- ADD_PALETTE(BASIC::F011L9, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::F011L10, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F011L11, 0xFF808080);
- ADD_PALETTE(BASIC::F011L12, 0xFF4093F7);
- ADD_PALETTE(BASIC::F011L13, 0x00000000);
- ADD_PALETTE(BASIC::F011L14, 0x00000000);
- ADD_PALETTE(BASIC::F011L15, 0xFFD10000);
- ADD_PALETTE(BASIC::F011L16, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L17, 0xFF8B8B8B);
- ADD_PALETTE(BASIC::F011L18, 0xFF686868);
- ADD_PALETTE(BASIC::F011L19, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L20, 0x00000000);
- ADD_PALETTE(BASIC::F011L21, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L22, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L23, 0xFF1382FF);
- ADD_PALETTE(BASIC::F021L1i, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F021L1iP, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F021L1iD, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F022L1i, 0xFF6C6E77);
- ADD_PALETTE(BASIC::F022L2i, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::F022L2iD, 0x992D3AAF);
- ADD_PALETTE(BASIC::F031L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L1D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::F031L2, 0x00000000);
- ADD_PALETTE(BASIC::F031L2P, 0x00000000);
- ADD_PALETTE(BASIC::F031L2D, 0x00000000);
- ADD_PALETTE(BASIC::F031L3, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L3D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F032L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L1D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::F032L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L2P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L2D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::F032L3, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F032L3P, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F041i, 0xFF5D6176);
- ADD_PALETTE(BASIC::F041iD, 0x7F5D6176);
- ADD_PALETTE(BASIC::F051, 0xFF485D93);
- ADD_PALETTE(BASIC::F052, 0xFF3A72FF);
- ADD_PALETTE(BASIC::F053, 0xFF485D93);
- ADD_PALETTE(BASIC::F053P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F053D, 0x7F485D93);
- ADD_PALETTE(BASIC::F054, 0xFF202432);
- ADD_PALETTE(BASIC::F055, 0xFF3A72FF);
- ADD_PALETTE(BASIC::W011, 0xFF4B4D56);
- ADD_PALETTE(BASIC::W011D, 0x994B4D56);
- ADD_PALETTE(BASIC::W012, 0xFF095FD4);
- ADD_PALETTE(BASIC::W012D, 0x99095FD4);
- ADD_PALETTE(BASIC::W012P, 0xFF232F91);
- ADD_PALETTE(BASIC::W013, 0x00000000);
- ADD_PALETTE(BASIC::W0141, 0xFFDB0000);
- ADD_PALETTE(BASIC::W0141P, 0xFFA10808);
- ADD_PALETTE(BASIC::W0141D, 0x99DB0000);
- ADD_PALETTE(BASIC::W015, 0xFF343432);
- ADD_PALETTE(BASIC::W021L1, 0xFF000000);
- ADD_PALETTE(BASIC::W021L1P, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W021L2, 0xFF425790);
- ADD_PALETTE(BASIC::W021L2P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W021L3, 0xFF425790);
- ADD_PALETTE(BASIC::W021L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W021L4, 0xFFF0F0F0);
- ADD_PALETTE(BASIC::W031L1, 0xFF000000);
- ADD_PALETTE(BASIC::W031L1D, 0x7F000000);
- ADD_PALETTE(BASIC::W031L2, 0xFF000000);
- ADD_PALETTE(BASIC::W031L2D, 0x7F000000);
- ADD_PALETTE(BASIC::W032, 0xFF5D6176);
- ADD_PALETTE(BASIC::W032P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W032D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::W041, 0xFFE1DDD1);
- ADD_PALETTE(BASIC::W051, 0xFF000000);
- ADD_PALETTE(BASIC::W0611, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W0611P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W0611D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::W062L1, 0xFF555861);
- ADD_PALETTE(BASIC::W062L1D, 0x7F555861);
- ADD_PALETTE(BASIC::W062L2, 0xFF415BFE);
- ADD_PALETTE(BASIC::W062L2D, 0x7F415BFE);
- ADD_PALETTE(BASIC::W062L3, 0xFFD8D7D2);
- ADD_PALETTE(BASIC::W062L3D, 0x4CD8D7D2);
- ADD_PALETTE(BASIC::W062L4, 0xFF3677C3);
- ADD_PALETTE(BASIC::W062L4D, 0x4C3677C3);
- ADD_PALETTE(BASIC::W062L5, 0xFFC7D3E3);
- ADD_PALETTE(BASIC::W0631, 0xFFEEEEEE);
- ADD_PALETTE(BASIC::W0632, 0xFF4C5158);
- ADD_PALETTE(BASIC::W0641, 0xFF6B6D79);
- ADD_PALETTE(BASIC::W0641P, 0xFF2A39AC);
- ADD_PALETTE(BASIC::W0641D, 0x7F6B6D79);
- ADD_PALETTE(BASIC::W0651, 0xFF3A3A3A);
- ADD_PALETTE(BASIC::W0711, 0xFF525767);
- ADD_PALETTE(BASIC::W0712, 0xFF4267A9);
- ADD_PALETTE(BASIC::W0713, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W0714, 0xFF263E5F);
- ADD_PALETTE(BASIC::W0715, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W0721, 0x00000000);
- ADD_PALETTE(BASIC::W0811, 0xFF253296);
- ADD_PALETTE(BASIC::W0812, 0x00000000);
- ADD_PALETTE(BASIC::W0813, 0xFF595959);
- ADD_PALETTE(BASIC::W082, 0x00000000);
- ADD_PALETTE(BASIC::W083, 0x00000000);
- ADD_PALETTE(BASIC::W084, 0xB2FAFAFA);
- ADD_PALETTE(BASIC::W084P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W085, 0x00000000);
- ADD_PALETTE(BASIC::W091, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W092, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W101, 0xFF4884D6);
- ADD_PALETTE(BASIC::W111, 0xFFC8CEDB);
- ADD_PALETTE(BASIC::W112L1, 0xFF8995AE);
- ADD_PALETTE(BASIC::W112L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W1121, 0xFF000000);
- ADD_PALETTE(BASIC::W1122, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W1123, 0x4C000000);
- ADD_PALETTE(BASIC::W1211, 0x00000000);
- ADD_PALETTE(BASIC::W1212, 0x00000000);
- ADD_PALETTE(BASIC::W1221, 0xFF000000);
- ADD_PALETTE(BASIC::W1222, 0xFF878580);
- ADD_PALETTE(BASIC::W1223, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::W131, 0xFF343739);
- ADD_PALETTE(BASIC::W132, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W141, 0xFF6E6F76);
- ADD_PALETTE(BASIC::W151, 0x66000000);
- ADD_PALETTE(BASIC::W152, 0xFF42434B);
- ADD_PALETTE(BASIC::W153, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W154, 0xFF1C1E28);
- ADD_PALETTE(BASIC::W161, 0xFF001BEA);
+ LoadBlackPalette();
}
else if (systemTheme == L"white")
{
- ADD_PALETTE(BASIC::foreground, 0xFF000000);
- ADD_PALETTE(BASIC::background, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B011, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B012, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B013, 0xFF000000);
- ADD_PALETTE(BASIC::B014, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B015, 0xFF202327);
- ADD_PALETTE(BASIC::B016, 0xFF000000);
- ADD_PALETTE(BASIC::B017, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B018, 0xFF6590FF);
- ADD_PALETTE(BASIC::B0211, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B0211D, 0xFF333639);
- ADD_PALETTE(BASIC::B0212, 0xFFEDEBE4);
- ADD_PALETTE(BASIC::B0213, 0xFF5B5656);
- ADD_PALETTE(BASIC::B0214, 0xFFDCDAD3);
- ADD_PALETTE(BASIC::B0215, 0xFFDEDCD5);
- ADD_PALETTE(BASIC::B0216, 0xFFBDBBB5);
- ADD_PALETTE(BASIC::B0217, 0xFFEFEDE5);
- ADD_PALETTE(BASIC::B0217D, 0x7FEFEDE5);
- ADD_PALETTE(BASIC::B0221, 0xFF8A8A8A);
- ADD_PALETTE(BASIC::B0222, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B0223, 0xFFD3D1CB);
- ADD_PALETTE(BASIC::B0224, 0xFFB9B8B2);
- ADD_PALETTE(BASIC::B0225, 0xFF2A5181);
- ADD_PALETTE(BASIC::B0226, 0xFF4B73A3);
- ADD_PALETTE(BASIC::B0227, 0xFF000000);
- ADD_PALETTE(BASIC::B0228, 0xFF1A5274);
- ADD_PALETTE(BASIC::B0232, 0x00000000);
- ADD_PALETTE(BASIC::B0233, 0x00000000);
- ADD_PALETTE(BASIC::B031, 0x00000000);
- ADD_PALETTE(BASIC::B041, 0xFF5787C2);
- ADD_PALETTE(BASIC::B041P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B042, 0xFF0079D4);
- ADD_PALETTE(BASIC::B043, 0xFF5787C2);
- ADD_PALETTE(BASIC::B044, 0xFF2A89C2);
- ADD_PALETTE(BASIC::B0511, 0xFFEDEBE4);
- ADD_PALETTE(BASIC::B0511P, 0xFF0E66AA);
- ADD_PALETTE(BASIC::B0512, 0x00000000);
- ADD_PALETTE(BASIC::B0513, 0xFF202327);
- ADD_PALETTE(BASIC::B0514, 0xFFEDEBE4);
- ADD_PALETTE(BASIC::B0514P1, 0xFF0E66AA);
- ADD_PALETTE(BASIC::B0514P2, 0xFF007BDA);
- ADD_PALETTE(BASIC::B0514L2, 0xFF6590FF);
- ADD_PALETTE(BASIC::B0515L1, 0xFFDEDCD5);
- ADD_PALETTE(BASIC::B0515L2, 0x7F626262);
- ADD_PALETTE(BASIC::B0516, 0x00000000);
- ADD_PALETTE(BASIC::B0517, 0x00000000);
- ADD_PALETTE(BASIC::B0517P1, 0x00000000);
- ADD_PALETTE(BASIC::B0517P2, 0x00000000);
- ADD_PALETTE(BASIC::B0518, 0x003567A3);
- ADD_PALETTE(BASIC::B0518P, 0x00000000);
- ADD_PALETTE(BASIC::B0519, 0xFFF25D28);
- ADD_PALETTE(BASIC::B0520, 0xFF3567A3);
- ADD_PALETTE(BASIC::B0520P, 0xFF2A89C2);
- ADD_PALETTE(BASIC::B052L1, 0xFF656565);
- ADD_PALETTE(BASIC::B052L1P, 0xFF007BDA);
- ADD_PALETTE(BASIC::B052L1D, 0x7F656565);
- ADD_PALETTE(BASIC::B052L2, 0xFF525252);
- ADD_PALETTE(BASIC::B052L2P, 0xFF4093F7);
- ADD_PALETTE(BASIC::B052L3, 0x00000000);
- ADD_PALETTE(BASIC::B052L3P, 0x00000000);
- ADD_PALETTE(BASIC::B052L4, 0xFF3A3A3A);
- ADD_PALETTE(BASIC::B052L4P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L4D, 0x4C3A3A3A);
- ADD_PALETTE(BASIC::B052L5, 0xFF252525);
- ADD_PALETTE(BASIC::B052L6, 0xFF555555);
- ADD_PALETTE(BASIC::B052L6P, 0xFF0E68AD);
- ADD_PALETTE(BASIC::B052L7, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L8, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L8P, 0xFF4093F7);
- ADD_PALETTE(BASIC::B052L8D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B052L9, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L9P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L9D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B052L10, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0531, 0xFF202327);
- ADD_PALETTE(BASIC::B0532, 0x00000000);
- ADD_PALETTE(BASIC::B0533, 0x00000000);
- ADD_PALETTE(BASIC::B0534, 0x00000000);
- ADD_PALETTE(BASIC::B0535, 0x00000000);
- ADD_PALETTE(BASIC::B0536, 0x00000000);
- ADD_PALETTE(BASIC::B0537, 0x00000000);
- ADD_PALETTE(BASIC::B0541, 0xFFF7F5ED);
- ADD_PALETTE(BASIC::B0541P, 0xFF007AD8);
- ADD_PALETTE(BASIC::B0541D, 0x7FF7F5ED);
- ADD_PALETTE(BASIC::B0542, 0x00000000);
- ADD_PALETTE(BASIC::B0542P, 0x00000000);
- ADD_PALETTE(BASIC::B0543, 0x00000000);
- ADD_PALETTE(BASIC::B0544, 0x00000000);
- ADD_PALETTE(BASIC::B0545, 0x00000000);
- ADD_PALETTE(BASIC::B0551, 0x00000000);
- ADD_PALETTE(BASIC::B0552, 0x00000000);
- ADD_PALETTE(BASIC::B0553, 0xFF0C0F14);
- ADD_PALETTE(BASIC::B0554, 0xFF414447);
- ADD_PALETTE(BASIC::B0555, 0x00000000);
- ADD_PALETTE(BASIC::B0556, 0x00000000);
- ADD_PALETTE(BASIC::B0557, 0x00000000);
- ADD_PALETTE(BASIC::B0558, 0x00000000);
- ADD_PALETTE(BASIC::B061L1, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B061L2, 0xFFDBD9CE);
- ADD_PALETTE(BASIC::B061L3, 0xFFD6D3C9);
- ADD_PALETTE(BASIC::B061L4, 0xFF444444);
- ADD_PALETTE(BASIC::B061L5, 0xFF222222);
- ADD_PALETTE(BASIC::B061L6, 0xFF17191C);
- ADD_PALETTE(BASIC::B0621L1, 0x00000000);
- ADD_PALETTE(BASIC::B0621L2, 0x00000000);
- ADD_PALETTE(BASIC::B0622L1, 0xFF2D2D2D);
- ADD_PALETTE(BASIC::B0622L2, 0xFF5B5B5B);
- ADD_PALETTE(BASIC::B0623L1, 0xFF2D2D2D);
- ADD_PALETTE(BASIC::B0623L2, 0xFF5B5B5B);
- ADD_PALETTE(BASIC::B0624L1, 0xFFCDCDCD);
- ADD_PALETTE(BASIC::B0624L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0624L3, 0xFF303337);
- ADD_PALETTE(BASIC::B0624L4, 0xFF000000);
- ADD_PALETTE(BASIC::B0624L5, 0xFF007BDA);
- ADD_PALETTE(BASIC::B0624L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L1, 0xFF000000);
- ADD_PALETTE(BASIC::B063L1P, 0x00000000);
- ADD_PALETTE(BASIC::B063L1D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L3, 0xFF808080);
- ADD_PALETTE(BASIC::B063L4, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L5, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L5D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L6, 0xFF454545);
- ADD_PALETTE(BASIC::B063L6P, 0xFF454545);
- ADD_PALETTE(BASIC::B063L6D, 0x7F454545);
- ADD_PALETTE(BASIC::B063L7, 0xFFBABABA);
- ADD_PALETTE(BASIC::B063L8, 0xFF808080);
- ADD_PALETTE(BASIC::B063L8P, 0x00000000);
- ADD_PALETTE(BASIC::B063L8D, 0x7F808080);
- ADD_PALETTE(BASIC::B063L9, 0xFF252525);
- ADD_PALETTE(BASIC::B064L1, 0xFF3B73B6);
- ADD_PALETTE(BASIC::B064L2, 0xFF808080);
- ADD_PALETTE(BASIC::B064L2P, 0xFF808080);
- ADD_PALETTE(BASIC::B064L2D, 0xFF808080);
- ADD_PALETTE(BASIC::B064L3, 0xFF3A3A3A);
- ADD_PALETTE(BASIC::B064L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B064L3D, 0x7F3A3A3A);
- ADD_PALETTE(BASIC::B065L1, 0x00000000);
- ADD_PALETTE(BASIC::B065L2, 0x00000000);
- ADD_PALETTE(BASIC::B065L3, 0x00000000);
- ADD_PALETTE(BASIC::B065L3P, 0x00000000);
- ADD_PALETTE(BASIC::B065L4, 0xFFF7F5ED);
- ADD_PALETTE(BASIC::B065L4D, 0x7FF7F5ED);
- ADD_PALETTE(BASIC::B065L4P, 0xFF007AD8);
- ADD_PALETTE(BASIC::B065L5, 0x00000000);
- ADD_PALETTE(BASIC::B071, 0xFFC6C4BE);
- ADD_PALETTE(BASIC::B0721, 0xFFA09F9A);
- ADD_PALETTE(BASIC::B0722, 0xFF3B73B6);
- ADD_PALETTE(BASIC::B0723, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B0724, 0xFFD1CFC9);
- ADD_PALETTE(BASIC::B0725, 0xFF3B73B6);
- ADD_PALETTE(BASIC::B0726, 0xFFE2DFD5);
- ADD_PALETTE(BASIC::B0731, 0xFF3B73B6);
- ADD_PALETTE(BASIC::B0732, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0741, 0xFFA09F9A);
- ADD_PALETTE(BASIC::B0742, 0xFF3B73B6);
- ADD_PALETTE(BASIC::B0743, 0xFFE6E3D8);
- ADD_PALETTE(BASIC::B0744, 0xFFC5C2B7);
- ADD_PALETTE(BASIC::B0745, 0x00000000);
- ADD_PALETTE(BASIC::B0751, 0xFF3B73B6);
- ADD_PALETTE(BASIC::F011L1, 0xFF000000);
- ADD_PALETTE(BASIC::F011L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L1D, 0x7F000000);
- ADD_PALETTE(BASIC::F011L2, 0xFF3B73B6);
- ADD_PALETTE(BASIC::F011L2D, 0x7F3B73B6);
- ADD_PALETTE(BASIC::F011L3, 0xFF4F4F4F);
- ADD_PALETTE(BASIC::F011L3D, 0xFF4F4F4F);
- ADD_PALETTE(BASIC::F011L4, 0xFF4F4F4F);
- ADD_PALETTE(BASIC::F011L4D, 0x7F4F4F4F);
- ADD_PALETTE(BASIC::F011L5, 0xFF3B73B6);
- ADD_PALETTE(BASIC::F011L6, 0xFF808080);
- ADD_PALETTE(BASIC::F011L7, 0xFF686866);
- ADD_PALETTE(BASIC::F011L7D, 0xCC686866);
- ADD_PALETTE(BASIC::F011L8, 0xFFC24747);
- ADD_PALETTE(BASIC::F011L9, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::F011L10, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L11, 0xFF808080);
- ADD_PALETTE(BASIC::F011L12, 0xFF4093F7);
- ADD_PALETTE(BASIC::F011L13, 0x00000000);
- ADD_PALETTE(BASIC::F011L14, 0x00000000);
- ADD_PALETTE(BASIC::F011L15, 0xFFE94949);
- ADD_PALETTE(BASIC::F011L16, 0xFF8B8B8B);
- ADD_PALETTE(BASIC::F011L17, 0xFF8B8B8B);
- ADD_PALETTE(BASIC::F011L18, 0xFF686868);
- ADD_PALETTE(BASIC::F011L19, 0xFF8B8B8B);
- ADD_PALETTE(BASIC::F011L20, 0x00000000);
- ADD_PALETTE(BASIC::F011L21, 0xFF808080);
- ADD_PALETTE(BASIC::F011L22, 0xFF9A9A9A);
- ADD_PALETTE(BASIC::F011L23, 0xFF1382FF);
- ADD_PALETTE(BASIC::F021L1i, 0xFF808080);
- ADD_PALETTE(BASIC::F021L1iP, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F021L1iD, 0x7F808080);
- ADD_PALETTE(BASIC::F022L1i, 0xFFB8B8B8);
- ADD_PALETTE(BASIC::F022L2i, 0xFF4C85C9);
- ADD_PALETTE(BASIC::F022L2iD, 0x4C4C85C9);
- ADD_PALETTE(BASIC::F031L1, 0xFF3A3A3A);
- ADD_PALETTE(BASIC::F031L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L1D, 0x7F3A3A3A);
- ADD_PALETTE(BASIC::F031L2, 0x00000000);
- ADD_PALETTE(BASIC::F031L2P, 0x00000000);
- ADD_PALETTE(BASIC::F031L2D, 0x00000000);
- ADD_PALETTE(BASIC::F031L3, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L3D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F032L1, 0xFF656565);
- ADD_PALETTE(BASIC::F032L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L1D, 0x7F656565);
- ADD_PALETTE(BASIC::F032L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L2P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L2D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F032L3, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F032L3P, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F041i, 0xFF808080);
- ADD_PALETTE(BASIC::F041iD, 0x7F808080);
- ADD_PALETTE(BASIC::F051, 0xFF90A9C7);
- ADD_PALETTE(BASIC::F052, 0xFF007BDB);
- ADD_PALETTE(BASIC::F053, 0xFF808080);
- ADD_PALETTE(BASIC::F053P, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::F053D, 0x7F808080);
- ADD_PALETTE(BASIC::F054, 0xFFE3E1D9);
- ADD_PALETTE(BASIC::F055, 0xFF007BDA);
- ADD_PALETTE(BASIC::W011, 0xFFF7F5ED);
- ADD_PALETTE(BASIC::W011D, 0x7FF7F5ED);
- ADD_PALETTE(BASIC::W012, 0xFF0058D0);
- ADD_PALETTE(BASIC::W012D, 0x7F0058D0);
- ADD_PALETTE(BASIC::W012P, 0xFF0051BF);
- ADD_PALETTE(BASIC::W013, 0x00000000);
- ADD_PALETTE(BASIC::W0141, 0xFFC12C21);
- ADD_PALETTE(BASIC::W0141P, 0xFFC12C21);
- ADD_PALETTE(BASIC::W0141D, 0x7FC12C21);
- ADD_PALETTE(BASIC::W015, 0xFF343432);
- ADD_PALETTE(BASIC::W021L1, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::W021L1P, 0xFF5787C2);
- ADD_PALETTE(BASIC::W021L2, 0xFF0E68AD);
- ADD_PALETTE(BASIC::W021L2P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W021L3, 0xFF0E68AD);
- ADD_PALETTE(BASIC::W021L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W021L4, 0xFF000000);
- ADD_PALETTE(BASIC::W031L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W031L1D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::W031L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W031L2D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::W032, 0xFF878580);
- ADD_PALETTE(BASIC::W032P, 0xFF000000);
- ADD_PALETTE(BASIC::W032D, 0x7F878580);
- ADD_PALETTE(BASIC::W041, 0xFF17191C);
- ADD_PALETTE(BASIC::W051, 0xFF000000);
- ADD_PALETTE(BASIC::W0611, 0xFF3B73B6);
- ADD_PALETTE(BASIC::W0611P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W0611D, 0x7F3B73B6);
- ADD_PALETTE(BASIC::W062L1, 0xFFC5C5C5);
- ADD_PALETTE(BASIC::W062L1D, 0x4CC5C5C5);
- ADD_PALETTE(BASIC::W062L2, 0xFF007DDE);
- ADD_PALETTE(BASIC::W062L2D, 0x7F007DDE);
- ADD_PALETTE(BASIC::W062L3, 0xFF615F5B);
- ADD_PALETTE(BASIC::W062L3D, 0x4C615F5B);
- ADD_PALETTE(BASIC::W062L4, 0xFF70A9EE);
- ADD_PALETTE(BASIC::W062L4D, 0x4C70A9EE);
- ADD_PALETTE(BASIC::W062L5, 0xFF223148);
- ADD_PALETTE(BASIC::W0631, 0xFF656565);
- ADD_PALETTE(BASIC::W0632, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W0641, 0xFFF7F5ED);
- ADD_PALETTE(BASIC::W0641P, 0xFF0079D4);
- ADD_PALETTE(BASIC::W0641D, 0x7FF7F5ED);
- ADD_PALETTE(BASIC::W0651, 0xFFBFBFBF);
- ADD_PALETTE(BASIC::W0711, 0xFF769DCC);
- ADD_PALETTE(BASIC::W0712, 0x00000000);
- ADD_PALETTE(BASIC::W0713, 0xFF4093F7);
- ADD_PALETTE(BASIC::W0714, 0x00000000);
- ADD_PALETTE(BASIC::W0715, 0xFF2889FF);
- ADD_PALETTE(BASIC::W0721, 0x00000000);
- ADD_PALETTE(BASIC::W0811, 0xFF5787C2);
- ADD_PALETTE(BASIC::W0812, 0x00000000);
- ADD_PALETTE(BASIC::W0813, 0xFF494949);
- ADD_PALETTE(BASIC::W082, 0x00000000);
- ADD_PALETTE(BASIC::W083, 0x00000000);
- ADD_PALETTE(BASIC::W084, 0xB2FAFAFA);
- ADD_PALETTE(BASIC::W084P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W085, 0x00000000);
- ADD_PALETTE(BASIC::W091, 0xFF444444);
- ADD_PALETTE(BASIC::W092, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::W101, 0xFF5893E4);
- ADD_PALETTE(BASIC::W111, 0xFFE7E5DE);
- ADD_PALETTE(BASIC::W112L1, 0xFFB4B4B4);
- ADD_PALETTE(BASIC::W112L2, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::W1121, 0xFF000000);
- ADD_PALETTE(BASIC::W1122, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::W1123, 0x4C000000);
- ADD_PALETTE(BASIC::W1211, 0x00000000);
- ADD_PALETTE(BASIC::W1212, 0x00000000);
- ADD_PALETTE(BASIC::W1221, 0x00000000);
- ADD_PALETTE(BASIC::W1222, 0x00000000);
- ADD_PALETTE(BASIC::W1223, 0x00000000);
- ADD_PALETTE(BASIC::W131, 0xFF959595);
- ADD_PALETTE(BASIC::W132, 0xFF5787C2);
- ADD_PALETTE(BASIC::W141, 0xFF808080);
- ADD_PALETTE(BASIC::W151, 0xFF95948F);
- ADD_PALETTE(BASIC::W152, 0xFF878787);
- ADD_PALETTE(BASIC::W153, 0xFF5787C2);
- ADD_PALETTE(BASIC::W154, 0xFFEFECE0);
- ADD_PALETTE(BASIC::W161, 0xFF007BDA);
+ LoadWhitePalette();
}
else if (systemTheme == L"default")
{
- ADD_PALETTE(BASIC::foreground, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::background, 0xFF000000);
- ADD_PALETTE(BASIC::B011, 0xFF000000);
- ADD_PALETTE(BASIC::B012, 0xFF000000);
- ADD_PALETTE(BASIC::B013, 0xFF000000);
- ADD_PALETTE(BASIC::B014, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B015, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B016, 0xFF000000);
- ADD_PALETTE(BASIC::B017, 0xFF000000);
- ADD_PALETTE(BASIC::B018, 0xFF6590FF);
- ADD_PALETTE(BASIC::B0211, 0xFF000000);
- ADD_PALETTE(BASIC::B0211D, 0xFFDBD9D4);
- ADD_PALETTE(BASIC::B0212, 0xFF1C1E28);
- ADD_PALETTE(BASIC::B0213, 0xFF404040);
- ADD_PALETTE(BASIC::B0214, 0xFF222C47);
- ADD_PALETTE(BASIC::B0215, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0216, 0xFF222C47);
- ADD_PALETTE(BASIC::B0217, 0xFF11131B);
- ADD_PALETTE(BASIC::B0217D, 0x7F11131B);
- ADD_PALETTE(BASIC::B0221, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B0222, 0x3FFFFFFF);
- ADD_PALETTE(BASIC::B0223, 0xFF000000);
- ADD_PALETTE(BASIC::B0224, 0xFF27282B);
- ADD_PALETTE(BASIC::B0225, 0xFF2A5181);
- ADD_PALETTE(BASIC::B0226, 0xFF4B73A3);
- ADD_PALETTE(BASIC::B0227, 0xFF000000);
- ADD_PALETTE(BASIC::B0228, 0xFF1A5274);
- ADD_PALETTE(BASIC::B0232, 0x00000000);
- ADD_PALETTE(BASIC::B0233, 0x00000000);
- ADD_PALETTE(BASIC::B031, 0x00000000);
- ADD_PALETTE(BASIC::B041, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::B041P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B042, 0xFF2A39AC);
- ADD_PALETTE(BASIC::B043, 0xFF001BEA);
- ADD_PALETTE(BASIC::B044, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::B0511, 0xFF313F66);
- ADD_PALETTE(BASIC::B0511P, 0xFF2A39AC);
- ADD_PALETTE(BASIC::B0512, 0x00000000);
- ADD_PALETTE(BASIC::B0513, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B0514, 0xFF313F66);
- ADD_PALETTE(BASIC::B0514P1, 0xFF303FB2);
- ADD_PALETTE(BASIC::B0514P2, 0xFF5163E9);
- ADD_PALETTE(BASIC::B0514L2, 0xFF6590FF);
- ADD_PALETTE(BASIC::B0515L1, 0xFF464C5E);
- ADD_PALETTE(BASIC::B0515L2, 0x7F454442);
- ADD_PALETTE(BASIC::B0516, 0x00000000);
- ADD_PALETTE(BASIC::B0517, 0x00000000);
- ADD_PALETTE(BASIC::B0517P1, 0x00000000);
- ADD_PALETTE(BASIC::B0517P2, 0x00000000);
- ADD_PALETTE(BASIC::B0518, 0xFF2E4468);
- ADD_PALETTE(BASIC::B0518P, 0x00000000);
- ADD_PALETTE(BASIC::B0519, 0xFFF25D28);
- ADD_PALETTE(BASIC::B0520, 0xFF2E4468);
- ADD_PALETTE(BASIC::B0520P, 0xFF3C649B);
- ADD_PALETTE(BASIC::B052L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L1P, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B052L1D, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L2, 0x00000000);
- ADD_PALETTE(BASIC::B052L2P, 0x005787B8);
- ADD_PALETTE(BASIC::B052L3, 0x00000000);
- ADD_PALETTE(BASIC::B052L3P, 0x00000000);
- ADD_PALETTE(BASIC::B052L4, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L4P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L4D, 0x66FAFAFA);
- ADD_PALETTE(BASIC::B052L5, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L6P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L7, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L8, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L8P, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B052L8D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B052L9, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L9P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B052L9D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B052L10, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0531, 0xFFF8F6EF);
- ADD_PALETTE(BASIC::B0532, 0x00000000);
- ADD_PALETTE(BASIC::B0533, 0x00000000);
- ADD_PALETTE(BASIC::B0534, 0x00000000);
- ADD_PALETTE(BASIC::B0535, 0x00000000);
- ADD_PALETTE(BASIC::B0536, 0x00000000);
- ADD_PALETTE(BASIC::B0537, 0x00000000);
- ADD_PALETTE(BASIC::B0541, 0xFF6B728A);
- ADD_PALETTE(BASIC::B0541P, 0xFF0D1D96);
- ADD_PALETTE(BASIC::B0541D, 0x7F6B728A);
- ADD_PALETTE(BASIC::B0542, 0x00000000);
- ADD_PALETTE(BASIC::B0542P, 0x00000000);
- ADD_PALETTE(BASIC::B0543, 0x00000000);
- ADD_PALETTE(BASIC::B0544, 0x00000000);
- ADD_PALETTE(BASIC::B0545, 0x00000000);
- ADD_PALETTE(BASIC::B0551, 0x00000000);
- ADD_PALETTE(BASIC::B0552, 0x00000000);
- ADD_PALETTE(BASIC::B0553, 0xFFA5A5A5);
- ADD_PALETTE(BASIC::B0554, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::B0555, 0x00000000);
- ADD_PALETTE(BASIC::B0556, 0x00000000);
- ADD_PALETTE(BASIC::B0557, 0x00000000);
- ADD_PALETTE(BASIC::B0558, 0x00000000);
- ADD_PALETTE(BASIC::B061L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B061L2, 0xFF49577B);
- ADD_PALETTE(BASIC::B061L3, 0xFF969A9C);
- ADD_PALETTE(BASIC::B061L4, 0xFF1D263C);
- ADD_PALETTE(BASIC::B061L5, 0xFF222222);
- ADD_PALETTE(BASIC::B061L6, 0xFF333537);
- ADD_PALETTE(BASIC::B0621L1, 0x00000000);
- ADD_PALETTE(BASIC::B0621L2, 0x00000000);
- ADD_PALETTE(BASIC::B0622L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0622L2, 0xFF626675);
- ADD_PALETTE(BASIC::B0623L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0623L2, 0xFF626675);
- ADD_PALETTE(BASIC::B0624L1, 0xFF1D263C);
- ADD_PALETTE(BASIC::B0624L2, 0xFF626675);
- ADD_PALETTE(BASIC::B0624L3, 0xFF313F66);
- ADD_PALETTE(BASIC::B0624L4, 0xFF000000);
- ADD_PALETTE(BASIC::B0624L5, 0xFF5783FF);
- ADD_PALETTE(BASIC::B0624L6, 0xFF5783FF);
- ADD_PALETTE(BASIC::B063L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L1P, 0x00000000);
- ADD_PALETTE(BASIC::B063L1D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L3, 0xFF6E6F76);
- ADD_PALETTE(BASIC::B063L4, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L5, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L5D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L6P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B063L6D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::B063L7, 0xFF656565);
- ADD_PALETTE(BASIC::B063L8, 0xFF6E6F76);
- ADD_PALETTE(BASIC::B063L8P, 0x00000000);
- ADD_PALETTE(BASIC::B063L8D, 0x7F6E6F76);
- ADD_PALETTE(BASIC::B063L9, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B064L1, 0xFF6890FF);
- ADD_PALETTE(BASIC::B064L2, 0xFFD7D7D7);
- ADD_PALETTE(BASIC::B064L2P, 0xFFD7D7D7);
- ADD_PALETTE(BASIC::B064L2D, 0xFFD7D7D7);
- ADD_PALETTE(BASIC::B064L3, 0xFF000000);
- ADD_PALETTE(BASIC::B064L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B064L3D, 0x7F000000);
- ADD_PALETTE(BASIC::B065L1, 0x00000000);
- ADD_PALETTE(BASIC::B065L2, 0x00000000);
- ADD_PALETTE(BASIC::B065L3, 0x00000000);
- ADD_PALETTE(BASIC::B065L3P, 0x00000000);
- ADD_PALETTE(BASIC::B065L4, 0xFFEEEEEE);
- ADD_PALETTE(BASIC::B065L4D, 0x99EEEEEE);
- ADD_PALETTE(BASIC::B065L4P, 0xFF2A39AC);
- ADD_PALETTE(BASIC::B065L5, 0x00000000);
- ADD_PALETTE(BASIC::B071, 0xFF393B41);
- ADD_PALETTE(BASIC::B0721, 0xFFA09F9A);
- ADD_PALETTE(BASIC::B0722, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B0723, 0xFF212428);
- ADD_PALETTE(BASIC::B0724, 0xFF404040);
- ADD_PALETTE(BASIC::B0725, 0xFF4F66A7);
- ADD_PALETTE(BASIC::B0726, 0xFF404040);
- ADD_PALETTE(BASIC::B0731, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::B0732, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::B0741, 0xFFA09F9A);
- ADD_PALETTE(BASIC::B0742, 0xFF5D83FF);
- ADD_PALETTE(BASIC::B0743, 0xFF212428);
- ADD_PALETTE(BASIC::B0744, 0xFF404040);
- ADD_PALETTE(BASIC::B0745, 0x00000000);
- ADD_PALETTE(BASIC::B0751, 0xFF3B73B6);
- ADD_PALETTE(BASIC::F011L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L1D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F011L2, 0xFF6890FF);
- ADD_PALETTE(BASIC::F011L2D, 0x7F6890FF);
- ADD_PALETTE(BASIC::F011L3, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L3D, 0x7F6E6F76);
- ADD_PALETTE(BASIC::F011L4, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L4D, 0x7F6E6F76);
- ADD_PALETTE(BASIC::F011L5, 0xFF5D83FF);
- ADD_PALETTE(BASIC::F011L6, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F011L7, 0XFF6E6F76);
- ADD_PALETTE(BASIC::F011L7D, 0X7F6E6F76);
- ADD_PALETTE(BASIC::F011L8, 0xFFD10000);
- ADD_PALETTE(BASIC::F011L9, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::F011L10, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F011L11, 0xFF808080);
- ADD_PALETTE(BASIC::F011L12, 0xFF4093F7);
- ADD_PALETTE(BASIC::F011L13, 0x00000000);
- ADD_PALETTE(BASIC::F011L14, 0x00000000);
- ADD_PALETTE(BASIC::F011L15, 0xFFD10000);
- ADD_PALETTE(BASIC::F011L16, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L17, 0xFF8B8B8B);
- ADD_PALETTE(BASIC::F011L18, 0xFF686868);
- ADD_PALETTE(BASIC::F011L19, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L20, 0x00000000);
- ADD_PALETTE(BASIC::F011L21, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L22, 0xFF6E6F76);
- ADD_PALETTE(BASIC::F011L23, 0xFF1382FF);
- ADD_PALETTE(BASIC::F021L1i, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F021L1iP, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F021L1iD, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F022L1i, 0xFF6C6E77);
- ADD_PALETTE(BASIC::F022L2i, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::F022L2iD, 0x992D3AAF);
- ADD_PALETTE(BASIC::F031L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L1D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::F031L2, 0x00000000);
- ADD_PALETTE(BASIC::F031L2P, 0x00000000);
- ADD_PALETTE(BASIC::F031L2D, 0x00000000);
- ADD_PALETTE(BASIC::F031L3, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F031L3D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::F032L1, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L1P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L1D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::F032L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L2P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F032L2D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::F032L3, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F032L3P, 0xFFF9F9F9);
- ADD_PALETTE(BASIC::F041i, 0xFF5D6176);
- ADD_PALETTE(BASIC::F041iD, 0x7F5D6176);
- ADD_PALETTE(BASIC::F051, 0xFF485D93);
- ADD_PALETTE(BASIC::F052, 0xFF3A72FF);
- ADD_PALETTE(BASIC::F053, 0xFF485D93);
- ADD_PALETTE(BASIC::F053P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::F053D, 0x7F485D93);
- ADD_PALETTE(BASIC::F054, 0xFF202432);
- ADD_PALETTE(BASIC::F055, 0xFF3A72FF);
- ADD_PALETTE(BASIC::W011, 0xFF4B4D56);
- ADD_PALETTE(BASIC::W011D, 0x994B4D56);
- ADD_PALETTE(BASIC::W012, 0xFF095FD4);
- ADD_PALETTE(BASIC::W012D, 0x99095FD4);
- ADD_PALETTE(BASIC::W012P, 0xFF232F91);
- ADD_PALETTE(BASIC::W013, 0x00000000);
- ADD_PALETTE(BASIC::W0141, 0xFFDB0000);
- ADD_PALETTE(BASIC::W0141P, 0xFFA10808);
- ADD_PALETTE(BASIC::W0141D, 0x99DB0000);
- ADD_PALETTE(BASIC::W015, 0xFF343432);
- ADD_PALETTE(BASIC::W021L1, 0xFF000000);
- ADD_PALETTE(BASIC::W021L1P, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W021L2, 0xFF425790);
- ADD_PALETTE(BASIC::W021L2P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W021L3, 0xFF425790);
- ADD_PALETTE(BASIC::W021L3P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W021L4, 0xFFF0F0F0);
- ADD_PALETTE(BASIC::W031L1, 0xFF000000);
- ADD_PALETTE(BASIC::W031L1D, 0x7F000000);
- ADD_PALETTE(BASIC::W031L2, 0xFF000000);
- ADD_PALETTE(BASIC::W031L2D, 0x7F000000);
- ADD_PALETTE(BASIC::W032, 0xFF5D6176);
- ADD_PALETTE(BASIC::W032P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W032D, 0x7FFAFAFA);
- ADD_PALETTE(BASIC::W041, 0xFFE1DDD1);
- ADD_PALETTE(BASIC::W051, 0xFF000000);
- ADD_PALETTE(BASIC::W0611, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W0611P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W0611D, 0x99FAFAFA);
- ADD_PALETTE(BASIC::W062L1, 0xFF555861);
- ADD_PALETTE(BASIC::W062L1D, 0x7F555861);
- ADD_PALETTE(BASIC::W062L2, 0xFF415BFE);
- ADD_PALETTE(BASIC::W062L2D, 0x7F415BFE);
- ADD_PALETTE(BASIC::W062L3, 0xFFD8D7D2);
- ADD_PALETTE(BASIC::W062L3D, 0x4CD8D7D2);
- ADD_PALETTE(BASIC::W062L4, 0xFF3677C3);
- ADD_PALETTE(BASIC::W062L4D, 0x4C3677C3);
- ADD_PALETTE(BASIC::W062L5, 0xFFC7D3E3);
- ADD_PALETTE(BASIC::W0631, 0xFFEEEEEE);
- ADD_PALETTE(BASIC::W0632, 0xFF4C5158);
- ADD_PALETTE(BASIC::W0641, 0xFF6B6D79);
- ADD_PALETTE(BASIC::W0641P, 0xFF2A39AC);
- ADD_PALETTE(BASIC::W0641D, 0x7F6B6D79);
- ADD_PALETTE(BASIC::W0651, 0xFF3A3A3A);
- ADD_PALETTE(BASIC::W0711, 0xFF525767);
- ADD_PALETTE(BASIC::W0712, 0xFF4267A9);
- ADD_PALETTE(BASIC::W0713, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W0714, 0xFF263E5F);
- ADD_PALETTE(BASIC::W0715, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W0721, 0x00000000);
- ADD_PALETTE(BASIC::W0811, 0xFF253296);
- ADD_PALETTE(BASIC::W0812, 0x00000000);
- ADD_PALETTE(BASIC::W0813, 0xFF595959);
- ADD_PALETTE(BASIC::W082, 0x00000000);
- ADD_PALETTE(BASIC::W083, 0x00000000);
- ADD_PALETTE(BASIC::W084, 0xB2FAFAFA);
- ADD_PALETTE(BASIC::W084P, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W085, 0x00000000);
- ADD_PALETTE(BASIC::W091, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W092, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W101, 0xFF4884D6);
- ADD_PALETTE(BASIC::W111, 0xFFC8CEDB);
- ADD_PALETTE(BASIC::W112L1, 0xFF8995AE);
- ADD_PALETTE(BASIC::W112L2, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W1121, 0xFF000000);
- ADD_PALETTE(BASIC::W1122, 0xFFFAFAFA);
- ADD_PALETTE(BASIC::W1123, 0x4C000000);
- ADD_PALETTE(BASIC::W1211, 0x00000000);
- ADD_PALETTE(BASIC::W1212, 0x00000000);
- ADD_PALETTE(BASIC::W1221, 0xFF000000);
- ADD_PALETTE(BASIC::W1222, 0xFF878580);
- ADD_PALETTE(BASIC::W1223, 0xFFFFFFFF);
- ADD_PALETTE(BASIC::W131, 0xFF343739);
- ADD_PALETTE(BASIC::W132, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W141, 0xFF6E6F76);
- ADD_PALETTE(BASIC::W151, 0x66000000);
- ADD_PALETTE(BASIC::W152, 0xFF42434B);
- ADD_PALETTE(BASIC::W153, 0xFF2B3AAF);
- ADD_PALETTE(BASIC::W154, 0xFF1C1E28);
- ADD_PALETTE(BASIC::W161, 0xFF001BEA);
+ LoadBlackPalette();
}
else
{
}
}
-#undef ADD_PALETTE
-
result
_ResourceManager::LoadThemeInformation(String& systemTheme, String& userTheme)
{
delete pFingerList;
}
- SysTryReturnResult(NID_UI, pFingerInfo, E_INVALID_CONDITION, "[E_INVALID_CONDITION] pFingerInfo is null");
+ if (pFingerInfo == null)
+ {
+ SysLog(NID_UI, "Failed to SetFingerInfo, pFingerInfo is null");
+ return E_INVALID_CONDITION;
+ }
switch (status)
{
_TouchManager* pTouchManager = _TouchManager::GetInstance();
SysTryReturnVoidResult(NID_UI, pTouchManager, E_SYSTEM, "[E_SYSTEM] _TouchManager does not exist.");
- result r = pTouchManager->AddPoint(touchInfo.GetPointId(), currentPoint, _TOUCH_CANCELED);
- SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] System error occurred.");
+ pTouchManager->AddPoint(touchInfo.GetPointId(), currentPoint, _TOUCH_CANCELED);
+ SysLog(NID_UI, "SendTouchCancelEvent");
pEventManager->SendEvent(event);
IListT<_FingerInfo*>* pFingerInfoList = pTouchManager->GetMultiFingerInfoListN();
}
}
+ FloatDimension textSize(0.0f, 0.0f);
FloatDimension dimension(0.0f, 0.0f);
FloatRectangle contentRect(0.0f, 0.0f, 0.0f, 0.0f);
TextObject* pTextObject = __pButtonPresenter->GetTextObject();
- Font* pFont = __pButtonPresenter->GetFont();
- TextObjectActionType previousActionType = pTextObject->GetAction();
- TextObjectWrapType previousWrapType = pTextObject->GetWrap();
FloatRectangle previousRect = pTextObject->GetBoundsF();
- pTextObject->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width - __leftMargin * 2, GetBoundsF().height - __topMargin * 2));
- pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
- pTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_WORD);
- pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
- pTextObject->Compose();
+ dimension.width = GetBoundsF().width - __leftMargin * 2;
+ dimension.height = GetBoundsF().height - __topMargin * 2;
_ControlOrientation orientation = GetOrientation();
if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
{
contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width;
+ contentRect.height = _ControlManager::GetInstance()->GetScreenSizeF().height;
}
else
{
contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().height;
+ contentRect.height = _ControlManager::GetInstance()->GetScreenSizeF().width;
}
if (horizontalMode == true)
{
- dimension = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength());
-
- if (dimension.width > contentRect.width - GetBoundsF().x - __leftMargin * 2)
- {
- dimension.width = contentRect.width - GetBoundsF().x - __leftMargin * 2;
+ FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - __leftMargin, dimension.height);
+ pTextObject->SetBounds(bounds);
+ pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+ pTextObject->Compose();
- pTextObject->SetBounds(FloatRectangle(previousRect.x, previousRect.y, dimension.width, previousRect.height));
- pTextObject->Compose();
+ textSize = pTextObject->GetTextExtentF();
- dimension.height = pTextObject->GetTotalHeightF();
- }
+ dimension.width = (textSize.width < bounds.width) ? textSize.width : bounds.width;
}
if (verticalMode == true)
{
- dimension = pTextObject->GetTextExtentF();
-
- if (dimension.width > GetBoundsF().width - __leftMargin * 2)
- {
- dimension.width = GetBoundsF().width - __leftMargin * 2;
+ FloatRectangle bounds(0.0f, 0.0f, dimension.width, dimension.height);
+ pTextObject->SetBounds(bounds);
+ pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+ pTextObject->Compose();
- pTextObject->SetBounds(FloatRectangle(previousRect.x, previousRect.y, dimension.width, previousRect.height));
- pTextObject->Compose();
+ textSize = pTextObject->GetTextExtentF();
- dimension.height = pTextObject->GetTotalHeightF();
- }
+ dimension.height = textSize.height;
}
pTextObject->SetBounds(previousRect);
- pTextObject->SetAction(previousActionType);
- pTextObject->SetWrap(previousWrapType);
- pTextObject->Compose();
dimension.width += __leftMargin * 4 - __leftTouchMargin - __rightTouchMargin;
dimension.height += __topMargin * 4 - __topTouchMargin - __bottomTouchMargin;
}
else // nobody set bitmap (default bitmap draw) // if (__pButton->IsUserBackgroundBitmap(status))
{
+ __pBase->SetImageSource(L"");
+
+ __lazyDecode = false;
+
pCanvas = __pButton->GetCanvasN();
if (pCanvas == null)
{
{
int count = __actionId.GetCount();
int actionId = -1;
+ result r = E_SUCCESS;
if (count <= 0 || index >= count)
{
return -1;
}
- __actionId.GetAt(index, actionId);
+ r = __actionId.GetAt(index, actionId);
+ SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, actionId, r, "[%s] Propagating.", GetErrorMessage(r));
return actionId;
}
FloatDimension itemSize(0.0f, 0.0f);
__pFont->GetTextExtent(text, text.GetLength(), textArea);
- float labelLeftMargin = 0.0f, labelTopMargin = 0.0f;
- GET_SHAPE_CONFIG(LABEL::LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, labelLeftMargin);
+ float labelTopMargin = 0.0f;
+ float iconGap = 0.0f;
+ float textGap = 0.0f;
+ float textLabelX = 0.0f;
GET_SHAPE_CONFIG(LABEL::TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, labelTopMargin);
- textArea.width += 2.0f * labelLeftMargin;
+ GET_SHAPE_CONFIG(CONTEXTMENU::LIST_TEXT_GAP, _CONTROL_ORIENTATION_PORTRAIT, textGap);
+ iconGap = __itemGap;
+
+ if (itemType == CONTEXT_MENU_ITEM_DRAWING_TYPE_BITMAP)
+ {
+ textArea.width += 2.0 * iconGap;
+ itemSize.width = textArea.width + bitmapWidth + textGap;
+ textLabelX = iconGap + bitmapWidth;
+ }
+ else
+ {
+ textArea.width += 2.0f * textGap;
+ itemSize.width = textArea.width;
+ }
+
textArea.height += 2.0f * labelTopMargin;
itemSize.height = __itemHeight + (__dividerHeight * 2.0f);
- itemSize.width = __leftMargin + textArea.width + __rightMargin + bitmapWidth;
itemSize.width = itemSize.width < __itemMinWidth ? __itemMinWidth : itemSize.width;
pItem->SetSize(itemSize);
// add text label
- float textLabelX = __leftMargin + bitmapWidth;
pLabel = _Label::CreateLabelN();
pLabel->SetText(text);
itemSize = pItem->GetSize();
pLabel->SetBounds(FloatRectangle(textLabelX, (itemSize.height - textArea.height) / 2.0f, textArea.width, textArea.height));
pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
- pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+ pLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
pLabel->SetTextConfig(__itemFontSize, LABEL_TEXT_STYLE_NORMAL);
pLabel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
for(int index = 0; index < count; index++)
{
pItem = static_cast <_ContextMenuItem*>(__items.GetAt(index));
- pItem->SetAndInvalidate(false);
+ if (pItem)
+ {
+ pItem->SetAndInvalidate(false);
+ }
}
}
, __isFocused(false)
, __focusedIndex(-1)
, __focusBounds(FloatRectangle())
+ , __isFlickCanceled(false)
{
}
if (__isFlickInProgress)
{
ResetFlickAnimationTimer();
+ __isFlickCanceled = true;
}
__touchMoveHandled = false;
int index = GetItemIndexFromPosition(touchinfo.GetCurrentPosition());
bool isEventFire = true;
- if (index != -1 && __isTouchMoved == false && __isFlickInProgress == false)
+ if (index != -1 && !__isTouchMoved && !__isFlickInProgress && !__isFlickCanceled)
{
PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pDateTimeBar);
SetItemStatus(index, DATETIMEBAR_ITEM_STATUS_SELECTED);
else
{
isEventFire = false;
+ __isFlickCanceled = false;
}
__isTouchMoved = false;
_DateTimeBarPresenter::StartFlickAnimationTimer(void)
{
result r = E_SUCCESS;
+ __isFlickInProgress = true;
if (__pFlickAnimationTimer == null)
{
InitializeColorInformation();
+ __inputStyle = inputStyle;
+
r = _pEditPresenter->Initialize(*this);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Failed to construct", GetErrorMessage(r));
r = _pEditPresenter->SetTextLimitLength(limitLength);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Failed to set limit length", GetErrorMessage(r));
- __inputStyle = inputStyle;
if (inputStyle == INPUT_STYLE_OVERLAY)
{
if (!(editStyle & EDIT_STYLE_FLEXIBLE) && !(editStyle & EDIT_STYLE_VIEWER))
if (!enableState)
{
_pEditPresenter->ChangeToUnbindState();
- __internalFocus = false;
}
Invalidate();
if (!visibleState)
{
_pEditPresenter->ChangeToUnbindState();
- __internalFocus = false;
}
Invalidate();
Variant
_Edit::GetPropertyViewModeEnabled(void) const
{
- return Variant(_pEditPresenter->IsViewModeEnabled());
+ return Variant(_pEditPresenter->IsViewModeEnabled(false));
}
result
_ControlOrientation orientation = pEdit->GetOrientation();
FloatRectangle rect = GetBoundsF();
FloatRectangle cursorAbsBounds = __pCopyPasteManager->GetCursorBoundsF(true);
+ float clipboardHeight = 0.0f;
+ FloatRectangle keypadBounds(0.0f, 0.0f, 0.0f, 0.0f);
+ float adjustHeight = 0.0f;
+
+ _EditPresenter* pEditPresenter = pEdit->GetPresenter();
+ SysTryReturnVoidResult(NID_UI_CTRL, pEditPresenter, E_INVALID_STATE, "pEditPresenter is null.\n");
+
+ clipboardHeight = pEditPresenter->GetClipboardHeight();
+ pEditPresenter->GetKeypadBoundsEx(keypadBounds);
+ if (clipboardHeight > keypadBounds.height)
+ {
+ adjustHeight = clipboardHeight;
+ }
+ else
+ {
+ adjustHeight = keypadBounds.height;
+ }
if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
{
screenSize.width = pControlManager->GetScreenSizeF().height;
screenSize.height = pControlManager->GetScreenSizeF().width;
}
+ if (adjustHeight > 0.0f)
+ {
+ screenSize.height -= adjustHeight;
+ }
if (__singleHandler)
{
_EditCopyPasteHandler::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo)
{
int cursorPos = -1;
- int previousCursorPos = -1;
FloatRectangle cursorRect(0.0f, 0.0f, 0.0f, 0.0f);
FloatRectangle absCursorRect(0.0f, 0.0f, 0.0f, 0.0f);
FloatRectangle rect = GetBoundsF();
FloatPoint touchPoint(0.0f, 0.0f);
FloatPoint checkPoint(0.0f, 0.0f);
__isTouchMoving = true;
- bool cursorChange = false;
_Edit* pEdit = __pCopyPasteManager->GetEdit();
SysTryReturn(NID_UI_CTRL, pEdit, false, E_INVALID_STATE, "[E_INVALID_STATE] pEdit is null.\n");
absTextObjectBounds.y = absEditBounds.y + textObjectBounds.y;
absTextObjectBounds.width = textObjectBounds.width;
absTextObjectBounds.height = textObjectBounds.height;
- bool needToFixYPosition= false;
-
if (__touchPressedPoint.x == point.x && __touchPressedPoint.y == point.y)
{
return true;
}
- if (!__singleHandler)
- {
- previousCursorPos = __pCopyPasteManager->GetCursorPosition();
- }
-
- FloatPoint absoluteTouchMovedPoint = FloatPoint(GetBoundsF().x + point.x, GetBoundsF().y + point.y);
- if (__handlerDirection == HANDLER_DIRECTION_REVERSE_2 || __handlerDirection == HANDLER_DIRECTION_REVERSE_3)
- {
- absoluteTouchMovedPoint.y += (GetBoundsF().height + absCursorRect.height);
- }
if (__rowIndex == -1 && __columnIndex == -1)
{
pEditPresenter->CalculateCursorBounds(pEditPresenter->GetTextBoundsF(), cursorRect,__handlerCursorPos);
pEditPresenter->CalculateAbsoluteCursorBounds(__rowIndex, __columnIndex, absCursorRect);
}
- if (absTextObjectBounds.height >= (totalHeight - firstDisplayY))
+ FloatPoint absoluteTouchMovedPoint = FloatPoint(GetBoundsF().x + point.x, GetBoundsF().y + point.y);
+ //Calculate handler's position
+ if (__singleHandler)
{
- absTextObjectBounds.height = totalHeight - firstDisplayY;
- absTextObjectBounds.y += absCursorRect.height/2.0f;
- if (absTextObjectBounds.y > absoluteTouchMovedPoint.y || (absTextObjectBounds.y + absTextObjectBounds.height) < absoluteTouchMovedPoint.y)
+ touchPoint.x = absoluteTouchMovedPoint.x;
+ if (__handlerDirection == HANDLER_DIRECTION_NONE)
{
- needToFixYPosition = true;
+ touchPoint.y = absoluteTouchMovedPoint.y - GetBoundsF().height/2.0f;
+ }
+ else // HANDLER_DIRECTION_REVERSE_2
+ {
+ touchPoint.y = absoluteTouchMovedPoint.y + GetBoundsF().height/2.0f;
}
}
else
{
- absTextObjectBounds.y += absCursorRect.height/2.0f;
- if (firstDisplayY == 0.0f && absTextObjectBounds.y > absoluteTouchMovedPoint.y)
+ if (__leftHandler)
{
- needToFixYPosition = true;
+ if (__handlerDirection == HANDLER_DIRECTION_NONE)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x + GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y - GetBoundsF().height/2.0f;
+ }
+ else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_1)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x - GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y - GetBoundsF().height/2.0f;
+ }
+ else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_2)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x + GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y + GetBoundsF().height/2.0f;
+ }
+ else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x - GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y + GetBoundsF().height/2.0f;
+ }
}
- else if ((totalHeight - firstDisplayY) == absTextObjectBounds.height && (absTextObjectBounds.y + absTextObjectBounds.height) < absoluteTouchMovedPoint.y)
+ else
{
- needToFixYPosition = true;
+ if (__handlerDirection == HANDLER_DIRECTION_NONE)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x - GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y - GetBoundsF().height/2.0f;
+ }
+ else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_1)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x + GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y - GetBoundsF().height/2.0f;
+ }
+ else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_2)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x - GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y + GetBoundsF().height/2.0f;
+ }
+ else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)
+ {
+ touchPoint.x = absoluteTouchMovedPoint.x + GetBoundsF().width/2.0f;
+ touchPoint.y = absoluteTouchMovedPoint.y + GetBoundsF().height/2.0f;
+ }
+ }
+ }
+ if (totalHeight - firstDisplayY < absTextObjectBounds.height)
+ {
+ absTextObjectBounds.height = totalHeight - firstDisplayY - 1.0f; // check TextObject
+ }
+
+ if (totalLine != 1) //single line edit doesn't need to adjust horizontal value.
+ {
+ if (absTextObjectBounds.x > touchPoint.x)
+ {
+ touchPoint.x = absTextObjectBounds.x;
+ }
+ if (absTextObjectBounds.x + absTextObjectBounds.width <= touchPoint.x) // check FloatRectangle Contains?
+ {
+ touchPoint.x = absTextObjectBounds.x + absTextObjectBounds.width - 1.0f;
+ }
+ }
+ if (absTextObjectBounds.y > touchPoint.y)
+ {
+ if (totalLine == 1 || firstDisplayY == 0.0f) // whether need to scroll the text or not
+ {
+ touchPoint.y = absTextObjectBounds.y; //not need to scroll the text.
+ }
+ }
+ if (absTextObjectBounds.y + absTextObjectBounds.height < touchPoint.y)
+ {
+ if (totalLine == 1 || (totalHeight - firstDisplayY < textObjectBounds.height) || curCursorLine == (totalLine - 1)) // || pTextObject->IsDisplayedLastLine()) // whether need to scroll the text or not
+ {
+ touchPoint.y = absTextObjectBounds.y + absTextObjectBounds.height - 1.0f; // check TextObject
}
}
if (curCursorLine == nextHandlerLine)
{
- if (__leftHandler && absoluteTouchMovedPoint.y > absCursorRect.y)
+ if (__leftHandler && absoluteTouchMovedPoint.y >= absCursorRect.y + absCursorRect.height)
{
- needToFixYPosition = true;
+ touchPoint.y = absCursorRect.y + absCursorRect.height/2.0f;
}
- else if (!__leftHandler && absoluteTouchMovedPoint.y < absCursorRect.y)
+ else if (!__leftHandler && absoluteTouchMovedPoint.y <= absCursorRect.y + absCursorRect.height)
{
- needToFixYPosition = true;
+ touchPoint.y = absCursorRect.y + absCursorRect.height/2.0f;
}
}
}
- touchPoint.x = cursorRect.x + (point.x - __touchPressedPoint.x);
- if (totalLine == 1 || needToFixYPosition)
- {
- touchPoint.y = cursorRect.y + cursorRect.height/2;
- }
- else
+ touchPoint.x = touchPoint.x - absEditBounds.x - textObjectBounds.x;
+ touchPoint.y = touchPoint.y - absEditBounds.y - textObjectBounds.y;
+
+ if (Math::Abs(touchPoint.y) < 1)
{
- touchPoint.y = cursorRect.y + cursorRect.height + (point.y - __touchPressedPoint.y);
+ touchPoint.y = 0.0f;
}
+
int rowIndex = -1;
int columnIndex = -1;
- bool cursorPosFromTouch = false;
- cursorPos = pEditPresenter->GetCursorPositionAt(touchPoint, rowIndex, columnIndex, true);
+ cursorPos = pTextObject->GetTextIndexFromPosition(touchPoint.x, touchPoint.y, rowIndex, columnIndex, true);
- if (cursorPos != -1 && __handlerCursorPos != cursorPos)
+ if (__handlerCursorPos == cursorPos)
{
- cursorPosFromTouch = true;
- FloatRectangle cursorBounds(0.0f, 0.0f, 0.0f, 0.0f);
- if (__rowIndex == -1 && __columnIndex == -1)
- {
- pEdit->CalculateAbsoluteCursorBounds(cursorPos, cursorBounds);
- }
- else
- {
- pEditPresenter->CalculateAbsoluteCursorBounds(__rowIndex, __columnIndex, cursorBounds);
- }
- cursorChange = true;
- checkPoint.x = cursorBounds.x;
-
- if (absoluteTouchMovedPoint.y -__absoluteTouchPressedPoint.y >= 0.0f || totalLine == 1)
- {
- checkPoint.y = cursorBounds.y + cursorBounds.height;
- }
- else
- {
- checkPoint.y = cursorBounds.y;
- }
+ return true;
}
- if (cursorPos == -1 || (cursorChange && !__pCopyPasteManager->CheckHandleBounds(FloatPoint(checkPoint.x, checkPoint.y))))
+ if (cursorPos == -1)
{
- if (cursorPos != -1)
+ //To get cursorPos
+ if (totalLine != 1)
{
- if (totalLine == 1)
- {
- pTextObject->SetFirstDisplayLineIndexFromTextIndex(cursorPos);
- }
- else
- {
- if (absoluteTouchMovedPoint.y -__absoluteTouchPressedPoint.y >= 0.0f)
- {
- if (curCursorLine < totalLine - 1)
- {
- if (!pTextObject->IsDisplayedLastLine())
- {
- int line = pTextObject->GetFirstDisplayLineIndex();
- pTextObject->SetFirstDisplayLineIndex(line+1);
- }
- else
- {
- if (__singleHandler || __pCopyPasteManager->CheckHandlePosition(__leftHandler, cursorPos))
- {
- __pCopyPasteManager->SetCursorPosition(cursorPos);
- pEditPresenter->ScrollPanelToCursorPosition(true);
- }
- else
- {
- return true;
- }
- }
- }
- }
- else
- {
- if (curCursorLine !=0)
- {
- if (!pTextObject->IsDisplayedFirstLine())
- {
- int line = pTextObject->GetFirstDisplayLineIndex();
- pTextObject->SetFirstDisplayLineIndex(line-1);
- }
- else
- {
- __pCopyPasteManager->SetCursorPosition(cursorPos);
- pEditPresenter->ScrollPanelToCursorPosition(true);
- }
- }
- }
- }
- }
- else
- {
- if (totalLine == 1)
+ if (absoluteTouchMovedPoint.y > (absCursorRect.y + absCursorRect.height))
{
- if (point.x - __touchPressedPoint.x == 0.0f)
- {
- return true;
-
- }
- else if (point.x - __touchPressedPoint.x > 0.0f)
- {
- if (__handlerCursorPos == pEditPresenter->GetTextLength())
- {
- cursorPos = __handlerCursorPos;
- }
- else
- {
- cursorPos = __handlerCursorPos + 1;
-
- if (!__singleHandler && __leftHandler && (cursorPos == pEditPresenter->GetTextLength()))
- {
- cursorPos = __handlerCursorPos;
- }
- }
- }
- else
+ if (curCursorLine < totalLine - 1)
{
- if (__handlerCursorPos != 0)
+ int offset = __handlerCursorPos - pTextObject->GetFirstTextIndexAt(curCursorLine);
+ int firstTextIndex = pTextObject->GetFirstTextIndexAt(curCursorLine+1);
+ cursorPos = offset + firstTextIndex;
+ int textLength = pTextObject->GetTextLengthAt(curCursorLine+1);
+ if (offset > textLength)
{
- cursorPos = __handlerCursorPos - 1;
-
- if (!__singleHandler && __leftHandler)
- {
- pTextObject->SetFirstDisplayLineIndexFromTextIndex(cursorPos);
- }
+ cursorPos = firstTextIndex+textLength;
}
}
- if (point.y < 0.0f || (point.y > GetBoundsF().height))
- {
- return true;
- }
}
else
{
- if (absoluteTouchMovedPoint.y -__absoluteTouchPressedPoint.y >= 0.0f)
+ if (curCursorLine !=0)
{
- if (curCursorLine < totalLine - 1)
+ if (__rowIndex == 0)
{
- int offset = __handlerCursorPos - pTextObject->GetFirstTextIndexAt(curCursorLine);
- int firstTextIndex = pTextObject->GetFirstTextIndexAt(curCursorLine+1);
- cursorPos = offset + firstTextIndex;
- int textLength = pTextObject->GetTextLengthAt(curCursorLine+1);
- if (offset > textLength)
- {
- cursorPos = firstTextIndex+textLength;
- }
- if (!pTextObject->IsDisplayedLastLine())
- {
- int line = pTextObject->GetFirstDisplayLineIndex();
- pTextObject->SetFirstDisplayLineIndex(line+1);
- __pCopyPasteManager->SetCursorPosition(cursorPos);
- pEditPresenter->ScrollPanelToCursorPosition(true);
- }
- else
- {
- if (__singleHandler || __pCopyPasteManager->CheckHandlePosition(__leftHandler, cursorPos))
- {
- __pCopyPasteManager->SetCursorPosition(cursorPos);
- pEditPresenter->ScrollPanelToCursorPosition(true);
- }
- else
- {
- return true;
- }
- }
+ return true;
}
- }
- else
- {
- if (curCursorLine !=0)
+ int offset = __handlerCursorPos - pTextObject->GetFirstTextIndexAt(curCursorLine);
+ int firstTextIndex = pTextObject->GetFirstTextIndexAt(curCursorLine-1);
+ cursorPos = offset + firstTextIndex;
+ int textLength = pTextObject->GetTextLengthAt(curCursorLine-1);
+ if (offset > textLength)
{
- if (__rowIndex == 0)
- {
- return true;
- }
- int offset = __handlerCursorPos - pTextObject->GetFirstTextIndexAt(curCursorLine);
- int firstTextIndex = pTextObject->GetFirstTextIndexAt(curCursorLine-1);
- cursorPos = offset + firstTextIndex;
- int textLength = pTextObject->GetTextLengthAt(curCursorLine-1);
- if (offset > textLength)
- {
- cursorPos = firstTextIndex+textLength;
- }
- if (!pTextObject->IsDisplayedFirstLine())
- {
- int line = pTextObject->GetFirstDisplayLineIndex();
- pTextObject->SetFirstDisplayLineIndex(line-1);
- __pCopyPasteManager->SetCursorPosition(cursorPos);
- pEditPresenter->ScrollPanelToCursorPosition(true);
- }
- else
- {
- __pCopyPasteManager->SetCursorPosition(cursorPos);
- pEditPresenter->ScrollPanelToCursorPosition(true);
- }
+ cursorPos = firstTextIndex+textLength;
}
}
}
}
+ if (cursorPos == -1)
+ {
+ return true;
+ }
}
- if (!__singleHandler && !__pCopyPasteManager->CheckHandlePosition(__leftHandler, cursorPos))
+ if (__handlerCursorPos == cursorPos)
{
- __pCopyPasteManager->SetCursorPosition(previousCursorPos);
- pEditPresenter->SetCursorChangedFlag(!__leftHandler);
-
- if ((__pCopyPasteManager->GetEdit()->GetEditStyle() & EDIT_STYLE_SINGLE_LINE))
- {
- _EditCopyPasteManager::HandlerType nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_MAX;
- if (__leftHandler)
- {
- nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_RIGHT;
- }
- else
- {
- nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_LEFT;
- }
- int nextHandler = __pCopyPasteManager->GetHandlerCursorPosition(nextHandlerType);
- if (Math::Abs(nextHandler - __handlerCursorPos) <= 1)
- {
- pTextObject->SetFirstDisplayLineIndexFromTextIndex(nextHandler);
- }
- }
return true;
}
-
- if (cursorPos == -1 || __handlerCursorPos == cursorPos)
+ if (!__singleHandler)
{
- if (!__singleHandler)
- {
- __pCopyPasteManager->SetCursorPosition(previousCursorPos);
- pEditPresenter->SetCursorChangedFlag(!__leftHandler);
- }
- if (!__singleHandler && (__pCopyPasteManager->GetEdit()->GetEditStyle() & EDIT_STYLE_SINGLE_LINE))
+ if (!__pCopyPasteManager->CheckHandlePosition(__leftHandler, cursorPos))
{
- _EditCopyPasteManager::HandlerType nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_MAX;
- if (__leftHandler)
- {
- nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_RIGHT;
- }
- else
- {
- nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_LEFT;
- }
- int nextHandler = __pCopyPasteManager->GetHandlerCursorPosition(nextHandlerType);
- if (Math::Abs(nextHandler - __handlerCursorPos) <= 1)
+ if (totalLine == 1)
{
- pTextObject->SetFirstDisplayLineIndexFromTextIndex(nextHandler);
+ _EditCopyPasteManager::HandlerType nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_MAX;
+ if (__leftHandler)
+ {
+ nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_RIGHT;
+ }
+ else
+ {
+ nextHandlerType = _EditCopyPasteManager::HANDLER_TYPE_LEFT;
+ }
+ int nextHandler = __pCopyPasteManager->GetHandlerCursorPosition(nextHandlerType);
+ if (Math::Abs(nextHandler - __handlerCursorPos) <= 1)
+ {
+ pTextObject->SetFirstDisplayLineIndexFromTextIndex(nextHandler);
+ }
}
+ return true;
}
- return true;
}
- if (cursorPosFromTouch && (rowIndex != -1 && columnIndex != -1))
+ if (rowIndex > -1 && columnIndex > -1)
{
__rowIndex = rowIndex;
__columnIndex = columnIndex;
_EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
SysTryReturn(NID_UI, pEcoreEvas, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
- pEcoreEvas->SetWindowBounds(*GetRootWindow(), _CoordinateSystemUtils::ConvertToInteger(bounds));
+ pEcoreEvas->SetWindowBounds(*GetRootWindow(), bounds);
result r = GetLastResult();
SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
}
_EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
SysTryReturn(NID_UI, pEcoreEvas, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
- pEcoreEvas->SetWindowBounds(*GetRootWindow(), _CoordinateSystemUtils::ConvertToInteger(bounds));
+ pEcoreEvas->SetWindowBounds(*GetRootWindow(), bounds);
result r = GetLastResult();
SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
return;
}
- if (__pEdit->GetTextLength() == 0 && (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER))
+ if (__pEdit->GetTextLength() == 0 && (__pEdit->IsViewModeEnabled()))
{
return;
}
{
editShowAreaAbsRect = editAbsRect;
FloatRectangle textObjectBounds = __pEditPresenter->GetTextBoundsF();
- editShowAreaAbsRect.x += textObjectBounds.x;
- editShowAreaAbsRect.y += textObjectBounds.y;
- editShowAreaAbsRect.width = textObjectBounds.width;
- if (!(__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE))
+
+ if (!(__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN))
{
- editShowAreaAbsRect.height = textObjectBounds.height;
+ editShowAreaAbsRect.x += textObjectBounds.x;
+ editShowAreaAbsRect.y += textObjectBounds.y;
+ editShowAreaAbsRect.width = textObjectBounds.width;
+
+ if (!(__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE))
+ {
+ editShowAreaAbsRect.height = textObjectBounds.height;
+ }
}
if (commandButtonExist)
__pEdit->CalculateAbsoluteCursorBounds(start, startRect);
__pEdit->CalculateAbsoluteCursorBounds(end, endRect);
- Point leftHandler(startRect.x, startRect.y + startRect.height);
- Point rightHandler(endRect.x, endRect.y + endRect.height);
+ FloatPoint leftHandler(startRect.x, startRect.y + startRect.height);
+ FloatPoint rightHandler(endRect.x, endRect.y + endRect.height);
__pHandle[HANDLER_TYPE_LEFT] = _EditCopyPasteHandler::CreateInstanceN(leftHandler, start, this, false, true);
__pHandle[HANDLER_TYPE_RIGHT] = _EditCopyPasteHandler::CreateInstanceN(rightHandler, end, this, false, false);
{
FloatRectangle centerRect;
__pEdit->CalculateAbsoluteCursorBounds(__pEdit->GetCursorPosition(), centerRect);
- Point centerHandler(centerRect.x, centerRect.y + centerRect.height);
+ FloatPoint centerHandler(centerRect.x, centerRect.y + centerRect.height);
__pHandle[HANDLER_TYPE_CENTER] = _EditCopyPasteHandler::CreateInstanceN(centerHandler, __pEdit->GetCursorPosition(), this, true, true);
#if EDIT_COPY_PASTE_MAGNIFIER
if (__pEdit->GetCursorPosition() != __pHandle[HANDLER_TYPE_CENTER]->GetHandlerCursorPosition())
{
__pHandle[HANDLER_TYPE_CENTER]->SetHandlerCursorPosition(__pEdit->GetCursorPosition());
-// __pHandle[HANDLER_TYPE_CENTER]->MoveCopyPasteMagnifier();
}
__pHandle[HANDLER_TYPE_CENTER]->AdjustBounds();
__pHandle[HANDLER_TYPE_CENTER]->CheckReverseStatus();
- __pEdit->Invalidate();
+ __pHandle[HANDLER_TYPE_CENTER]->Invalidate();
+ __pEditPresenter->DrawText();
}
if (__pHandle[HANDLER_TYPE_LEFT] && __pHandle[HANDLER_TYPE_RIGHT])
__pHandle[HANDLER_TYPE_RIGHT]->CheckReverseStatus();
__pHandle[HANDLER_TYPE_LEFT]->Invalidate();
__pHandle[HANDLER_TYPE_RIGHT]->Invalidate();
- __pEdit->Invalidate();
+ __pEditPresenter->DrawText();
}
if (__pCopyPastePopup)
FloatRectangle panelAbsoulteBounds(0.0f, 0.0f, 0.0f, 0.0f);
FloatRectangle editAbsBounds = __pEdit->GetAbsoluteBoundsF();
FloatRectangle textObjectBounds = __pEditPresenter->GetTextBoundsF();
- editAbsBounds.x += textObjectBounds.x;
- editAbsBounds.y += textObjectBounds.y;
- editAbsBounds.width = textObjectBounds.width;
- if (!(__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE))
+ if (!(__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN))
{
- editAbsBounds.height = textObjectBounds.height;
+ editAbsBounds.x += textObjectBounds.x;
+ editAbsBounds.y += textObjectBounds.y;
+ editAbsBounds.width = textObjectBounds.width;
+
+ if (!(__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE))
+ {
+ editAbsBounds.height = textObjectBounds.height;
+ }
}
_Toolbar* pCommandButton = __pEditPresenter->GetKeypadCommandButton();
{
__focusId = DATETIME_ID_YEAR;
}
+ else
+ {
+ return false;
+ }
}
else if (__focusId == DATETIME_ID_MONTH)
{
{
__focusId = DATETIME_ID_DAY;
}
+ else
+ {
+ return false;
+ }
}
else if (__focusId == DATETIME_ID_YEAR)
{
{
__focusId = DATETIME_ID_DAY;
}
+ else
+ {
+ return false;
+ }
}
__pEditDate->Invalidate();
break;
{
__focusId = DATETIME_ID_MONTH;
}
+ else
+ {
+ return false;
+ }
}
else if (__focusId == DATETIME_ID_MONTH)
{
{
__focusId = DATETIME_ID_DAY;
}
+ else
+ {
+ return false;
+ }
}
else if (__focusId == DATETIME_ID_YEAR)
{
{
__focusId = DATETIME_ID_DAY;
}
+ else
+ {
+ return false;
+ }
}
__pEditDate->Invalidate();
break;
bool _EditPresenter::__footerVisibleChanged = false;
unsigned int _EditPresenter::__latestBoundedContext = null;
const float _EditPresenter::TOUCH_PRESS_THRESHOLD_IN_CLEAR_AREA = 0.04f;
+_ScrollPanel* _EditPresenter::__pResizedPanel = null;
_EditAnimationProvider::_EditAnimationProvider(void)
{
, __titleBounds()
, __clientBounds()
, __previousCursorBounds()
- , __keypadBounds()
+ , __keypadBounds(0.0f, 0.0f, 0.0f,0.0f)
, __pTextObject(null)
, __pGuideTextObject(null)
, __pTitleTextObject(null)
, __isFlexibleHeightFrozen(false)
, __isKeypadShowing(false)
, __isKeypadHiding(false)
+ , __resizedByKeypadHide(false)
, __blockStartPos(0)
, __cursorPos(0)
, __prevTotalTextHeight(-1.0f)
__isKeypadExist = false;
+ if (__resizedByKeypadHide)
+ {
+ __resizedByKeypadHide = false;
+ return;
+ }
+
if (__isCopyPasteManagerExist)
{
InitializeCopyPasteManager();
__pCommandButton->Invalidate();
}
- __pEdit->DetachScrollPanelEvent();
__isInputConnectionBound = false;
AdjustParentPanelHeight(true);
else
{
__pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CLOSED);
+ __pEdit->DetachScrollPanelEvent();
if (!__isClipboardExist)
{
__pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_BOUNDS_CHANGED);
+ if (__isCopyPasteManagerExist)
+ {
+ DrawText();
+ if (__pCopyPasteManager->GetCopyPastePopup())
+ {
+ __pCopyPasteManager->CreateCopyPastePopup();
+ }
+ __pCopyPasteManager->Show();
+ }
+
return;
}
{
if (__clipboardConnected)
{
+ if (__isCopyPasteManagerExist)
+ {
+ InitializeCopyPasteManager();
+ __pTextObject->SetBlock(false);
+ __isTextBlocked = false;
+ }
+
if (__pClipboard)
{
__pClipboard->HidePopup();
if (__pScrollBar != null && __pEdit != null)
{
- result r = __pEdit->DetachSystemChild(*__pScrollBar);
-
- if (r == E_SUCCESS)
- {
- delete __pScrollBar;
- __pScrollBar = null;
- }
+ __pEdit->DetachSystemChild(*__pScrollBar);
+ delete __pScrollBar;
+ __pScrollBar = null;
}
if (__pFlickAnimationTimer)
__isCutLinkParserEnabled = false;
}
+ if (__pEdit->GetInputStyle() == INPUT_STYLE_FULLSCREEN)
+ {
+ SetCursorDisabled(true);
+ }
+
__initialBounds = __pEdit->GetBoundsF();
__pEdit->SetTouchPressThreshold(__defaultTouchMoveThreshold);
ReplaceTextIntoPasswordHyphenString();
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+ if (__pEdit->IsViewModeEnabled())
{
__pEdit->SetCursorPosition(0);
}
}
else
{
- DrawBackgroundBitmap(canvas, IsInternalFocused());
+ DrawBackgroundBitmap(canvas, __pEdit->IsFocused());
}
DrawFocusRing(canvas);
pTitleTextCanvas->Clear();
titleAction = __pTitleTextObject->GetAction();
- if (IsInternalFocused() == true)
+ if (__pEdit->IsFocused() == true)
{
__pTitleTextObject->SetForegroundColor(__pEdit->GetTitleTextColor(EDIT_STATUS_HIGHLIGHTED), 0, __pTitleTextObject->GetTextLength());
{
result r = E_SUCCESS;
- if (!(__pEdit->GetEditStyle() & EDIT_STYLE_PASSWORD) && IsInternalFocused() == false)
+ if (!(__pEdit->GetEditStyle() & EDIT_STYLE_PASSWORD) && __pEdit->IsFocused() == false)
{
__pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
}
EditStatus editStatus = GetCurrentStatus();
- if (IsInternalFocused() == false)
+ if (__pEdit->IsFocused() == false)
{
if (__isCursorChanged == true)
{
}
else
{
- DrawSingleLineBackgroundBitmap(canvas, IsInternalFocused());
+ DrawSingleLineBackgroundBitmap(canvas, __pEdit->IsFocused());
}
DrawFocusRing(canvas);
Bitmap* pEditReplacedBitmapClear = null;
Color editClearIconColor;
- if (__isClearIconPressed)
+ if (!__pEdit->IsEnabled())
+ {
+ r = GET_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBitmapClear);
+
+ if (pEditBitmapClear == null)
+ {
+ return E_SYSTEM;
+ }
+
+ GET_COLOR_CONFIG(EDIT::CLEAR_ICON_DISABLED, editClearIconColor);
+ }
+ else if (__isClearIconPressed)
{
r = GET_BITMAP_CONFIG_N(EDIT::CLEAR_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pEditBitmapClear);
r = InitializeAtFirstDrawing();
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Faild to initialize.");
- if (IsInternalFocused() == true && __isInputConnectionBound == false)
+ if (__pEdit->IsFocused() == true && __isInputConnectionBound == false)
{
if (IsViewModeEnabled() == false)
{
}
else
{
- if (!IsInternalFocused())
+ if (!__pEdit->IsFocused())
{
__pEdit->SetFocused();
}
FloatRectangle clientBounds;
FloatPoint touchPoint = touchInfo.GetCurrentPosition();
- if (IsViewModeEnabled())
- {
- __pEdit->SetFocused();
- __pTextObject->ResetAllCutLinkElementsState();
- }
-
if (__isClearIconPressed)
{
__isClearIconPressed = false;
return true;
}
+ if (__isTouchMoving && __isInputConnectionBound == false)
+ {
+ FadeOutScrollBar();
+ __isTouchMoving = false;
+ __isTouchReleaseSkipped = false;
+ __pEdit->Invalidate();
+
+ return true;
+ }
+
if (IsViewModeEnabled())
{
+ __pEdit->SetFocused();
+
+ __pTextObject->ResetAllCutLinkElementsState();
+
cutLinkIndex = __pTextObject->GetCutLinkIndexFromPositionData(touchPoint.x - __textObjectBounds.x, touchPoint.y - __textObjectBounds.y);
if (cutLinkIndex != -1)
__pEdit->SendLinkEvent(cutLinkString, baseLinkType, cutLinkString);
}
}
- if (__isTouchMoving && __isInputConnectionBound == false)
- {
- FadeOutScrollBar();
- __isTouchMoving = false;
- __isTouchReleaseSkipped = false;
- __pEdit->Invalidate();
-
- return true;
- }
clientBounds = __pEdit->GetBoundsF();
clientBounds.x = 0.0f;
}
if (!__isCopyPasteManagerExist) // Copy&Paste
{
- if ((__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE) == true && IsInternalFocused() == false)
+ if ((__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE) == true && __pEdit->IsFocused() == false)
{
__isCursorChanged = true;
}
needToCreatePopup = false;
}
- if (IsInternalFocused() && !tokenEditting && needToCreatePopup)
+ if (__pEdit->IsFocused() && !tokenEditting && needToCreatePopup)
{
__pCopyPasteManager = new (std::nothrow) _EditCopyPasteManager(*__pEdit);
SysTryReturn(NID_UI_CTRL, __pCopyPasteManager != null, false, E_SYSTEM, "Unable to create _EditCopyPasteManager instance.");
__isCopyPasteManagerExist = true;
}
}
- //if ((cutLinkIndex < 0) && ((__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER) == false) && (IsKeypadEnabled()))
- if ((cutLinkIndex < 0) && ((__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER) == false))
+
+ if (cutLinkIndex < 0)
{
CheckUSBKeyboardStatus();
{
if (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY)
{
- if (IsInternalFocused())
- {
- ShowKeypad(false);
- }
- else
+ if (IsViewModeEnabled() == false)
{
- __pEdit->SetFocused();
+ if (__pEdit->IsFocused())
+ {
+ ShowKeypad(false);
+ }
+ else
+ {
+ __pEdit->SetFocused();
+ }
}
}
else
{
- ShowFullscreenKeypad();
+ if (__pEditModel->IsViewModeEnabled() == false) //in case of fullscreen style, should check editModel's viewMode
+ {
+ ShowFullscreenKeypad();
+ }
}
}
}
else
{
-
if (!__isKeypadExist || !__isInputConnectionBound)
{
if (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY)
{
- if (IsInternalFocused())
- {
- ShowKeypad(false);
- }
- else
+ if (IsViewModeEnabled() == false)
{
- __pEdit->SetFocused();
+ if (__pEdit->IsFocused())
+ {
+ ShowKeypad(false);
+ }
+ else
+ {
+ __pEdit->SetFocused();
+ }
}
}
else
{
- ShowFullscreenKeypad();
+ if (__pEditModel->IsViewModeEnabled() == false) //in case of fullscreen style, should check editModel's viewMode
+ {
+ ShowFullscreenKeypad();
+ }
}
}
}
_AccessibilityManager* pAccessibilityManager = _AccessibilityManager::GetInstance();
SysTryReturn(NID_UI_CTRL, pAccessibilityManager, false, E_SYSTEM, "pAccessibilityManager is null");
- if (IsViewModeEnabled() == true)
+ if (__pEditModel->IsViewModeEnabled() == false)
+ {
+ if (__pEdit->GetInputStyle() == INPUT_STYLE_FULLSCREEN)
+ {
+ if (_KEY_ENTER == keyCode)
+ {
+ CheckUSBKeyboardStatus();
+ if (__isUSBKeyboardConnected)
+ {
+ ShowFullscreenKeypad();
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+ else
{
return false;
}
{
return true;
}
- else if (IsInternalFocused() == false && !IsViewModeEnabled())
+ else if (__pEdit->IsFocused() == false && !IsViewModeEnabled())
{
return true;
}
InitializeCopyPasteManager();
if (IsClipped() || GetTextLength())
{
- if (IsClipped() && !GetTextLength() && (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER))
+ if (IsClipped() && !GetTextLength() && (__pEdit->IsViewModeEnabled()))
{
return true;
}
return false;
}
- if (IsInternalFocused() == false)
+ if (__pEdit->IsFocused() == false)
{
return true;
}
InitializeCopyPasteManager();
int length = text.GetLength();
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+
+ if (__pEdit->IsViewModeEnabled())
{
if (__limitLength <= length)
{
AdjustFlexibleHeight();
}
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+ if (__pEdit->IsViewModeEnabled())
{
__isCutLinkParserEnabled = true;
}
SysTryReturnResult(NID_UI_CTRL, index >= 0 && index <= currentLength, E_OUT_OF_RANGE, "The Invalid argument is given.");
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+ if (__pEdit->IsViewModeEnabled())
{
if (__limitLength <= totalLength)
{
__isCursorChanged = true;
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+ if (__pEdit->IsViewModeEnabled())
{
__isCutLinkParserEnabled = true;
}
int length = text.GetLength();
int totalLength = currentLength + length;
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+ if (__pEdit->IsViewModeEnabled())
{
if (__limitLength <= totalLength)
{
AdjustFlexibleHeight();
}
- if (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER)
+ if (__pEdit->IsViewModeEnabled())
{
__isCutLinkParserEnabled = true;
}
}
bool
-_EditPresenter::IsViewModeEnabled(void) const
+_EditPresenter::IsViewModeEnabled(bool internal) const
{
- return __pEditModel->IsViewModeEnabled();
+ if (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY)
+ {
+ return __pEditModel->IsViewModeEnabled();
+ }
+ else
+ {
+ if (internal)
+ {
+ return true;
+ }
+ else
+ {
+ return __pEditModel->IsViewModeEnabled();
+ }
+ }
}
result
_EditPresenter::SetViewModeEnabled(bool enable)
{
- if (!enable && __pEditModel->IsViewModeEnabled() && IsInternalFocused())
+ if (!enable && __pEditModel->IsViewModeEnabled() && __pEdit->IsFocused() && (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY))
{
__pEdit->SetFocused(false);
}
}
}
- __isCursorDisabled = enable;
- __pTextObject->SetCutLinkViewMode(enable);
+ if (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY)
+ {
+ __isCursorDisabled = enable;
+ __pTextObject->SetCutLinkViewMode(enable);
+ }
if (__pInputConnection)
{
__pInputConnection->SetKeyEventSkipped(enable);
}
-
return __pEditModel->SetViewModeEnabled(enable);
}
SysTryReturnResult(NID_UI_CTRL, position >= 0 && position <= currentLength, E_OUT_OF_RANGE, "The given position is out-of-range.");
- if ((__pEdit->GetEditStyle() & EDIT_STYLE_FLEXIBLE) || (__pEdit->GetEditStyle() & EDIT_STYLE_VIEWER))
+ if ((__pEdit->GetEditStyle() & EDIT_STYLE_FLEXIBLE) || (__pEdit->IsViewModeEnabled()))
{
if (__limitLength <= totalLength)
{
void
_EditPresenter::OnFrameActivated(const _Frame& source)
{
- if (IsInternalFocused() == true && __isInputConnectionBound == false && __isInitialized)
+ _ControlManager* pControlManager = _ControlManager::GetInstance();
+ if (pControlManager)
+ {
+ _Control* pControl = pControlManager->GetFocusControl();
+ if (pControl != __pEdit)
+ {
+ return;
+ }
+ }
+
+ if (__isInputConnectionBound == false && __isInitialized)
{
if (IsViewModeEnabled() == false)
{
void
_EditPresenter::ChangeToUnbindState(void)
{
+ if(__latestBoundedContext != (unsigned int)this)//context is already changed.
+ {
+ __isKeypadHiding = false;
+ }
+
if (IsCopyPasteManagerExist())
{
InitializeCopyPasteManager();
}
- if (__pEdit->IsInternalFocused())
+ if (__pEdit->IsFocused())
{
- if (IsKeypadEnabled())
- {
- HideKeypad(true);
- }
- else
+ HideKeypad(false);
+ }
+
+ if (__isKeypadHiding)
+ {
+ if (__pParentForm && !__pParentForm->IsVisible()) //Unbind by Scene Change
{
- __pEdit->SetFocused(false);
- __isInputConnectionBound = false;//forcely set, OnFocusLost callback can be missed in special condition.
+ if (__isCopyPasteManagerExist)
+ {
+ InitializeCopyPasteManager();
+ __pTextObject->SetBlock(false);
+ __isTextBlocked = false;
+ }
+
+ if (__pCommandButton && __isKeypadCommandButtonVisible)
+ {
+ SetFooterVisible(true);
+ __pCommandButton->SetVisibleState(false);
+ __pCommandButton->Invalidate();
+ }
+
+ __isInputConnectionBound = false;
+
+ AdjustParentPanelHeight(true);
+ SysLog(NID_UI_CTRL, "Form deflate RESET!!!!!!!!!!");
+ __pParentForm->DeflateClientRectHeight(0);
+
+ if (!__pEdit->IsFullScreenKeypadEdit())
+ {
+ if (__pParentForm)
+ {
+ __pParentForm->Draw();
+ }
+ }
+
+ __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CLOSED);
+ __pEdit->DetachScrollPanelEvent();
+
+ __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CLOSE);
+ __resizedByKeypadHide = true;
+ __latestBoundedContext = null;
}
}
if (__pEdit->IsEnabled())
{
- if (IsInternalFocused())
+ if (__pEdit->IsFocused())
{
editState = EDIT_STATUS_HIGHLIGHTED;
}
}
result
-_EditPresenter::GetKeypadBounds(FloatRectangle& bounds) const
+_EditPresenter::GetKeypadBounds(FloatRectangle& bounds)
{
if (__pInputConnection == null)
{
SysTryReturnResult(NID_UI_CTRL, pXformer, E_SYSTEM, "Coordinate system load failed.");
bounds = pXformer->Transform(bounds);
+ __keypadBounds = bounds;
return E_SUCCESS;
}
return E_SUCCESS;
}
+ bool sendKeypadEventForcely = false;
+
CheckUSBKeyboardStatus();
__isInputConnectionBound = true;
__pInputConnection->BindInputMethod();
__isKeypadShowing = true;
__isKeypadHiding = false;
+ __resizedByKeypadHide = false;
__latestBoundedContext = (unsigned int)this;
LanguageCode initialKeypadLanguage = LANGUAGE_INVALID;
if (__isKeypadExist) //edit switiching
{
+ sendKeypadEventForcely = !__pParentForm->IsDeflated();
+ if (sendKeypadEventForcely)
+ {
+ __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
+ __pEdit->AttachScrollPanelEvent();
+ __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
+ }
+
ChangeLayoutInternal(__pEdit->GetOrientation());
AdjustParentPanelHeight(false);
ScrollPanelToCursorPosition();
__pParentForm->Draw();
}
__isKeypadShowing = false;
+
+ if (sendKeypadEventForcely)
+ {
+ __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_OPEN);
+ __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_OPENED);
+ }
}
else
{
- if(!__isClipboardExist)
+ if(!__isClipboardExist && __pParentPanel)
{
__initialParentHeight = 0.0f;
}
return;
}
+ float initialParentHeight = __initialParentHeight;
+ if (__pResizedPanel != __pParentPanel)
+ {
+ initialParentHeight = 0.0f;
+ }
+
_ControlOrientation orientation;
float commandButtonHeight = 0.0f;
if (restore)
{
- if (__initialParentHeight)
+ if (initialParentHeight)
{
scrollPanelBounds.height = __initialParentHeight;
SysLog(NID_UI_CTRL, "Rollback ScrollPanel's height to %f and Set __initialParentHeight to 'Zero' ", __initialParentHeight);
__initialParentHeight = 0.0f;
+ __pResizedPanel = null;
__pParentPanel->SetBounds(scrollPanelBounds);
__pParentPanel->Invalidate();
}
SysLog(NID_UI_CTRL, "IsOverlapped:(%d), __initialParentHeight:(%f), gapY:(%f)", isOverlapped, __initialParentHeight, gapY);
- if (!__initialParentHeight)
+ if (!initialParentHeight)
{
if (!isOverlapped)
{
if (gapY > 0.0f)
{
- __initialParentHeight = scrollPanelBounds.height;
+ initialParentHeight = scrollPanelBounds.height;
+ __initialParentHeight = initialParentHeight;
+ __pResizedPanel = __pParentPanel;
SysLog(NID_UI_CTRL, "Set ScrollPanel's height to %f and Set __initialParentHeight:(%f)", gapY, __initialParentHeight);
{
if (!isOverlapped)
{
- if ((gapY < __initialParentHeight) && (gapY > 0.0f))
+ if ((gapY < initialParentHeight) && (gapY > 0.0f))
{
SysLog(NID_UI_CTRL, "Set ScrollPanel's height to %f", gapY);
}
else
{
- if (gapY > __initialParentHeight)
+ if (gapY > initialParentHeight)
{
SysLog(NID_UI_CTRL, "Set ScrollPanel's height to %f", __initialParentHeight);
- scrollPanelBounds.height = __initialParentHeight;
+ scrollPanelBounds.height = initialParentHeight;
__pParentPanel->SetBounds(scrollPanelBounds);
__pParentPanel->Invalidate();
}
InitializeCopyPasteManager();
__isKeypadShowing = false;
+ __resizedByKeypadHide = false;
if (__isInitialized == false || !__isInputConnectionBound)
{
__isInputConnectionBound = false;
- if (focus && IsInternalFocused())
+ if (focus && __pEdit->IsFocused())
{
__pEdit->SetFocused(false);
}
{
StopCursorTimer();
- if (__isCursorDisabled == false && IsInternalFocused() && __isTextBlocked == false)
+ if (__isCursorDisabled == false && __pEdit->IsFocused() && __isTextBlocked == false)
{
FloatRectangle cursorBounds;
CalculateCursorBounds(__textObjectBounds, cursorBounds);
void
_EditPresenter::OnCursorTimerExpired(void)
{
- if (!IsInternalFocused() && __isCursorDisabled)
+ if (!__pEdit->IsFocused() && __isCursorDisabled)
{
StopCursorTimer();
return;
}
else if (editStyle & EDIT_STYLE_TITLE_TOP)
{
+ result r = E_SUCCESS;
float titletHeight = 0.0f;
float titleTextTopMargin = 0.0f;
GET_SHAPE_CONFIG(EDIT::FIELD_TITLE_RECT_HEIGHT, orientation, titletHeight);
GET_SHAPE_CONFIG(EDIT::FIELD_TITLE_TEXT_TOP_MARGIN, orientation, titleTextTopMargin);
+ _FontImpl* fontImpl = _FontImpl::GetInstance(*__pFont);
+ SysTryReturnVoidResult(NID_UI_CTRL, fontImpl != null, E_SYSTEM, "[E_SYSTEM] fontImpl is null.");
+
+ float originalSize = fontImpl->GetSizeF();
+ float titleFontSize = 0.0f;
+ GET_SHAPE_CONFIG(EDIT::DEFAULT_TITLE_FONT_SIZE, __pEdit->GetOrientation(), titleFontSize);
+
+ r = fontImpl->SetSize(titleFontSize);
+ SysTryReturnVoidResult(NID_UI_CTRL, !(IsFailed(r)), r, "SetSize is failed.");
+
+ if (titletHeight < fontImpl->GetMaxHeightF())
+ {
+ titleTextTopMargin -= (fontImpl->GetMaxHeightF()-titletHeight);
+ titletHeight = fontImpl->GetMaxHeightF();
+ }
+
+ r = fontImpl->SetSize(originalSize);
+ SysTryReturnVoidResult(NID_UI_CTRL, !(IsFailed(r)), r, "SetSize is failed.");
+
leftBorder = leftMargin;
rightBorder = rightMargin;
topBorder = titletHeight + titleTextTopMargin;
float titleTextTopMargin = 0.0f;
float titleTextBottomMargin = 0.0f;
float clearIconWidth = 0.0f;
+ float titletHeight = 0.0f;
_ControlOrientation orientation = __pEdit->GetOrientation();
GET_SHAPE_CONFIG(EDIT::FIELD_BOTTOM_MARGIN, orientation, bottomMargin);
GET_SHAPE_CONFIG(EDIT::FIELD_TITLE_TEXT_TOP_MARGIN, orientation, titleTextTopMargin);
GET_SHAPE_CONFIG(EDIT::FIELD_TITLE_TEXT_BOTTOM_MARGIN, orientation, titleTextBottomMargin);
GET_SHAPE_CONFIG(EDIT::CLEAR_ICON_WIDTH, orientation, clearIconWidth);
+ GET_SHAPE_CONFIG(EDIT::FIELD_TITLE_RECT_HEIGHT, orientation, titletHeight);
if (!(editStyle & EDIT_STYLE_SINGLE_LINE))
{
__textObjectBounds.height = __clientBounds.height - textBottomMargin;
__titleBounds.x = titleTextLeftMargin;
+
+ _FontImpl* fontImpl = _FontImpl::GetInstance(*__pFont);
+ SysTryReturnResult(NID_UI_CTRL, fontImpl != null, E_SYSTEM, "fontImpl is null.");
+
+ float originalSize = fontImpl->GetSizeF();
+ float titleFontSize = 0.0f;
+ GET_SHAPE_CONFIG(EDIT::DEFAULT_TITLE_FONT_SIZE, __pEdit->GetOrientation(), titleFontSize);
+
+ r = fontImpl->SetSize(titleFontSize);
+ SysTryReturnResult(NID_UI_CTRL, !(IsFailed(r)), r, "SetSize is failed.");
+
+ if (titletHeight < fontImpl->GetMaxHeightF())
+ {
+ titleTextTopMargin -= (fontImpl->GetMaxHeightF()-titletHeight);
+ }
+
+ r = fontImpl->SetSize(originalSize);
+ SysTryReturnResult(NID_UI_CTRL, !(IsFailed(r)), r, "SetSize is failed.");
+
__titleBounds.y = titleTextTopMargin;
- __titleBounds.width = bounds.width - __titleBounds.x
- - titleTextRightMargin;
+ __titleBounds.width = bounds.width - __titleBounds.x - titleTextRightMargin;
__titleBounds.height = bounds.height - __titleBounds.y - __clientBounds.height
- bottomMargin;
{
result r = E_SUCCESS;
- if (!IsInternalFocused())
+ if (!__pEdit->IsFocused())
{
StopTitleSlidingTimer();
return r;
{
result r = E_SUCCESS;
- if (!IsInternalFocused())
+ if (!__pEdit->IsFocused())
{
return E_SYSTEM;
}
return maxHeight;
}
-bool
-_EditPresenter::SetKeypadBounds(const FloatRectangle& bounds)
+void
+_EditPresenter::GetKeypadBoundsEx(Tizen::Graphics::FloatRectangle& bounds) const
{
- __keypadBounds.x = bounds.x;
- __keypadBounds.y = bounds.y;
- __keypadBounds.width = bounds.width;
- __keypadBounds.height = bounds.height;
- return true;
+ bounds.x = __keypadBounds.x;
+ bounds.y = __keypadBounds.y;
+ bounds.width = __keypadBounds.width;
+ bounds.height = __keypadBounds.height;
+ return;
}
_Form*
_Window* pTop = __pParentPanel->GetRootWindow();
if (pTop)
{
- if ((pTop->GetFocusControl(__pEdit) != __pEdit) && IsInternalFocused() == false)
+ if ((pTop->GetFocusControl(__pEdit) != __pEdit) && __pEdit->IsFocused() == false)
{
focused = false;
}
}
}
- else if (IsInternalFocused() == false)
+ else if (__pEdit->IsFocused() == false)
{
focused = false;
}
Bitmap* pFocusRing = null;
Color color = __pEdit->GetColor(EDIT_STATUS_HIGHLIGHTED);
- if (IsInternalFocused() && color.GetAlpha())
+ if (__pEdit->IsFocused() && color.GetAlpha())
{
Color focusColor;
GET_COLOR_CONFIG(EDIT::CURSOR_NORMAL, focusColor);
__focusId = DATETIME_ID_AMPM;
}
}
+ else if (__focusId == DATETIME_ID_AMPM)
+ {
+ return false;
+ }
__pEditTime->Invalidate();
break;
{
__focusId = DATETIME_ID_MINUTE;
}
+ else if (__focusId == DATETIME_ID_HOUR)
+ {
+ return false;
+ }
__pEditTime->Invalidate();
break;
}
_FastScrollIndex* pFormerIndex = null;
pChildIndexList = new (std::nothrow) ArrayList();
- SysTryCatch(NID_UI_CTRL, pChildIndexList, , E_OUT_OF_MEMORY, "Memory allocation failed.");
+ SysTryCatchLabel(NID_UI_CTRL, pChildIndexList, , CATCH1, E_OUT_OF_MEMORY, "Memory allocation failed.");
k = 0;
pFormerIndex = GetChildIndex(GetChildCount(pFormerList) - 1, pFormerList);
- SysTryCatch(NID_UI_CTRL, pFormerIndex, , GetLastResult(),
- "[%s] Failed to get the child index.", GetErrorMessage(GetLastResult()));
+ SysTryCatchLabel(NID_UI_CTRL, pFormerIndex, , CATCH1, GetLastResult(), "[%s] Failed to get the child index.", GetErrorMessage(GetLastResult()));
pFormerIndex->SetNextIndexList(pChildIndexList);
continue;
}
delete[] pTempChar;
return E_SUCCESS;
+CATCH1:
+ delete pChildIndexList;
+ pChildIndexList = null;
+
CATCH:
delete indexText;
indexText = null;
- delete pChildIndexList;
- pChildIndexList = null;
- delete pFirstIndexList;
- pFirstIndexList = null;
delete[] pTempChar;
return r;
if (onAccessibility)
{
r = pIndexView->AddAccessibilityElement(control);
- SysTryReturnResult(NID_UI_CTRL, r = E_SUCCESS, r, "Failed to Add accessibility element.");
+ SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to Add accessibility element.");
}
else
{
float iconSize = 0.0f;
- GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
Bitmap* pIconBitmap = null;
{
r = GET_SHAPE_CONFIG(FOOTER::SEGMENTED_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
- if (footerItem.GetText() != L"")
+ if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_TAB_LARGE)
{
- GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
}
else
{
- GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
}
Bitmap* pSelectedBitmap = null;
if (footerItem.GetText() != L"")
{
- GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
}
else
{
- GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
}
}
return E_INVALID_OPERATION;
}
- if ((actionBars & FORM_ACTION_BAR_INDICATOR))
- {
- if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)
- {
- if (!(__formStyle & FORM_STYLE_INDICATOR))
- {
- SysLog(NID_UI_CTRL,
- "[E_INVALID_OPERATION] The current state of the instance prohibits the execution of the specified operation.");
- return E_INVALID_OPERATION;
- }
- }
- else
- {
- SysLog(NID_UI_CTRL,
- "[E_INVALID_OPERATION] The current state of the instance prohibits the execution of the specified operation.");
- return E_INVALID_OPERATION;
- }
- }
-
result r = E_SUCCESS;
Color bgColor(0, 0, 0, 0);
}
bool
+_Form::IsDeflated(void)
+{
+ if (__deflated)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+bool
_Form::DeflateClientRectHeight(int height)
{
if ( height > 0)
{
adjHeight = 0.0f;
}
+ else
+ {
+ if (FORM_STYLE_INDICATOR_AUTO_HIDE & GetFormStyle())
+ {
+ adjHeight = 0.0f;
+ }
+ }
}
}
}
}
else
{
+ AddIndicatorObject();
r = SetIndicatorShowState(false);
SetIndicatorAutoHide(false, false);
SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
{
if (FORM_STYLE_LANDSCAPE_INDICATOR_AUTO_HIDE & GetFormStyle())
{
- GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, GetOrientation(), indicatorheight);
+ GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
}
}
{
indicatorBounds.height = 0.0f;
}
+ else
+ {
+ if (FORM_STYLE_INDICATOR_AUTO_HIDE & GetFormStyle())
+ {
+ adjHeight = 0.0f;
+ }
+ }
}
}
}
delete[] __pStretchableRowIndex;
delete[] __pStretchableColumnIndex;
+
+ delete __pSystemControl;
+ __pSystemControl = null;
}
_GroupContainer*
SysTryReturn(NID_UI_CTRL, __pCellsArray != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
__pStretchableRowIndex = new (std::nothrow) bool[rowCount];
- SysTryReturn(NID_UI_CTRL, __pCellsArray != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+ SysTryCatch(NID_UI_CTRL, __pStretchableRowIndex != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
for (int i = 0; i < rowCount; i++)
{
}
__pStretchableColumnIndex = new (std::nothrow) bool[columnCount];
- SysTryReturn(NID_UI_CTRL, __pCellsArray != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+ SysTryCatch(NID_UI_CTRL, __pStretchableColumnIndex != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
for (int i = 0; i < columnCount; i++)
{
}
delete[] __pCellsArray;
+ delete[] __pStretchableRowIndex;
+ delete[] __pStretchableColumnIndex;
+
delete __pSystemControl;
__pSystemControl = null;
{
FloatRectangle rect = GetBoundsAt(rowIndex, columnIndex);
_Control* pControl = GetControlCoreAt(rowIndex, columnIndex);
-#if 1 //New Algorithm
+
if (pControl)
{
FloatRectangle controlRect = pControl->GetBoundsF();
r = SetChildBounds(*pControl, rowIndex, columnIndex, FloatRectangle(controlRect.x, controlRect.y, rect.width, rect.height));
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
}
-
-#else
-
- rect.x += __pCellsArray[rowIndex][columnIndex].cellMargin.left;
- rect.y += __pCellsArray[rowIndex][columnIndex].cellMargin.top;
- rect.width -= (__pCellsArray[rowIndex][columnIndex].cellMargin.left + __pCellsArray[rowIndex][columnIndex].cellMargin.right);
- rect.height -= (__pCellsArray[rowIndex][columnIndex].cellMargin.top + __pCellsArray[rowIndex][columnIndex].cellMargin.bottom);
-
-
- if (pControl)
- {
- r = pControl->SetBounds(rect);
- SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
- }
-#endif
}
}
if (__style == HEADER_STYLE_BUTTON)
{
- GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
}
else
{
if (__style == HEADER_STYLE_SEGMENTED_WITH_TITLE)
{
- GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
}
else
{
- GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
}
}
if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
|| __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
{
- if (headerItem.GetText() != L"")
+ if (headerItem.GetText() != L"" && __style != HEADER_STYLE_TAB_LARGE)
{
- GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); // 45
}
else
{
- GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
}
Bitmap* pSelectedBitmap = null;
{
if (headerItem.GetText() != L"")
{
- GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
}
else
{
- GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+ GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
}
}
Color focusUiColor = __pProperty->GetBorderColor(isFocused);
pShadowBitmap = Tizen::Graphics::_BitmapImpl::GetColorReplacedBitmapN(*pShadowBitmap, Color::GetColor(COLOR_ID_MAGENTA), focusUiColor);
+ SysTryReturn(NID_UI_CTRL, pShadowBitmap != null, GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pShadowBitmap))
{
pCanvas->DrawBitmap(__pProperty->GetDropShadowBitmapBounds(), *pShadowBitmap);
}
__pFocusVE->SetShowState(true);
- delete pCanvas;
+ delete pShadowBitmap;
}
+ delete pCanvas;
}
else
{
case _KEY_DOWN:
case _KEY_LEFT:
case _KEY_RIGHT:
+ break;
case _KEY_ENTER:
- break;
+ {
+ if (__highlightedIndex != INVALID_INDEX)
+ {
+ PreDrawCheckAnimation(__highlightedIndex);
+ FireEventAfterTouchRelease(__highlightedIndex);
+
+ if (__isTouchAnimationEnabled)
+ {
+ StartSelectAnimation(__highlightedIndex);
+ }
+ else
+ {
+ DrawCheckAnimation(__highlightedIndex);
+ }
+ }
+ }
+ break;
default:
return false;
if (((keyInfo.GetKeyCode() == _KEY_UP) && (__highlightedIndex >= 0 && __highlightedIndex <= GetItemCountPerAxis() - 1)) ||
((keyInfo.GetKeyCode() == _KEY_DOWN) && (__highlightedIndex <= lastItemIndex && __highlightedIndex >= lastLineTopIndex)))
{
+ RedrawItem(__highlightedIndex);
+ __highlightedIndex = INVALID_INDEX;
return false;
}
else if ((keyInfo.GetKeyCode() == _KEY_LEFT && __highlightedIndex == 0) || (keyInfo.GetKeyCode() == _KEY_RIGHT && __highlightedIndex == lastItemIndex))
case _KEY_ENTER:
{
__selectedIndex = __highlightedIndex;
- PreDrawCheckAnimation(__highlightedIndex);
- FireEventAfterTouchRelease(__highlightedIndex);
-
- if (__isTouchAnimationEnabled)
- {
- StartSelectAnimation(__highlightedIndex);
- }
- else
- {
- DrawCheckAnimation(__highlightedIndex);
- }
return true;
}
case _KEY_ENTER:
{
__selectedIndex = __highlightedIndex;
- PreDrawCheckAnimation(__highlightedIndex);
- FireEventAfterTouchRelease(__highlightedIndex);
-
- if (__isTouchAnimationEnabled)
- {
- StartSelectAnimation(__highlightedIndex);
- }
- else
- {
- DrawCheckAnimation(__highlightedIndex);
- }
return true;
}
#include "FUiCtrl_Form.h"
#include "FUiCtrl_Indicator.h"
#include "FUiCtrl_IndicatorManager.h"
+#include "FUiAnim_EflVisualElementSurfaceImpl.h"
using namespace Tizen::Base::Runtime;
using namespace Tizen::Graphics;
return;
}
+ Evas_Object* pPortraitIndicatorEvasObject = (Evas_Object*)ecore_evas_data_get(pEe, pPortPublicKey);
+ Evas_Object* pLandscapeIndicatorEvasObject = (Evas_Object*)ecore_evas_data_get(pEe, pLandPublicKey);
+
if (msgDomain == MSG_DOMAIN_CONTROL_INDICATOR)
{
- /*if (msg_id == MSG_ID_INDICATOR_REPEAT_EVENT)
+ if (msgId == MSG_ID_INDICATOR_REPEAT_EVENT)
{
- int *repeat = static_cast<int*>(data);
- }*/
+ int *repeat = (int*)data;
+ if (1 == *repeat)
+ {
+ if (pPortraitIndicatorEvasObject)
+ {
+ evas_object_repeat_events_set(pPortraitIndicatorEvasObject, EINA_TRUE);
+ }
+ if (pLandscapeIndicatorEvasObject)
+ {
+ evas_object_repeat_events_set(pLandscapeIndicatorEvasObject, EINA_TRUE);
+ }
+ }
+ else
+ {
+ if (pPortraitIndicatorEvasObject)
+ {
+ evas_object_repeat_events_set(pPortraitIndicatorEvasObject, EINA_FALSE);
+ }
+ if (pLandscapeIndicatorEvasObject)
+ {
+ evas_object_repeat_events_set(pLandscapeIndicatorEvasObject, EINA_FALSE);
+ }
+ }
+ }
+
if (msgId == MSG_ID_INDICATOR_TYPE)
{
_IndicatorTypeMode *pIndicatorTypeMode = (_IndicatorTypeMode*)(data);
}
}
+HitTestResult
+_Indicator::OnHitTest(const Tizen::Graphics::FloatPoint& point)
+{
+ if (!IsVisible())
+ {
+ return HIT_TEST_NOWHERE;
+ }
+
+ if (!GetBounds().Contains(point))
+ {
+ return HIT_TEST_NOWHERE;
+ }
+
+ _VisualElementImpl* pImpl = _VisualElementImpl::GetInstance(*this->__pCurrentVisualElement);
+ _EflVisualElementSurfaceImpl* pSurface = dynamic_cast<_EflVisualElementSurfaceImpl*>(_VisualElementSurfaceImpl::GetInstance(*pImpl->GetNativeNode()->GetSurface()));
+ Evas_Object* pImageObject = (Evas_Object*)pSurface->GetNativeHandle();
+
+ if (!evas_object_repeat_events_get(pImageObject))
+ return HIT_TEST_MATCH;
+ else
+ return HIT_TEST_NOWHERE;
+}
+
}}} // Tizen::Ui::Controls
#include "FUiCtrl_IndicatorManager.h"
#include "FUiCtrl_Form.h"
#include "FUiCtrl_Frame.h"
+#include "FUiCtrl_Popup.h"
+#include "FUiCtrl_Keypad.h"
using namespace Tizen::Base::Collection;
using namespace Tizen::Graphics;
{
result r = E_SUCCESS;
+ _Frame* pFrame = dynamic_cast<_Frame*>(pWindow);
+ _Popup* pPopup = dynamic_cast<_Popup*>(pWindow);
+ _Keypad* pKeypad = dynamic_cast<_Keypad*>(pWindow);
+
+ if ((pFrame == null) && (pPopup == null) && (pKeypad ==null))
+ {
+ return E_SUCCESS;
+ }
IndicatorComponent* pIndicatorComponentArray = MakeIndicatorComponentArrayN(pWindow);
result r = E_SUCCESS;
IndicatorComponent* pIndicatorComponentArray = null;
+ _Frame* pFrame = dynamic_cast<_Frame*>(pWindow);
+ _Popup* pPopup = dynamic_cast<_Popup*>(pWindow);
+ _Keypad* pKeypad = dynamic_cast<_Keypad*>(pWindow);
+
+ if ((pFrame == null) && (pPopup == null) && (pKeypad ==null))
+ {
+ return E_SUCCESS;
+ }
r = __indicatorMap.GetValue(pWindow, pIndicatorComponentArray);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS && pIndicatorComponentArray, r, r, "[%s] Propagating.", GetErrorMessage(r));
isClipboardExist = __pChildEdit->IsClipboardExist();
}
- if ((isClipboardExist && layoutChangeState == LAYOUT_CHANGE_ROTATE))
- {
- return E_SUCCESS;
- }
-
if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
{
bounds.width = screenSize.width;
{
GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorHeight);
}
- else
- {
- GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, GetOrientation(), indicatorHeight);
- }
SetResizable(true);
SetMovable(true);
editRect.height -= indicatorHeight;
editRect.height -= footerHeight;
- if ( isKeypadExist || isClipboardExist)
+ if ((isClipboardExist && layoutChangeState == LAYOUT_CHANGE_ROTATE))
+ {
+ ;
+ }
+ else
{
- if (isKeypadExist)
+ if ( isKeypadExist || isClipboardExist)
{
- r = __pChildEdit->GetKeypadBounds(keypadRect);
- SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
- }
+ if (isKeypadExist)
+ {
+ r = __pChildEdit->GetKeypadBounds(keypadRect);
+ SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+ }
- if (isClipboardExist)
- {
- clipboardHeight = __pChildEdit->GetClipboardHeight();
- }
+ if (isClipboardExist)
+ {
+ clipboardHeight = __pChildEdit->GetClipboardHeight();
+ }
- if (clipboardHeight > keypadRect.height)
- {
- editRect.height -= clipboardHeight;
- }
- else
- {
- editRect.height -= keypadRect.height;
+ if (clipboardHeight > keypadRect.height)
+ {
+ editRect.height -= clipboardHeight;
+ }
+ else
+ {
+ editRect.height -= keypadRect.height;
+ }
}
}
void
_Keypad::OnDraw(void)
{
- Canvas* pCanvas = GetCanvasN();
- SysTryReturnVoidResult(NID_UI_CTRL, pCanvas, E_SYSTEM, "[E_SYSTEM] System error occurred.");
-
Color backgroundColor;
GET_COLOR_CONFIG(EDIT::BG_NORMAL, backgroundColor);
-
- pCanvas->SetBackgroundColor(backgroundColor);
- pCanvas->Clear();
- delete pCanvas;
+ SetBackgroundColor(backgroundColor);
return;
}
pArrowBitmap = null;
}
- arrowbounds = FloatRectangle(bounds.x + bounds.width - __arrowMargin - __rightMargin,
- (__itemHeight - __pArrowBitmap->GetHeight())/2.0f, __pArrowBitmap->GetWidth(), __pArrowBitmap->GetHeight());
-
if (__pArrowLabel == null)
{
__pArrowLabel = _Label::CreateLabelN();
SysTryCatch(NID_UI_CTRL, (__pArrowLabel != null), , r, "[%s] Propagating.", GetErrorMessage(r));
- __pArrowLabel->SetBounds(FloatRectangle(arrowbounds));
-
AttachChild(*__pArrowLabel);
_AccessibilityContainer* pContainer = __pArrowLabel->GetAccessibilityContainer();
}
}
+ arrowbounds = FloatRectangle(bounds.x + bounds.width - __arrowMargin - __rightMargin,
+ (__itemHeight - __pArrowBitmap->GetHeight())/2.0f, __pArrowBitmap->GetWidth(), __pArrowBitmap->GetHeight());
+ __pArrowLabel->SetBounds(FloatRectangle(arrowbounds));
+
if (__selected == true)
{
if (__pArrowPressedBitmap)
void
_OptionMenuItem::DrawItemUpperDivider(void)
{
+ FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f);
+ Color dividerLineColor(0, 0, 0, 0);
+
if (__pUpperDividerLineLabel == null)
{
__pUpperDividerLineLabel = _Label::CreateLabelN();
SysTryReturnVoidResult(NID_UI_CTRL, __pUpperDividerLineLabel, E_OUT_OF_MEMORY, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
- FloatRectangle bounds = GetBoundsF();
- __pUpperDividerLineLabel->SetBounds(FloatRectangle(__leftMargin, 0.0f, bounds.width - __leftMargin - __rightMargin, __dividerHeight));
-
AttachChild(*__pUpperDividerLineLabel);
_AccessibilityContainer* pContainer = __pUpperDividerLineLabel->GetAccessibilityContainer();
}
}
- Color dividerLineColor = Color(0, 0, 0, 0);
+ bounds = GetBoundsF();
if (__selected == false)
{
dividerLineColor = __upperDividerLineColor;
}
+ __pUpperDividerLineLabel->SetBounds(FloatRectangle(__leftMargin, 0.0f, bounds.width - __leftMargin - __rightMargin, __dividerHeight));
__pUpperDividerLineLabel->SetBackgroundColor(dividerLineColor);
__pUpperDividerLineLabel->Invalidate();
}
void
_OptionMenuItem::DrawItemLowerDivider(void)
{
+ FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f);
+ Color dividerLineColor(0, 0, 0, 0);
+
if (__pLowerDividerLineLabel == null)
{
__pLowerDividerLineLabel = _Label::CreateLabelN();
SysTryReturnVoidResult(NID_UI_CTRL, __pLowerDividerLineLabel, E_OUT_OF_MEMORY, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
- FloatRectangle bounds = GetBoundsF();
- __pLowerDividerLineLabel->SetBounds(FloatRectangle(__leftMargin, bounds.height - __dividerHeight, bounds.width - __leftMargin - __rightMargin, __dividerHeight));
-
AttachChild(*__pLowerDividerLineLabel);
_AccessibilityContainer* pContainer = __pLowerDividerLineLabel->GetAccessibilityContainer();
}
}
- Color dividerLineColor = Color(0, 0, 0, 0);
+ bounds = GetBoundsF();
if (__selected == false)
{
dividerLineColor = __lowerDividerLineColor;
}
+ __pLowerDividerLineLabel->SetBounds(FloatRectangle(__leftMargin, bounds.height - __dividerHeight, bounds.width - __leftMargin - __rightMargin, __dividerHeight));
__pLowerDividerLineLabel->SetBackgroundColor(dividerLineColor);
__pLowerDividerLineLabel->Invalidate();
}
}
_OptionMenuItem*
-_OptionMenuPresenter::CreateItem(const String& text, int actionId, const Bitmap* pNormalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenuPresenter::CreateItem(const String& text, int actionId, const Bitmap* pNormalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap, bool isSubItem)
{
_OptionMenuItem* pItem = _OptionMenuItem::CreateOptionMenuItemN();
SysTryReturn(NID_UI_CTRL, pItem != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
textArea.width += 2.0f * labelLeftMargin;
textArea.height += 2.0f * labelTopMargin;
itemSize.height = __itemHeight + (__dividerHeight * 2.0f);
+ itemSize.width = __leftMargin + textArea.width + __rightMargin;
+
if (itemType == OPTION_MENU_ITEM_DRAWING_TYPE_BITMAP)
{
bitmapWidth = __itemBitmapWidth;
- itemSize.width = textArea.width + bitmapWidth + labelLeftMargin;
- }
- else
- {
- itemSize.width = textArea.width;
+ itemSize.width = itemSize.width + bitmapWidth;
}
itemSize.width = itemSize.width < __itemMinWidth ? __itemMinWidth : itemSize.width;
}
pItem->SetTextLabel(pLabel);
- __itemWidth = __itemWidth < itemSize.width ? itemSize.width : __itemWidth;
+ if (!isSubItem)
+ {
+ __itemWidth = __itemWidth < itemSize.width ? itemSize.width : __itemWidth;
+ }
pItem->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
return pItem;
_OptionMenuPresenter::AddItem(const String& text, int actionId, const Bitmap* normalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
{
_OptionMenuItem* pItem = CreateItem(text, actionId, normalBitmap, pPressedBitmap, pHighlightedBitmap);
- SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
+ SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
result r = __pModel->AddItem(pItem);
{
SysTryReturn(NID_UI_CTRL, mainIndex >=0 && mainIndex < __pModel->GetItemCount(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid mainIndex %d.", mainIndex);
- _OptionMenuItem* pItem = CreateItem(text, actionId, null, null, null);
+ _OptionMenuItem* pItem = CreateItem(text, actionId, null, null, null, true);
SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
result r = __pModel->AddItem(pItem, mainIndex);
SysTryReturn(NID_UI_CTRL, mainIndex >=0 && mainIndex < __pModel->GetItemCount(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid mainIndex %d.", mainIndex);
SysTryReturn(NID_UI_CTRL, subIndex >=0 && subIndex <= __pModel->GetSubItemCount(mainIndex), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid subIndex %d.", subIndex);
- _OptionMenuItem* pItem = CreateItem(text, actionId, null, null, null);
+ _OptionMenuItem* pItem = CreateItem(text, actionId, null, null, null, true);
SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
result r = __pModel->InsertItemAt(pItem, mainIndex, subIndex);
{
SysTryReturn(NID_UI_CTRL, index >=0 && index < __pModel->GetItemCount(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid mainIndex %d.", index);
- return __pModel->SetItemAt(index, text, actionId, normalBitmap, pPressedBitmap, pHighlightedBitmap, __itemFontSize);
+ result r = __pModel->SetItemAt(index, text, actionId, normalBitmap, pPressedBitmap, pHighlightedBitmap, __itemFontSize);
+ SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
+ _OptionMenuItem* pItem = __pModel->GetItem(index);
+
+ if (pItem == null)
+ {
+ SysLog(NID_UI_CTRL, "Item is null.");
+ return r;
+ }
+
+ float bitmapWidth = 0.0f;
+ FloatDimension textArea(0.0f, 0.0f);
+ FloatDimension itemSize(0.0f, 0.0f);
+
+ __pFont->GetTextExtent(text, text.GetLength(), textArea);
+
+ float labelLeftMargin = 0.0f;
+
+ GET_SHAPE_CONFIG(LABEL::LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, labelLeftMargin);
+
+ textArea.width += 2.0f * labelLeftMargin;
+ itemSize.width = __leftMargin + textArea.width + __rightMargin;
+
+ if (pItem->GetType() == OPTION_MENU_ITEM_DRAWING_TYPE_BITMAP)
+ {
+ bitmapWidth = __itemBitmapWidth;
+ itemSize.width = itemSize.width + bitmapWidth;
+ }
+
+ itemSize.width = itemSize.width < __itemMinWidth ? __itemMinWidth : itemSize.width;
+
+ if (itemSize.width > __itemMaxWidth)
+ {
+ textArea.width -= itemSize.width - __itemMaxWidth;
+ itemSize.width = __itemMaxWidth;
+ }
+
+ pItem->SetSize(itemSize);
+
+ __itemWidth = __itemWidth < itemSize.width ? itemSize.width : __itemWidth;
+
+ return r;
}
result
// Draw Title
if (__pPopup->HasTitle())
{
- const Bitmap* pTitleBitmap = __pPopup->GetTitleBackgroundBitmap();
- const Bitmap* pTitleEffectBitmap = __pPopup->GetTitleBackgroundEffectBitmap();
-
- //DrawTitleBG
- if(pTitleBitmap != null)
+ if (__pPopup->GetColor() != Color(0x00000000))
{
- if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleBitmap))
- {
- pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleBitmap);
- }
- else
- {
- pCanvas->DrawBitmap(_titleBgBounds, *pTitleBitmap);
- }
- }
+ const Bitmap* pTitleBitmap = __pPopup->GetTitleBackgroundBitmap();
+ const Bitmap* pTitleEffectBitmap = __pPopup->GetTitleBackgroundEffectBitmap();
- //DrawEffectTitleBitmap
- if (pTitleEffectBitmap != null)
- {
- if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleEffectBitmap))
+ //DrawTitleBG
+ if(pTitleBitmap != null)
{
- pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleEffectBitmap);
+ if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleBitmap))
+ {
+ pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleBitmap);
+ }
+ else
+ {
+ pCanvas->DrawBitmap(_titleBgBounds, *pTitleBitmap);
+ }
}
- else
+
+ //DrawEffectTitleBitmap
+ if (pTitleEffectBitmap != null)
{
- pCanvas->DrawBitmap(_titleBgBounds, *pTitleEffectBitmap);
+ if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pTitleEffectBitmap))
+ {
+ pCanvas->DrawNinePatchedBitmap(_titleBgBounds, *pTitleEffectBitmap);
+ }
+ else
+ {
+ pCanvas->DrawBitmap(_titleBgBounds, *pTitleEffectBitmap);
+ }
}
}
// Draw Outline
if (!isCustomBitmap && __pPopup->GetOutlineBitmap() != null &&
_FloatCompareGE(pBounds.width, minSize.width) &&
- _FloatCompareGE(pBounds.height, minSize.height))
+ _FloatCompareGE(pBounds.height, minSize.height) && __pPopup->GetColor() != Color(0x00000000))
{
FloatRectangle bounds(0.0f,
0.0f,
void
_ScrollPanel::OnChildControlFocusMoved(const _Control& control)
{
+ ClearLastResult();
+
__pScrollPanelPresenter->OnChildControlFocusMoved(control);
}
+void
+_ScrollPanel::OnDescendantControlFocusMoved(const _Control& control)
+{
+ ClearLastResult();
+
+ __pScrollPanelPresenter->OnDescendantControlFocusMoved(control);
+}
+
bool
_ScrollPanel::OnAccessibilityItemRefreshed(const _AccessibilityContainer& control, const _AccessibilityElement& element, _AccessibilityFocusDirection direction)
{
__pScrollPanelPresenter->SetHorizontalScrollPosition(position);
}
+float
+_ScrollPanel::CalculatePagingScrollPosition(float position) const
+{
+ ClearLastResult();
+
+ return __pScrollPanelPresenter->CalculatePagingScrollPosition(position);
+}
+
bool
_ScrollPanel::ScrollToControl(const _Control& source, bool recursive)
{
_ScrollPanelPresenter::_ScrollPanelPresenter(void)
: __pScrollPanel(null)
, __pScrollPanelModel(null)
+ , __limitAnimationDistance(0.0f)
, __pPressedControl(null)
, __subControlMoved(false)
, __touchPressed(false)
if (__pScrollPanel->IsPageScrollEnabled() && !__flickRunning && !__jumpToTopRunning)
{
- float currentPosition = 0.0f;
- float maxPosition = 0.0f;
- float pageSize = 0.0f;
-
- if (__pScrollPanel->GetScrollDirection() == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
- {
- pageSize = __pScrollPanel->GetPageScrollAlignSize().width;
- maxPosition = GetScrollAreaBounds().width - __pScrollPanel->GetBoundsF().width;
- currentPosition = GetHorizontalScrollPosition();
- }
- else
- {
- pageSize = __pScrollPanel->GetPageScrollAlignSize().height;
- maxPosition = GetScrollAreaBounds().height - __pScrollPanel->GetBoundsF().height;
- currentPosition = GetVerticalScrollPosition();
- }
-
- float targetPosition = 0.0f;
- int lowerPageIndex = currentPosition / pageSize;
- float currentPageMin = pageSize * lowerPageIndex;
- float pageGap = currentPosition - currentPageMin;
- float currentPageMax = currentPageMin + pageSize;
- if (currentPageMax > maxPosition)
- {
- currentPageMax = maxPosition;
- }
-
- if (pageGap <= currentPageMax - currentPageMin - pageGap)
- {
- targetPosition = currentPageMin;
- }
- else
- {
- targetPosition = currentPageMax;
- }
+ float currentPosition = GetScrollPosition();
+ float targetPosition = CalculatePagingScrollPosition(currentPosition);
if (!_FloatCompare(targetPosition, currentPosition))
{
}
}
- ScrollTo(targetPosition, true);
+ FlickTo(targetPosition, gesture.GetDuration());
result r = GetLastResult();
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, false, r, "[%s] Propagating.", GetErrorMessage(r));
bool
_ScrollPanelPresenter::IsControlOutOfView(const _Control& control) const
{
- FloatRectangle controlBounds = control.GetBoundsF();
- float scrollPosition = __pScrollPanel->GetScrollPosition();
+ FloatRectangle controlBounds = control.GetAbsoluteBoundsF();
+ FloatRectangle scrollPanelBounds = __pScrollPanel->GetAbsoluteBoundsF();
// is control out of view area
if (__pScrollPanel->GetScrollDirection() == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
{
- if (controlBounds.x < scrollPosition || controlBounds.x + controlBounds.width > scrollPosition + __pScrollPanel->GetBoundsF().width)
+ if (controlBounds.x < scrollPanelBounds.x || controlBounds.x + controlBounds.width > scrollPanelBounds.x + scrollPanelBounds.width)
{
return true;
}
}
else
{
- if (controlBounds.y < scrollPosition || controlBounds.y + controlBounds.height > scrollPosition + __pScrollPanel->GetBoundsF().height)
+ if (controlBounds.y < scrollPanelBounds.y || controlBounds.y + controlBounds.height > scrollPanelBounds.y + scrollPanelBounds.height)
{
return true;
}
{
if (IsControlOutOfView(control))
{
- ScrollToControl(control, false);
+ ScrollToControl(control, true);
result r = GetLastResult();
SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
}
}
+float
+_ScrollPanelPresenter::CalculatePagingScrollPosition(float position) const
+{
+ float maxPosition = 0.0f;
+ float pageSize = 0.0f;
+
+ if (__pScrollPanel->GetScrollDirection() == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
+ {
+ pageSize = __pScrollPanel->GetPageScrollAlignSize().width;
+ maxPosition = GetScrollAreaBounds().width - __pScrollPanel->GetBoundsF().width;
+ }
+ else
+ {
+ pageSize = __pScrollPanel->GetPageScrollAlignSize().height;
+ maxPosition = GetScrollAreaBounds().height - __pScrollPanel->GetBoundsF().height;
+ }
+
+ float targetPosition = 0.0f;
+ int lowerPageIndex = position / pageSize;
+ float currentPageMin = pageSize * lowerPageIndex;
+ float pageGap = position - currentPageMin;
+ float currentPageMax = currentPageMin + pageSize;
+ if (currentPageMax > maxPosition)
+ {
+ currentPageMax = maxPosition;
+ }
+
+ if (pageGap <= currentPageMax - currentPageMin - pageGap)
+ {
+ targetPosition = currentPageMin;
+ }
+ else
+ {
+ targetPosition = currentPageMax;
+ }
+
+ return targetPosition;
+}
+
void
_ScrollPanelPresenter::RollbackBouncing(bool withAnimation)
{
ScrollToControlWhenOutOfView(control);
}
+void
+_ScrollPanelPresenter::OnDescendantControlFocusMoved(const _Control& control)
+{
+ ScrollToControlWhenOutOfView(control);
+}
+
bool
_ScrollPanelPresenter::OnAccessibilityItemRefreshed(const _AccessibilityContainer& control, const _AccessibilityElement& element, _AccessibilityFocusDirection direction)
{
_ScrollPanel* pScrollPanelParent = dynamic_cast<_ScrollPanel*> (pParent);
if (pScrollPanelParent != null)
{
- pScrollPanelParent->SetScrollPosition(controlPosition, false);
+ FloatDimension pagingGap(0.0f, 0.0f);
+ if (pScrollPanelParent->IsPageScrollEnabled())
+ {
+ FloatPoint pagingPosition = controlPosition;
+ if (pScrollPanelParent->GetScrollDirection() == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
+ {
+ pagingPosition.x = pScrollPanelParent->CalculatePagingScrollPosition(controlPosition.x);
+ pagingGap.width = controlPosition.x - pagingPosition.x;
+ if (pagingGap.width < 0.0f)
+ {
+ pagingPosition.x -= pScrollPanelParent->GetPageScrollAlignSize().width;
+ pagingGap.width += pScrollPanelParent->GetPageScrollAlignSize().width;
+ }
+ }
+ else
+ {
+ pagingPosition.y = pScrollPanelParent->CalculatePagingScrollPosition(controlPosition.y);
+ pagingGap.height = controlPosition.y - pagingPosition.y;
+ if (pagingGap.height < 0.0f)
+ {
+ pagingPosition.y -= pScrollPanelParent->GetPageScrollAlignSize().height;
+ pagingGap.height += pScrollPanelParent->GetPageScrollAlignSize().height;
+ }
+ }
- controlPosition.x -= pScrollPanelParent->GetHorizontalScrollPosition();
- controlPosition.y -= pScrollPanelParent->GetVerticalScrollPosition();
+ pScrollPanelParent->SetScrollPosition(pagingPosition, false);
+ }
+ else
+ {
+ pScrollPanelParent->SetScrollPosition(controlPosition, false);
+ }
+
+ controlPosition.x -= pScrollPanelParent->GetHorizontalScrollPosition() + pagingGap.width;
+ controlPosition.y -= pScrollPanelParent->GetVerticalScrollPosition() + pagingGap.height;
}
FloatPoint parentPosition = pParent->GetPositionF();
}
}
+ if (__pScrollPanel->IsPageScrollEnabled())
+ {
+ FloatPoint pagingPosition = controlPosition;
+ if (__pScrollPanel->GetScrollDirection() == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
+ {
+ pagingPosition.x = CalculatePagingScrollPosition(controlPosition.x);
+ if (pagingPosition.x > controlPosition.x)
+ {
+ controlPosition.x = pagingPosition.x - __pScrollPanel->GetPageScrollAlignSize().width;
+ }
+ else
+ {
+ controlPosition.x = pagingPosition.x;
+ }
+ }
+ else
+ {
+ pagingPosition.y = CalculatePagingScrollPosition(controlPosition.y);
+ if (pagingPosition.y > controlPosition.y)
+ {
+ controlPosition.y = pagingPosition.y - __pScrollPanel->GetPageScrollAlignSize().height;
+ }
+ else
+ {
+ controlPosition.y = pagingPosition.y;
+ }
+ }
+ }
SetScrollPosition(controlPosition, true);
result r = GetLastResult();
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, false, r, "[%s] Propagating.", GetErrorMessage(r));
return false;
}
+
+float
+_ScrollPanelPresenter::FlickTo(float targetPosition, float duration)
+{
+ return ScrollTo(targetPosition, true);
+}
+
}}} // Tizen::Ui::Controls
, __isFocusCallbackToBeFired(true)
, __isButtonTextChangedByApp(false)
, __contentVisibilitySetByApp(true)
+ , __isInFocusMode(false)
, __keypadAction(CORE_KEYPAD_ACTION_SEARCH)
, __pBackgroundBitmap(null)
, __backgroundColor(Color())
__pSearchBarPresenter = pPresenter;
- CreateAccessibilityElement();
- AttachChildContainers();
+ InitializeAccessibility();
r = _SettingInfoImpl::AddSettingEventListener(*this);
SysTryCatch(NID_UI, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
result
_SearchBar::SetMode(SearchBarMode mode)
{
+ _AccessibilityElement* pEditElement = __pEdit->GetTextAccessibilityElement();
if (mode == SEARCH_BAR_MODE_NORMAL)
{
- __pEdit->GetAccessibilityContainer()->Activate(false);
- __pCancelButton->GetAccessibilityContainer()->Activate(false);
- GetAccessibilityContainer()->Activate(true);
+ pEditElement->SetHint("Double Tap To Type Search Text");
}
+ else
+ {
+ pEditElement->SetHint("Enter Search Text");
+ }
+
+ pEditElement->SetTrait("SearchBar");
+ pEditElement->SetName("SearchField");
return __pSearchBarPresenter->SetMode(mode);
}
return _UI_TOUCH_EVENT_DELIVERY_YES;
}
- __pEdit->SetSearchFieldFocus(false);
SetContentAreaVisible(__contentVisibilitySetByApp); //When a touch happens on SearchField
SetFocusCallbackParameter(true);
SetMode(SEARCH_BAR_MODE_INPUT);
void
_SearchBar::OnDrawFocus(void)
{
+ __isInFocusMode = true;
__pEdit->SetSearchFieldFocus(true);
_Control::OnDrawFocus();
void
_SearchBar::OnFocusModeStateChanged(void)
{
+ __isInFocusMode = false;
+ __pEdit->SetSearchFieldFocus(false);
+ __pEdit->Invalidate();
+
return;
}
switch (keyCode)
{
+ case _KEY_UP:
+ case _KEY_DOWN:
case _KEY_TAB:
SetFocusCallbackParameter(true);
if ((__pContentControl && __pContentControl->IsVisible() == false) || !__pContentControl)
return false;
}
- if (!__pEdit->IsSearchFieldFocused())
+ if (!__isInFocusMode)
{
return false;
}
return __pSearchBarPresenter->OnCanvasRequestedN(bounds);
}
-bool
-_SearchBar::OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- if (__pAccessibilitySearchBarElement == &element)
- {
- SetMode(SEARCH_BAR_MODE_INPUT);
- __pEdit->GetAccessibilityContainer()->Activate(true);
- __pCancelButton->GetAccessibilityContainer()->Activate(true);
- GetAccessibilityContainer()->Activate(false);
- }
-
- _AccessibilityElement* pEditElement = __pEdit->GetTextAccessibilityElement();
- _AccessibilityManager* pAccessibilityManager = _AccessibilityManager::GetInstance();
- pAccessibilityManager->SetGlobalFocusedElement(*pEditElement);
- pAccessibilityManager->RequestToDrawFocusUi();
-
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
-bool
-_SearchBar::OnAccessibilityValueDecreased(const _AccessibilityContainer& control, const _AccessibilityElement& element)
-{
- return false;
-}
-
_Control*
_SearchBar::GetParentForm(void) const
{
__pClippedGroupControl = null;
return r;
-
}
void
-_SearchBar::CreateAccessibilityElement(void)
+_SearchBar::InitializeAccessibility(void)
{
- if (__pAccessibilitySearchBarElement != null)
- {
- return;
- }
-
- _AccessibilityContainer* pContainer = null;
- pContainer = GetAccessibilityContainer();
-
- if (pContainer)
- {
- __pAccessibilitySearchBarElement = new (std::nothrow) _AccessibilityElement(true);
- SysTryReturnVoidResult(NID_UI_CTRL, __pAccessibilitySearchBarElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Failed to allocate memory.");
- __pAccessibilitySearchBarElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
- __pAccessibilitySearchBarElement->SetTrait(ACCESSIBILITY_TRAITS_NONE);
- __pAccessibilitySearchBarElement->SetName("SearchBar");
- __pAccessibilitySearchBarElement->SetHint("Double Tap To Enter Search Text");
- pContainer->AddElement(*__pAccessibilitySearchBarElement);
- pContainer->AddListener(*this);
- }
-
- return;
-}
-
-void
-_SearchBar::AttachChildContainers(void)
-{
- _AccessibilityContainer* pContainer = null;
- pContainer = GetAccessibilityContainer();
+ _AccessibilityContainer* pSBContainer = null;
+ pSBContainer = GetAccessibilityContainer();
_AccessibilityContainer* pEditContainer = null;
pEditContainer = __pEdit->GetAccessibilityContainer();
-
- pContainer->AddChildContainer(*pEditContainer);
- pEditContainer->Activate(false);
+ pSBContainer->AddChildContainer(*pEditContainer);
_AccessibilityContainer* pButtonContainer = null;
pButtonContainer = __pCancelButton->GetAccessibilityContainer();
if (__isUsableCancelButton)
{
- pContainer->AddChildContainer(*pButtonContainer);
- pButtonContainer->Activate(false);
+ pSBContainer->AddChildContainer(*pButtonContainer);
}
+ _AccessibilityElement* pEditElement = __pEdit->GetTextAccessibilityElement();
+
+ pEditElement->SetHint("Double Tap To Type Search Text");
+ pEditElement->SetTrait("SearchBar");
+ pEditElement->SetName("SearchField");
+
+ pSBContainer->Activate(false);
+
return;
}
#include "FUiCtrl_SliderPresenter.h"
#include "FUiCtrl_IAdjustmentEventListener.h"
#include "FUiCtrl_ISliderEventListener.h"
+#include "FUiCtrl_SliderOverlay.h"
using namespace Tizen::Ui;
using namespace Tizen::Base;
, __pBase(null)
, __pHandle(null)
, __pAccessibilityElement(null)
+ , __isKeyPressed(false)
{
__pBase = GetVisualElement();
}
bool
+_Slider::IsKeyPressed() const
+{
+ return __isKeyPressed;
+}
+
+bool
_Slider::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
{
if(__pSliderPresenter->GetFocusMode() == false)
if (keyCode == _KEY_RIGHT)
{
SetValue(GetValue() + 1);
- FireSliderMoveEvent(GetValue());
+ FireSliderMoveEvent(GetValue());
+
+ if (GetStyle() & _SLIDER_STYLE_OVERLAY)
+ {
+ _SliderOverlay* pSliderOverlay = __pSliderPresenter->GetSliderOverlay();
+ pSliderOverlay->SetVisibleState(true);
+ pSliderOverlay->Open();
+ __isKeyPressed = true;
+ }
+
Invalidate();
- return true;
+ return true;
}
if (keyCode == _KEY_LEFT)
{
SetValue(GetValue() - 1);
- FireSliderMoveEvent(GetValue());
+ FireSliderMoveEvent(GetValue());
+
+ if (GetStyle() & _SLIDER_STYLE_OVERLAY)
+ {
+ _SliderOverlay* pSliderOverlay = __pSliderPresenter->GetSliderOverlay();
+ pSliderOverlay->SetVisibleState(true);
+ pSliderOverlay->Open();
+ __isKeyPressed = true;
+ }
+
+ Invalidate();
+ return true;
+ }
+
+ return false;
+}
+
+bool
+_Slider::OnKeyReleased(const _Control &source, const _KeyInfo &keyInfo)
+{
+ if(__pSliderPresenter->GetFocusMode() == false)
+ {
+ return false;
+ }
+
+ _KeyCode keyCode = keyInfo.GetKeyCode();
+
+ if (keyCode == _KEY_LEFT || keyCode == _KEY_RIGHT)
+ {
+ if (GetStyle() & _SLIDER_STYLE_OVERLAY)
+ {
+ _SliderOverlay* pSliderOverlay = __pSliderPresenter->GetSliderOverlay();
+ pSliderOverlay->SetVisibleState(false);
+ pSliderOverlay->Close();
+ }
+
+ __isKeyPressed = false;
Invalidate();
return true;
}
r = DrawSliderBar(*pCanvas);
SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
- if (__isSliderPressed == true)
+ if (__isSliderPressed == true || __pSlider->IsKeyPressed())
{
if (style & _SLIDER_STYLE_OVERLAY)
{
return iconBounds;
}
+_SliderOverlay*
+_SliderPresenter::GetSliderOverlay(void) const
+{
+ return __pSliderOverlay;
+}
+
bool
_SliderPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
{
r = GetLastResult();
SysTryCatch(NID_UI_CTRL, __pSecondPaneParent != null, , r, "[%s] Propagating.", GetErrorMessage(r));
+ __pFirstPaneParent->SetFocusable(false);
+ __pSecondPaneParent->SetFocusable(false);
+
__pFirstPaneParent->SetBackgroundColor(Color(0,0,0,0));
__pSecondPaneParent->SetBackgroundColor(Color(0,0,0,0));
GET_COLOR_CONFIG(TABBAR::ITEM_BG_NORMAL, __itemColor[ITEM_STATUS_NORMAL]);
GET_COLOR_CONFIG(TABBAR::ITEM_BG_SELECTED, __itemColor[ITEM_STATUS_SELECTED]);
- GET_COLOR_CONFIG(TABBAR::ITEM_BG_PRESSED, __itemColor[ITEM_STATUS_HIGHLIGHTED]);
+ GET_COLOR_CONFIG(TABBAR::ITEM_BG_PRESSED, __itemColor[ITEM_STATUS_PRESSED]);
+ GET_COLOR_CONFIG(TABBAR::ITEM_BG_DISABLED, __itemColor[ITEM_STATUS_DISABLED]);
GET_COLOR_CONFIG(TABBAR::ITEM_TEXT_NORMAL, __itemTextColor[ITEM_STATUS_NORMAL]);
GET_COLOR_CONFIG(TABBAR::ITEM_TEXT_SELECTED, __itemTextColor[ITEM_STATUS_SELECTED]);
- GET_COLOR_CONFIG(TABBAR::ITEM_TEXT_PRESSED, __itemTextColor[ITEM_STATUS_HIGHLIGHTED]);
+ GET_COLOR_CONFIG(TABBAR::ITEM_TEXT_PRESSED, __itemTextColor[ITEM_STATUS_PRESSED]);
GET_COLOR_CONFIG(TABBAR::ITEM_TEXT_DISABLED, __itemTextColor[ITEM_STATUS_DISABLED]);
}
}
result
-_TabBar::SetPropertyHighlightedItemColor(const Variant& color)
+_TabBar::SetPropertyPressedItemColor(const Variant& color)
{
result r = E_SUCCESS;
- r = __pTabBarPresenter->SetItemReplacementColor(ITEM_STATUS_HIGHLIGHTED, color.ToColor());
+ r = __pTabBarPresenter->SetItemReplacementColor(ITEM_STATUS_PRESSED, color.ToColor());
if (r == E_SUCCESS)
{
- __itemColor[ITEM_STATUS_HIGHLIGHTED] = color.ToColor();
+ __itemColor[ITEM_STATUS_PRESSED] = color.ToColor();
}
return r;
}
Variant
-_TabBar::GetPropertyHighlightedItemColor(void) const
+_TabBar::GetPropertyPressedItemColor(void) const
{
- return Tizen::Ui::Variant(__itemColor[ITEM_STATUS_HIGHLIGHTED]);
+ return Tizen::Ui::Variant(__itemColor[ITEM_STATUS_PRESSED]);
+}
+
+result
+_TabBar::SetPropertyDisabledItemColor(const Variant& color)
+{
+ result r = E_SUCCESS;
+
+ r = __pTabBarPresenter->SetItemReplacementColor(ITEM_STATUS_DISABLED, color.ToColor());
+ if (r == E_SUCCESS)
+ {
+ __itemColor[ITEM_STATUS_DISABLED] = color.ToColor();
+ }
+
+ return r;
+}
+
+Variant
+_TabBar::GetPropertyDisabledItemColor(void) const
+{
+ return Tizen::Ui::Variant(__itemColor[ITEM_STATUS_DISABLED]);
}
result
{
r = SetProperty("selectedItemColor", Variant(color));
}
+ else if (itemStatus == ITEM_STATUS_PRESSED)
+ {
+ r = SetProperty("pressedItemColor", Variant(color));
+ }
else
{
- r = SetProperty("highlightedItemColor", Variant(color));
+ r = SetProperty("disabledItemColor", Variant(color));
}
return r;
Variant color = GetProperty("selectedItemColor");
itemColor = color.ToColor();
}
+ else if (itemStatus == ITEM_STATUS_PRESSED)
+ {
+ Variant color = GetProperty("pressedItemColor");
+ itemColor = color.ToColor();
+ }
else
{
- Variant color = GetProperty("highlightedItemColor");
+ Variant color = GetProperty("disabledItemColor");
itemColor = color.ToColor();
}
}
result
-_TabBar::SetPropertyHighlightedItemTextColor(const Variant & color)
+_TabBar::SetPropertyPressedItemTextColor(const Variant & color)
{
- __itemTextColor[ITEM_STATUS_HIGHLIGHTED] = color.ToColor();
+ __itemTextColor[ITEM_STATUS_PRESSED] = color.ToColor();
return E_SUCCESS;
}
Variant
-_TabBar::GetPropertyHighlightedItemTextColor(void) const
+_TabBar::GetPropertyPressedItemTextColor(void) const
{
- return Tizen::Ui::Variant(__itemTextColor[ITEM_STATUS_HIGHLIGHTED]);
+ return Tizen::Ui::Variant(__itemTextColor[ITEM_STATUS_PRESSED]);
}
result
}
else
{
- r = SetProperty("highlightedItemTextColor", Variant(color));
+ r = SetProperty("pressedItemTextColor", Variant(color));
}
if (r != E_SUCCESS)
Variant color = GetProperty("selectedItemTextColor");
itemTextColor = color.ToColor();
}
- else if (status == ITEM_STATUS_HIGHLIGHTED)
+ else if (status == ITEM_STATUS_PRESSED)
{
- Variant color = GetProperty("highlightedItemTextColor");
+ Variant color = GetProperty("pressedItemTextColor");
itemTextColor = color.ToColor();
}
else
if (keyCode == _KEY_RIGHT)
{
- if (__currentHighlightedItemIndex < (itemCount - 1))
+ if (__currentPressedItemIndex < (itemCount - 1))
{
- if (__pTabBarPresenter->GetItemStatus(__currentHighlightedItemIndex) != ITEM_STATUS_SELECTED)
+ if (__pTabBarPresenter->GetItemStatus(__currentPressedItemIndex) != ITEM_STATUS_SELECTED)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_NORMAL);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_NORMAL);
}
- __currentHighlightedItemIndex++;
+ __currentPressedItemIndex++;
- if (__pTabBarPresenter->GetItemStatus(__currentHighlightedItemIndex) != ITEM_STATUS_SELECTED)
+ if (__pTabBarPresenter->GetItemStatus(__currentPressedItemIndex) != ITEM_STATUS_SELECTED)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_HIGHLIGHTED);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_PRESSED);
}
- __pTabBarPresenter->ShiftToFocusedItem(__currentHighlightedItemIndex, _FOCUS_DIRECTION_MOVE_RIGHT);
+ __pTabBarPresenter->ShiftToFocusedItem(__currentPressedItemIndex, _FOCUS_DIRECTION_MOVE_RIGHT);
}
return true;
}
if (keyCode == _KEY_LEFT)
{
- if (__currentHighlightedItemIndex >= -1)
+ if (__currentPressedItemIndex >= -1)
{
- if (__pTabBarPresenter->GetItemStatus(__currentHighlightedItemIndex) != ITEM_STATUS_SELECTED)
+ if (__pTabBarPresenter->GetItemStatus(__currentPressedItemIndex) != ITEM_STATUS_SELECTED)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_NORMAL);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_NORMAL);
}
- if (__currentHighlightedItemIndex == -1)
+ if (__currentPressedItemIndex == -1)
{
- __currentHighlightedItemIndex = 0;
+ __currentPressedItemIndex = 0;
}
- if (__currentHighlightedItemIndex > 0)
+ if (__currentPressedItemIndex > 0)
{
- __currentHighlightedItemIndex--;
+ __currentPressedItemIndex--;
}
- if (__pTabBarPresenter->GetItemStatus(__currentHighlightedItemIndex) != ITEM_STATUS_SELECTED)
+ if (__pTabBarPresenter->GetItemStatus(__currentPressedItemIndex) != ITEM_STATUS_SELECTED)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_HIGHLIGHTED);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_PRESSED);
}
- __pTabBarPresenter->ShiftToFocusedItem(__currentHighlightedItemIndex, _FOCUS_DIRECTION_MOVE_LEFT);
+ __pTabBarPresenter->ShiftToFocusedItem(__currentPressedItemIndex, _FOCUS_DIRECTION_MOVE_LEFT);
}
return true;
}
- if (keyCode == _KEY_ENTER && __currentHighlightedItemIndex != -1)
+ if (keyCode == _KEY_ENTER && __currentPressedItemIndex != -1)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_SELECTED);
- __pTabBarPresenter->SetItemSelected(__currentHighlightedItemIndex);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_SELECTED);
+ __pTabBarPresenter->SetItemSelected(__currentPressedItemIndex);
Invalidate();
return true;
}
{
if (__pTabBarPresenter->GetItemCount() > 0)
{
- __currentHighlightedItemIndex = 0;
+ __currentPressedItemIndex = 0;
}
else
{
- __currentHighlightedItemIndex = -1;
+ __currentPressedItemIndex = -1;
}
- if (__pTabBarPresenter->GetItemStatus(__currentHighlightedItemIndex) != ITEM_STATUS_SELECTED)
+ if (__pTabBarPresenter->GetItemStatus(__currentPressedItemIndex) != ITEM_STATUS_SELECTED)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_HIGHLIGHTED);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_PRESSED);
}
- __pTabBarPresenter->ShiftToFocusedItem(__currentHighlightedItemIndex, _FOCUS_DIRECTION_MOVE_LEFT);
+ __pTabBarPresenter->ShiftToFocusedItem(__currentPressedItemIndex, _FOCUS_DIRECTION_MOVE_LEFT);
__isInFocusMode = true;
return;
void
_TabBar::OnFocusModeStateChanged(void)
{
- if (__pTabBarPresenter->GetItemStatus(__currentHighlightedItemIndex) == ITEM_STATUS_HIGHLIGHTED)
+ if (__pTabBarPresenter->GetItemStatus(__currentPressedItemIndex) == ITEM_STATUS_PRESSED)
{
- __pTabBarPresenter->SetItemStatus(__currentHighlightedItemIndex, ITEM_STATUS_NORMAL);
+ __pTabBarPresenter->SetItemStatus(__currentPressedItemIndex, ITEM_STATUS_NORMAL);
}
- __currentHighlightedItemIndex = -1;
+ __currentPressedItemIndex = -1;
__isInFocusMode = false;
Invalidate();
, __pFont(null)
, __pTextObject(null)
, __startPosition(FloatPoint(0.0f, 0.0f))
- , __highlightedItemIndex(-1)
+ , __pressedItemIndex(-1)
, __touchMoved(false)
, __touchBubblingBlocked(true)
, __topMargin(0.0f)
result r;
r = GET_BITMAP_CONFIG_N(TABBAR::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
- SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap.");
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
__pBgBitmapCached = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __tabBar.GetColor());
delete pBitmap;
pBitmap = null;
r = GET_BITMAP_CONFIG_N(TABBAR::BG_OUTLINE_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgEffectBitmapCached);
- SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap.");
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
r = GET_BITMAP_CONFIG_N(TABBAR::LEFT_ARROW_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
__pLeftArrowBitmapCached = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), arrowColor);
- SysTryCatch(NID_UI_CTRL, __pLeftArrowBitmapCached != null, , E_OUT_OF_MEMORY, "Failed to load bitmap.");
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
delete pBitmap;
pBitmap = null;
r = GET_BITMAP_CONFIG_N(TABBAR::RIGHT_ARROW_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
__pRightArrowBitmapCached = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), arrowColor);
- SysTryCatch(NID_UI_CTRL, __pRightArrowBitmapCached != null, , E_OUT_OF_MEMORY, "Failed to load bitmap.");
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
delete pBitmap;
pBitmap = null;
r = GET_BITMAP_CONFIG_N(TABBAR::ITEM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
__pItemBgBitmapCached[ITEM_STATUS_SELECTED] = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __tabBar.GetItemColor(ITEM_STATUS_SELECTED));
- SysTryCatch(NID_UI_CTRL, __pItemBgBitmapCached[ITEM_STATUS_SELECTED] != null, , E_OUT_OF_MEMORY, "Failed to load bitmap.");
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
delete pBitmap;
pBitmap = null;
r = GET_BITMAP_CONFIG_N(TABBAR::ITEM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
- __pItemBgBitmapCached[ITEM_STATUS_HIGHLIGHTED] = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __tabBar.GetItemColor(ITEM_STATUS_HIGHLIGHTED));
- SysTryCatch(NID_UI_CTRL, __pItemBgBitmapCached[ITEM_STATUS_HIGHLIGHTED] != null, , E_OUT_OF_MEMORY, "Failed to load bitmap.");
+ __pItemBgBitmapCached[ITEM_STATUS_PRESSED] = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __tabBar.GetItemColor(ITEM_STATUS_PRESSED));
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
+ delete pBitmap;
+ pBitmap = null;
+
+ r = GET_BITMAP_CONFIG_N(TABBAR::ITEM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
+ __pItemBgBitmapCached[ITEM_STATUS_DISABLED] = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __tabBar.GetItemColor(ITEM_STATUS_DISABLED));
+ SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
delete pBitmap;
pBitmap = null;
r = GET_BITMAP_CONFIG_N(TABBAR::ITEM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
SysTryReturn(NID_UI_CTRL, pBitmap != null, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Image loading fail.");
}
- else if (itemStatus == ITEM_STATUS_HIGHLIGHTED)
+ else if (itemStatus == ITEM_STATUS_PRESSED)
{
r = GET_BITMAP_CONFIG_N(TABBAR::ITEM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
SysTryReturn(NID_UI_CTRL, pBitmap != null, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Image loading fail.");
itemStatus = pDrawItem->GetStatus();
- // draw item BG
- if (__pItemBgBitmapCached[itemStatus] != null)
+ if (!__tabBar.IsEnabled())
{
- pCanvas->DrawNinePatchedBitmap(itemBounds, *__pItemBgBitmapCached[itemStatus]);
+ textColor = __tabBar.GetItemTextColor(ITEM_STATUS_DISABLED);
+ if (__pItemBgBitmapCached[ITEM_STATUS_DISABLED] != null)
+ {
+ pCanvas->DrawNinePatchedBitmap(itemBounds, *__pItemBgBitmapCached[ITEM_STATUS_DISABLED]);
+ }
+ }
+ else
+ {
+ textColor = __tabBar.GetItemTextColor(itemStatus);
+ if (__pItemBgBitmapCached[itemStatus] != null)
+ {
+ pCanvas->DrawNinePatchedBitmap(itemBounds, *__pItemBgBitmapCached[itemStatus]);
+ }
}
// draw item text
__pTextObject->AppendElement(*pSimpleText);
- if (!__tabBar.IsEnabled())
- {
- textColor = __tabBar.GetItemTextColor(ITEM_STATUS_DISABLED);
- }
- else
- {
- textColor = __tabBar.GetItemTextColor(itemStatus);
- }
-
__pTextObject->SetForegroundColor(textColor, 0, __pTextObject->GetTextLength());
__pTextObject->SetBounds(textRect);
__pTextObject->SetFont(__pFont, 0, __pTextObject->GetTextLength());
return true;
}
- __highlightedItemIndex = index;
+ __pressedItemIndex = index;
if (GetItemStatus(index) == ITEM_STATUS_SELECTED)
{
return true;
}
- result r = SetItemStatus(index, ITEM_STATUS_HIGHLIGHTED);
+ result r = SetItemStatus(index, ITEM_STATUS_PRESSED);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, true, r, "[%s] propagating.", GetErrorMessage(r));
Draw();
if (index != -1 && GetItemStatus(index) != ITEM_STATUS_NORMAL && __touchMoved == false)
{
- if (GetItemStatus(index) == ITEM_STATUS_HIGHLIGHTED)
+ if (GetItemStatus(index) == ITEM_STATUS_PRESSED)
{
r = SetItemStatus(index, ITEM_STATUS_SELECTED);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, false, r, "[%s] propagating.", GetErrorMessage(r));
for (int i = 0; i < GetItemCount(); i++)
{
- if (GetItemStatus(i) == ITEM_STATUS_HIGHLIGHTED)
+ if (GetItemStatus(i) == ITEM_STATUS_PRESSED)
{
r = SetItemStatus(i, ITEM_STATUS_NORMAL);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, false, r, "[%s] propagating.", GetErrorMessage(r));
}
}
- __highlightedItemIndex = -1;
+ __pressedItemIndex = -1;
__touchMoved = false;
Draw();
for (int i = 0; i < GetItemCount(); i++)
{
- if (GetItemStatus(i) == ITEM_STATUS_HIGHLIGHTED)
+ if (GetItemStatus(i) == ITEM_STATUS_PRESSED)
{
r = SetItemStatus(i, ITEM_STATUS_NORMAL);
SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, false, r, "[%s] propagating.", GetErrorMessage(r));
}
}
- __highlightedItemIndex = -1;
+ __pressedItemIndex = -1;
Draw();
void
_TableViewItem::FireItemEvent(bool selectedItem)
{
- if (HasParent() == false)
- {
- return;
- }
-
- if (IsContextItem())
+ if (!HasParent()
+ || IsContextItem()
+ || __itemType == TABLE_VIEW_ITEM_TYPE_HEADER
+ || __itemType == TABLE_VIEW_ITEM_TYPE_FOOTER)
{
return;
}
}
GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, lineHeight);
- GET_SHAPE_CONFIG(TABLEVIEW::ITEM_DIVIDER_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineLeftMargin);
+ GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineLeftMargin);
GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_INDEX_BAR_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, lineBottomMargin);
lineHeight = Tizen::Graphics::CoordinateSystem::ConvertToLogicalY(lineHeight);
dividerHeight = (dividerHeight > 0) ? dividerHeight : 0;
__pItemAnnexLeftDivider->SetBounds(FloatRectangle((GetBoundsF().width - annexWidth - (itemLeftMargin + annexLeftMargin) - (dividerWidth*2)), dividerTopMargin, dividerWidth, dividerHeight));
__pItemAnnexLeftDivider->SetBackgroundColor(dividerLeftColor);
+ __pItemAnnexLeftDivider->GetVisualElement()->SetOpacity(ITEM_ANNEX_DIVIDER_OPACITY);
__pItemAnnexLeftDivider->Invalidate();
__pItemAnnexRightDivider->SetBounds(FloatRectangle((GetBoundsF().width - annexWidth - (itemLeftMargin + annexLeftMargin) - dividerWidth), dividerTopMargin, dividerWidth, dividerHeight));
__pItemAnnexRightDivider->SetBackgroundColor(dividerRightColor);
+ __pItemAnnexLeftDivider->GetVisualElement()->SetOpacity(ITEM_ANNEX_DIVIDER_OPACITY);
__pItemAnnexRightDivider->Invalidate();
}
if (pProviderAdaptor->UpdateItem(pTableViewItem, itemTag.groupIndex, itemTag.itemIndex))
{
+ FloatRectangle itemBounds = pTableViewItem->GetBoundsF();
+ FloatDimension itemDim = Tizen::Graphics::CoordinateSystem::AlignToDevice(FloatDimension(itemBounds.width, itemBounds.height));
+ itemBounds.height = itemDim.height;
+ pTableViewItem->SetBounds(itemBounds);
+
CheckItemHeightAndRefreshLayout(itemTag, true);
if (__sweptItemTag.groupIndex != itemTag.groupIndex || __sweptItemTag.itemIndex != itemTag.itemIndex)
PresetItemHeightList();
AdjustClientAreaBounds(true);
- if (__pTableView->GetScrollStyle() == TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL
- || __pTableView->GetScrollStyle() == TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL_FIXED)
+ TableViewScrollBarStyle scrollStyle = __pTableView->GetScrollStyle();
+
+ if (scrollStyle == TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL
+ || scrollStyle == TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL_FIXED)
{
_FastScroll* pFastScroll = __pTableView->GetFastScrollBar();
if (pFastScroll != null)
pFastScroll->SetScrollVisibility(IsScrollable());
}
}
+ else if (scrollStyle != TABLE_VIEW_SCROLL_BAR_STYLE_NONE)
+ {
+ if (IsScrollable())
+ {
+ FadeInScrollBar();
+ }
+ }
return true;
}
if(PreloadItem() == false)
{
+ __pTableView->SetFocusNavigateEnabled(false);
return E_SUCCESS;
}
// Draw empty list
if (IsEmpty() == true)
{
+ __pTableView->SetFocusNavigateEnabled(false);
return DrawEmptyTableView();
}
+ else
+ {
+ __pTableView->SetFocusNavigateEnabled(true);
+ }
return E_SUCCESS;
}
if (pFocusedControl != null)
{
pItem = dynamic_cast<_TableViewItem*>(pFocusedControl);
+ if (pItem == null)
+ {
+ _Control* pParentControl = pFocusedControl->GetParent();
+ pItem = dynamic_cast<_TableViewItem*>(pParentControl);
+ }
+
if (pItem != null)
{
pItem->GetItemIndex(itemPos.groupIndex, itemPos.itemIndex);
if (pFocusedControl != null)
{
pItem = dynamic_cast<_TableViewItem*>(pFocusedControl);
+ if (pItem == null)
+ {
+ _Control* pParentControl = pFocusedControl->GetParent();
+ pItem = dynamic_cast<_TableViewItem*>(pParentControl);
+ }
+
if (pItem != null)
{
pItem->GetItemIndex(itemPos.groupIndex, itemPos.itemIndex);
if (findPrevTokenLoopFlag)
{
pPreviousToken = static_cast< _Token* >(__pTokenList->GetAt(index - 1));
+ r = GetLastResult();
+ SysTryReturnResult(NID_UI_CTRL, pPreviousToken != null, r, "Propagating.");
+
findPrevTokenLoopFlag = false;
}
{
_Token* pToken = null;
pToken = static_cast< _Token* >(__pTokenList->GetAt(focusedTokenIndex));
+ r = GetLastResult();
+ SysTryReturnResult(NID_UI_CTRL, pToken != null, r, "Propagating.");
focusedTokenRectangle = pToken->displayRect;
{
_Token* pToken = null;
pToken = static_cast <_Token*>(__pTokenList->GetAt(__focusedTokenIndex));
+ r = GetLastResult();
+ SysTryReturnResult(NID_UI_CTRL, pToken != null, r, "Propagating.");
focussedTokenRectangle = pToken->displayRect;
{
if (__pButtonItems[LEFT_BUTTON])
{
- if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ if (__pButtonItems[RIGHT_BUTTON])
{
- __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
- __highlightedItemIndex = __itemCount;
- __lastHighlightedItemIndex = __highlightedItemIndex;
- __highlighted = true;
+ if (__highlightedItemIndex == __itemCount)
+ {
+ if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ {
+ __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+ __lastHighlightedItemIndex = __highlightedItemIndex;
+ __highlighted = true;
+ }
+ }
+ else if (__highlightedItemIndex == __itemCount + 1)
+ {
+ if (__pButtonItems[RIGHT_BUTTON])
+ {
+ if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ {
+ __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+ __lastHighlightedItemIndex = __highlightedItemIndex;
+ __highlighted = true;
+ }
+ }
+ }
}
else
{
- if (__pButtonItems[RIGHT_BUTTON])
+ if (__highlightedItemIndex == __itemCount)
{
- if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
{
- __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
- __highlightedItemIndex = __itemCount + 1;
+ __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
__lastHighlightedItemIndex = __highlightedItemIndex;
__highlighted = true;
}
}
}
}
- else if (__pButtonItems[RIGHT_BUTTON])
+ else
{
- if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ if (__pButtonItems[RIGHT_BUTTON])
{
- __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
- __highlightedItemIndex = __itemCount;
- __lastHighlightedItemIndex = __highlightedItemIndex;
- __highlighted = true;
+ if (__highlightedItemIndex == __itemCount)
+ {
+ if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+ {
+ __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+ __lastHighlightedItemIndex = __highlightedItemIndex;
+ __highlighted = true;
+ }
+ }
}
}
}
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth * 2, segmentedItemHeight));
}
else
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
}
}
else
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 1, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
}
else
{
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - 1, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - dividerWidth, segmentedItemHeight));
}
else
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] + 1, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
}
}
else
if (__pButtonItems[RIGHT_BUTTON])
{
__pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - dividerWidth, segmentedItemHeight));
}
else
{
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
__pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 1, segmentedItemHeight));
+ (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - dividerWidth, segmentedItemHeight));
}
else
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
__pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] + 1, segmentedItemHeight));
+ (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
}
}
else
__pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
__pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
+ (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - dividerWidth, segmentedItemHeight));
}
else
{
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 4, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
}
else
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
}
}
else
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 1, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
}
else
{
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - 1, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
}
else
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
}
}
if (__pButtonItems[RIGHT_BUTTON])
{
__pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
- __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+ __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
}
else
{
{
if (__pButtonItems[RIGHT_BUTTON])
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
__pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - itemHeight) / 2, blockWidth[2] - 1, itemHeight));
+ (GetSizeF().height - itemHeight) / 2, blockWidth[2] - dividerWidth, itemHeight));
}
else
{
- __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+ __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
__pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - itemHeight) / 2, blockWidth[2] + 1, itemHeight));
+ (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
}
}
else
__pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
__pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
__pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
- (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+ (GetSizeF().height - itemHeight) / 2, blockWidth[2] - dividerWidth, itemHeight));
}
else
{
pCanvas->SetForegroundColor(dividerLeftColor);
pCanvas->SetLineWidth(dividerWidth);
- pCanvas->DrawLine(FloatPoint(point.x + dividerWidth, point.y), FloatPoint(point.x + dividerWidth, point.y + dividerHeight));
+ pCanvas->DrawLine(FloatPoint(point.x, point.y), FloatPoint(point.x, point.y + dividerHeight));
//pCanvas->SetForegroundColor(dividerRightColor);
//pCanvas->SetLineWidth(dividerWidth/2);
Tizen::Graphics::FloatRectangle __focusBounds;
int __focusedValue;
static const int UPDATE_ITEM_COUNT = 6;
+ bool __isFlickCanceled;
}; // _DateTimeBarPresenter
result SetKeypadCommandButton(CommandButtonPosition position, const Tizen::Base::String& text, int actionId);
_Toolbar* GetKeypadCommandButton(void) const;
result SetKeypadCommandButtonVisible(bool visible);
- bool SetKeypadBounds(const Tizen::Graphics::FloatRectangle& bounds);
result SetText(const Tizen::Base::String& text);
result SetTextAlignment(HorizontalAlignment alignment);
result SetTextBounds(Tizen::Graphics::Rectangle& bounds);
float GetTextSizeF(void) const;
unsigned long GetInputModeCategory(void) const;
CoreKeypadAction GetKeypadAction(void) const;
- result GetKeypadBounds(Tizen::Graphics::FloatRectangle& bounds) const;
+ result GetKeypadBounds(Tizen::Graphics::FloatRectangle& bounds);
+ void GetKeypadBoundsEx(Tizen::Graphics::FloatRectangle& bounds) const;
float GetClipboardHeight(void) const;
bool CheckKeypadExist(_ControlOrientation orientation);
bool IsKeypadRotating(_ControlOrientation orientation);
bool IsKeypadEnabled(void) ;
bool IsLowerCaseModeEnabled(void) const;
bool IsKeypadCommandButtonVisible(void) const;
- bool IsViewModeEnabled(void) const;
+ bool IsViewModeEnabled(bool internal = true) const;
bool IsTextPredictionEnabled(void) const;
bool IsKeypadExist(void) const;
bool IsClipboardExist(void) const;
bool __isFlexibleHeightFrozen;
bool __isKeypadShowing;
bool __isKeypadHiding;
+ bool __resizedByKeypadHide;
int __blockStartPos;
int __cursorPos;
static bool __footerVisibleChanged;
static unsigned int __latestBoundedContext;
static const float TOUCH_PRESS_THRESHOLD_IN_CLEAR_AREA;
+ static _ScrollPanel* __pResizedPanel;
wchar_t __echoChar;
Tizen::Graphics::Point TranslateFromClientAreaPosition(const Tizen::Graphics::Point& clientPosition) const;
Tizen::Graphics::FloatPoint TranslateFromClientAreaPosition(const Tizen::Graphics::FloatPoint& clientPosition) const;
+ bool IsDeflated(void);
bool DeflateClientRectHeight(int height);
bool DeflateClientRectHeight(float height);
static void OnDisconnected(Ecore_Evas *pEe);
static void OnMessageHandle(Ecore_Evas *pEe, int msgDomain, int msgId, void *data, int size);
+ virtual Animations::HitTestResult OnHitTest(const Tizen::Graphics::FloatPoint& point);
+
private:
_Indicator(const _Indicator& value);
_Indicator& operator =(const _Indicator& value);
void AdjustItemPosition(void);
Tizen::Graphics::FloatDimension AdjustItemLayoutStyle(void);
- _OptionMenuItem* CreateItem(const Base::String& text, int actionId, const Tizen::Graphics::Bitmap* pNormalBitmap, const Tizen::Graphics::Bitmap* pPressedBitmap, const Tizen::Graphics::Bitmap* pHighlightedBitmap);
+ _OptionMenuItem* CreateItem(const Base::String& text, int actionId, const Tizen::Graphics::Bitmap* pNormalBitmap,
+ const Tizen::Graphics::Bitmap* pPressedBitmap, const Tizen::Graphics::Bitmap* pHighlightedBitmap, bool isSubItem = false);
int GetItemIndexFromPosition(const Tizen::Graphics::FloatPoint& point) const;
private:
virtual bool OnAccessibilityItemRefreshed(const _AccessibilityContainer& control, const _AccessibilityElement& element, _AccessibilityFocusDirection direction);
// Focus UI
- void OnChildControlFocusMoved(const _Control& control);
+ virtual void OnChildControlFocusMoved(const _Control& control);
+ virtual void OnDescendantControlFocusMoved(const _Control& control);
// scroll animation event listener
virtual void OnVisualElementAnimationStarted(const Tizen::Ui::Animations::VisualElementAnimation& animation, const Tizen::Base::String& keyName, Tizen::Ui::Animations::VisualElement& target);
float GetHorizontalScrollPosition(void) const;
void SetHorizontalScrollPosition(float position);
+ float CalculatePagingScrollPosition(float position) const;
+
// scroll area type
bool IsScrollAreaAutoResizingEnabled(void) const;
void SetScrollAreaAutoResizingEnabled(bool autoResizingEnable);
virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
virtual bool OnAccessibilityItemRefreshed(const _AccessibilityContainer& control, const _AccessibilityElement& element, _AccessibilityFocusDirection direction);
- // Focus UI
+ // Focus UI
virtual void OnChildControlFocusMoved(const _Control& control);
+ virtual void OnDescendantControlFocusMoved(const _Control& control);
// scroll event listener
virtual void OnScrollEndReached(_Control& source, ScrollEndEvent type);
float GetHorizontalScrollPosition(void) const;
void SetHorizontalScrollPosition(float position);
+ float CalculatePagingScrollPosition(float position) const;
+
protected:
// Update Layout
virtual void UpdateLayout(void);
// Scroll operation
virtual float ScrollToInternal(float targetPosition);
- float ScrollTo(float distance);
- float ScrollTo(float distance, bool withAnimation);
+ float ScrollTo(float targetPosition);
+ float ScrollTo(float targetPosition, bool withAnimation);
// Scrollbar operations
virtual void FadeOutScrollBar(void);
float CalculateFlickAmount(float flickDistance, float flickDuration);
bool DoFlickGestureRecognized(_TouchFlickGestureDetector& gesture);
bool AccumulateFlickGesture(_FlickDirection direction);
+ float FlickTo(float targetPosition, float duration);
// Attribute
private:
_ScrollPanel* __pScrollPanel;
_ScrollPanelModel* __pScrollPanelModel;
+ float __limitAnimationDistance;
+
_Control* __pPressedControl;
bool __subControlMoved;
bool __touchPressed;
, public _IKeypadEventListener
, public _ITextBlockEventListener
, public _ITextEventListener
- , public Tizen::Ui::_IAccessibilityListener
, virtual public Tizen::Base::Runtime::IEventListener
, virtual public Tizen::Ui::_IUiEventListener
, virtual public Tizen::Ui::_IUiEventPreviewer
virtual void OnSettingChanged(Tizen::Base::String& key);
virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds);
- virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element);
- virtual bool OnAccessibilityValueDecreased(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-
protected:
virtual void OnDraw(void);
result CreateFrontButton(void);
result CreateContentsArea(void);
result CreateClippedGroupControl(void);
- void CreateAccessibilityElement(void);
- void AttachChildContainers();
+ void InitializeAccessibility(void);
Tizen::Ui::_Control* GetParentForm(void) const;
bool __isFocusCallbackToBeFired;
bool __isButtonTextChangedByApp;
bool __contentVisibilitySetByApp;
+ bool __isInFocusMode;
CoreKeypadAction __keypadAction;
result SetThumbBitmap(SliderThumbStatus status, const Tizen::Graphics::Bitmap& bitmap);
void SetThumbTextColor(SliderThumbStatus status, const Tizen::Graphics::Color& color);
void FireSliderMoveEvent(int value);
+ bool IsKeyPressed(void) const;
virtual bool OnTouchPressed(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo);
virtual bool OnTouchReleased(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo);
virtual bool OnFocusGained(const _Control& source);
virtual bool OnFocusLost(const _Control &source);
virtual bool OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo);
+ virtual bool OnKeyReleased(const _Control &source, const _KeyInfo &keyInfo);
virtual void OnBoundsChanged(void);
virtual void OnChangeLayout(Tizen::Ui::_ControlOrientation orientation);
Tizen::Ui::Animations::_VisualElement* __pHandle;
Tizen::Ui::_AccessibilityElement* __pAccessibilityElement;
+ bool __isKeyPressed;
}; // _Slider
}}} // Tizen::Ui::Controls
Tizen::Graphics::FloatRectangle GetIconBounds(IconPosition iconPosition) const;
Tizen::Graphics::FloatRectangle GetTouchBounds(void) const;
+ _SliderOverlay* GetSliderOverlay(void) const;
+
virtual bool OnTouchPressed(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo);
virtual bool OnTouchReleased(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo);
virtual bool OnTouchMoved(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo);
DECLARE_PROPERTY("color", GetPropertyColor, SetPropertyColor);
DECLARE_PROPERTY("normalItemColor", GetPropertyNormalItemColor, SetPropertyNormalItemColor);
DECLARE_PROPERTY("selectedItemColor", GetPropertySelectedItemColor, SetPropertySelectedItemColor);
- DECLARE_PROPERTY("highlightedItemColor", GetPropertyHighlightedItemColor, SetPropertyHighlightedItemColor);
+ DECLARE_PROPERTY("pressedItemColor", GetPropertyPressedItemColor, SetPropertyPressedItemColor);
+ DECLARE_PROPERTY("disabledItemColor", GetPropertyDisabledItemColor, SetPropertyDisabledItemColor);
DECLARE_PROPERTY("normalItemTextColor", GetPropertyNormalItemTextColor, SetPropertyNormalItemTextColor);
DECLARE_PROPERTY("selectedItemTextColor", GetPropertySelectedItemTextColor, SetPropertySelectedItemTextColor);
- DECLARE_PROPERTY("highlightedItemTextColor", GetPropertyHighlightedItemTextColor, SetPropertyHighlightedItemTextColor);
+ DECLARE_PROPERTY("pressedItemTextColor", GetPropertyPressedItemTextColor, SetPropertyPressedItemTextColor);
DECLARE_PROPERTY("disabledItemTextColor", GetPropertyDisabledItemTextColor, SetPropertyDisabledItemTextColor);
DECLARE_CLASS_END();
result SetPropertySelectedItemColor(const Variant& color);
Variant GetPropertySelectedItemColor(void) const;
- result SetPropertyHighlightedItemColor(const Variant& color);
- Variant GetPropertyHighlightedItemColor(void) const;
+ result SetPropertyPressedItemColor(const Variant& color);
+ Variant GetPropertyPressedItemColor(void) const;
+
+ result SetPropertyDisabledItemColor(const Variant& color);
+ Variant GetPropertyDisabledItemColor(void) const;
result SetPropertyNormalItemTextColor(const Variant& color);
Variant GetPropertyNormalItemTextColor(void) const;
result SetPropertySelectedItemTextColor(const Variant& color);
Variant GetPropertySelectedItemTextColor(void) const;
- result SetPropertyHighlightedItemTextColor(const Variant& color);
- Variant GetPropertyHighlightedItemTextColor(void) const;
+ result SetPropertyPressedItemTextColor(const Variant& color);
+ Variant GetPropertyPressedItemTextColor(void) const;
result SetPropertyDisabledItemTextColor(const Variant& color);
Variant GetPropertyDisabledItemTextColor(void) const;
_TabBarPresenter* __pTabBarPresenter;
bool __isInFocusMode;
- int __currentHighlightedItemIndex;
+ int __currentPressedItemIndex;
_ActionEvent* __pActionEvent;
Tizen::Graphics::Color __color;
{
ITEM_STATUS_NORMAL = 0,
ITEM_STATUS_SELECTED,
- ITEM_STATUS_HIGHLIGHTED,
+ ITEM_STATUS_PRESSED,
ITEM_STATUS_DISABLED,
ITEM_STATUS_MAX
};
Tizen::Graphics::Font* __pFont;
Tizen::Graphics::_Text::TextObject* __pTextObject;
Tizen::Graphics::FloatPoint __startPosition;
- int __highlightedItemIndex;
+ int __pressedItemIndex;
bool __touchMoved;
bool __touchBubblingBlocked;
static const float SENSITIVE = 0.08f;
static const float ITEM_TOP_DIVIDER_OPACITY = 0.3f;
static const float ITEM_BOTTOM_DIVIDER_OPACITY = 1.0f;
+ static const float ITEM_ANNEX_DIVIDER_OPACITY = 0.2f;
};
}}} // Tizen::Ui::Controls
_AccessibilityElement* GetChildElement(const Tizen::Base::String& name) const;
void GetElements(Tizen::Base::Collection::IListT<_AccessibilityElement*>& list) const;
Tizen::Base::Collection::IListT<_AccessibilityElement*>* GetElementsN(void) const;
-
+ bool IsContains(const _AccessibilityElement& element);
result MoveElement(const _AccessibilityElement* pPreviousElement, const _AccessibilityElement& element);
void SetFocusHandler(_IAccessibilityFocusHandler* pHandler);
virtual void OnBackgroundColorChanged(Tizen::Graphics::Color& backgroundColor) = 0;
virtual void OnDrawFocus(void) = 0;
virtual void OnChildControlFocusMoved(const _Control& control) = 0;
+ virtual void OnDescendantControlFocusMoved(const _Control& control) = 0;
virtual bool IsChildControlFocusManage(void) const = 0;
virtual void OnFocusableStateChanged(bool focusalbeState) = 0;
virtual void OnFocusModeStateChanged(void) = 0;
virtual void OnBackgroundColorChanged(Tizen::Graphics::Color& backgroundColor);
virtual void OnDrawFocus(void);
virtual void OnChildControlFocusMoved(const _Control& control);
+ virtual void OnDescendantControlFocusMoved(const _Control& control);
virtual bool IsChildControlFocusManage(void) const;
virtual void OnFocusableStateChanged(bool focusalbeState);
virtual void OnFocusModeStateChanged(void);
virtual void OnBackgroundColorChanged(Tizen::Graphics::Color& backgroundColor);
virtual void OnDrawFocus(void);
virtual void OnChildControlFocusMoved(const _Control& control);
+ virtual void OnDescendantControlFocusMoved(const _Control& control);
virtual bool IsChildControlFocusManage(void) const;
virtual void OnFocusableStateChanged(bool focusalbeState);
virtual void OnFocusModeStateChanged(void);
#ifndef _FUI_INTERNAL_CONTROL_MANAGER_H_
#define _FUI_INTERNAL_CONTROL_MANAGER_H_
+#include <unique_ptr.h>
#include <FBaseColIListT.h>
#include <FBaseColHashMapT.h>
#include <FGrp_CoordinateSystem.h>
class _IWindow;
class _IUiEventListener;
class _TouchGestureDetector;
+class _IControlManagerEventListener;
class _OSP_EXPORT_ _ControlManager
: public Tizen::System::ISettingEventListener
void SetClipboardOwner(_Window* pOwner);
_Window* GetClipboardOwner(void) const;
+ result AddControlManagerEventListener(_IControlManagerEventListener& listener);
+ result RemoveControlManagerEventListener(_IControlManagerEventListener& listener);
+
private:
~_ControlManager(void);
_ControlManager(void);
result CallOnPreAttachedToMainTree(_Control& control);
result CallOnAttachedToMainTree(_Control& control);
result CallOnDetachingFromMainTree(_Control& control);
+ void CallControlManagerEventListener(void);
virtual void OnSettingChanged(Tizen::Base::String& key);
static _ControlManager* __pInstance;
int __screenDpi;
_Window* __pClipboardOwner;
+ std::unique_ptr<Tizen::Base::Collection::IListT<_IControlManagerEventListener*> > __pControlManagerEventListenerList;
}; // _ControlManager
}} // Tizen::Ui
--- /dev/null
+//
+// Open Service Platform
+// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+/**
+ * @file FUi_IControlManagerEventListener.h
+ * @brief This is the header file for the _IControlManagerEventListener class.
+ *
+ * This header file contains the declarations of the %_IControlManagerEventListener class.
+ */
+
+#ifndef _FUI_INTERNAL_ICONTROL_MANAGER_EVENT_LISTENER_H_
+#define _FUI_INTERNAL_ICONTROL_MANAGER_EVENT_LISTENER_H_
+
+#include <FBaseRtIEventListener.h>
+
+namespace Tizen { namespace Ui
+{
+
+class _OSP_EXPORT_ _IControlManagerEventListener
+ : public Tizen::Base::Runtime::IEventListener
+{
+public:
+ virtual ~_IControlManagerEventListener(void) {}
+ virtual void OnControlManagerTerminating(void) = 0;
+};
+
+}}//Tizen::Ui
+
+#endif // _FUI_INTERNAL_ICONTROL_MANAGER_EVENT_LISTENER_H_
DECLARE_SHAPE_CONFIG(ANCHOR_RIGHT_MARGIN, 42);
DECLARE_SHAPE_CONFIG(ITEM_BG_PRESSED_MARGIN, 43);
DECLARE_SHAPE_CONFIG(ANCHOR_POPUP_OVERLAP, 44);
+ DECLARE_SHAPE_CONFIG(LIST_TEXT_GAP, 45);
DECLARE_FIXED_VALUE_CONFIG(GRID_ITEM_GAP, 1);
DECLARE_END_UI_CONFIG(CONTEXTMENU);
DECLARE_COLOR_CONFIG(GUIDE_TEXT_NORMAL, 13)
DECLARE_COLOR_CONFIG(CLEAR_ICON_NORMAL, 14)
DECLARE_COLOR_CONFIG(CLEAR_ICON_PRESSED, 15)
- DECLARE_COLOR_CONFIG(CUT_LINK_TEXT_NORMAL, 16)
- DECLARE_COLOR_CONFIG(CUT_LINK_BG_NORMAL, 17)
- DECLARE_COLOR_CONFIG(CURSOR_NORMAL, 18)
+ DECLARE_COLOR_CONFIG(CLEAR_ICON_DISABLED, 16)
+ DECLARE_COLOR_CONFIG(CUT_LINK_TEXT_NORMAL, 17)
+ DECLARE_COLOR_CONFIG(CUT_LINK_BG_NORMAL, 18)
+ DECLARE_COLOR_CONFIG(CURSOR_NORMAL, 19)
DECLARE_IMAGE_CONFIG(BG_NORMAL, 1)
DECLARE_IMAGE_CONFIG(BG_PRESSED, 2)
DECLARE_IMAGE_CONFIG(BG_ROUND_EFFECT, 15)
DECLARE_IMAGE_CONFIG(CLEAR_ICON_NORMAL, 16)
DECLARE_IMAGE_CONFIG(CLEAR_ICON_PRESSED, 17)
- DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 18)
- DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 19)
- DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 20)
- DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 21)
- DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 22)
- DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 23)
- DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 24)
- DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 25)
- DECLARE_IMAGE_CONFIG(BG_RING_FOCUSED, 26)
+ DECLARE_IMAGE_CONFIG(CLEAR_ICON_DISABLED, 18)
+ DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 19)
+ DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 20)
+ DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 21)
+ DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 22)
+ DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 23)
+ DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 24)
+ DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 25)
+ DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 26)
+ DECLARE_IMAGE_CONFIG(BG_RING_FOCUSED, 27)
DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1)
DECLARE_DIMENSION_CONFIG(TITLE_STYLE_MIN_SIZE, 2)
bool GetDensityDirectory(const Tizen::Base::String& directoryName, float& scaleFactor);
bool GetResolutionDirectory(const Tizen::Base::String& directoryName, float& scaleFactor);
void LoadPaletteInformation(const Tizen::Base::String& systemTheme);
+ void LoadBlackPalette(void);
+ void LoadWhitePalette(void);
+ void LoadDefaultPalette(void);
private:
struct ResourceFallbackItem
DECLARE_IMAGE_CONFIG(ITEM_BG_NORMAL, 5);
DECLARE_IMAGE_CONFIG(ITEM_BG_PRESSED, 6);
DECLARE_IMAGE_CONFIG(ITEM_BG_SELECTED, 7);
+ DECLARE_IMAGE_CONFIG(ITEM_BG_DISABLED, 8);
DECLARE_SHAPE_CONFIG(FONT_SIZE, 1);
DECLARE_SHAPE_CONFIG(FONT_MARGIN, 2);
DECLARE_SHAPE_CONFIG(TOP_MARGIN, 3);
__pImageKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_BG_SELECTED_IMAGE);
}
{
+ const char* key ="TABBAR::ITEM_BG_DISABLED";
+ __pImageKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_BG_DISABLED_IMAGE);
+ }
+ {
const char* key ="TAB::VERTICAL_DIVIDER_NORMAL";
__pImageKeyTable->Add(ResourceKey(key), _TAB::VERTICAL_DIVIDER_NORMAL_IMAGE);
}
ADD_SHAPE_CONFIG(APPEARING_ANIMATION_DISTANCE_Y, 40);
ADD_SHAPE_CONFIG(ITEM_BG_PRESSED_MARGIN, 4);
ADD_SHAPE_CONFIG(ANCHOR_POPUP_OVERLAP, 1);
+
+ ADD_SHAPE_CONFIG(LIST_TEXT_GAP, 20);
END_UI_CONFIG_MODE(720x1280);
START_UI_CONFIG_MODE(1280x720);
ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L1);
ADD_COLOR_CONFIG(TEXT_DISABLED, $F011L1D);
ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $F051);
- ADD_COLOR_CONFIG(CLEAR_ICON_NORMAL, $F041i);
- ADD_COLOR_CONFIG(CLEAR_ICON_PRESSED, $B042);
+ ADD_COLOR_CONFIG(CLEAR_ICON_NORMAL, $F041i); //$F053);
+ ADD_COLOR_CONFIG(CLEAR_ICON_PRESSED, $B042);//$F053P);
+ ADD_COLOR_CONFIG(CLEAR_ICON_DISABLED, $F053D);
ADD_COLOR_CONFIG(CUT_LINK_TEXT_NORMAL, $B052L5);
ADD_COLOR_CONFIG(CUT_LINK_BG_NORMAL, $B0217);
ADD_COLOR_CONFIG(CURSOR_NORMAL, $F052);
ADD_IMAGE_CONFIG(BG_ROUND_EFFECT, #00_edit_field_line_round_bg_01.#.png);
ADD_IMAGE_CONFIG(CLEAR_ICON_NORMAL, #00_edit_field_clear.png);
ADD_IMAGE_CONFIG(CLEAR_ICON_PRESSED, #00_edit_field_clear.png);
+ ADD_IMAGE_CONFIG(CLEAR_ICON_DISABLED, #00_edit_field_clear.png);
ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, #00_edit_group_bg.#.png);
ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, #00_edit_group_bg_ef.#.png);
ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_edit_group_bg_top.#.png);
ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D);
- ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);
+ ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P);
ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4);
ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6);
- ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6);
+ ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8);
ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6);
ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6);
ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6);
- ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6);
+ ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 20);
ADD_SHAPE_CONFIG(FOOTER_ITEM_FONT_SIZE, 32);
ADD_SHAPE_CONFIG(FOOTER_ITEM_ICON_SIZE, 63);
- ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 48);
- ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 40);
+ ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 63);
+ ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 45);
ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, 28);
ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, 8);
ADD_SHAPE_CONFIG(FOOTER_ITEM_TEXT_TOP_MARGIN, 0);
ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 20);
ADD_SHAPE_CONFIG(FOOTER_ITEM_FONT_SIZE, 32);
ADD_SHAPE_CONFIG(FOOTER_ITEM_ICON_SIZE, 63);
- ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 48);
- ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 40);
+ ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 63);
+ ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 45);
ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, 28);
ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, 10);
ADD_SHAPE_CONFIG(FOOTER_ITEM_TEXT_TOP_MARGIN, 0);//1280x720
ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D);
- ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);
+ ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P);
ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4);
ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6);
- ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6);
+ ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6);
ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6);
ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6);
- ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6);
+ ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
ADD_SHAPE_CONFIG(ARROW_MARGIN, 36);
ADD_SHAPE_CONFIG(ITEM_HEIGHT, 112);
- ADD_SHAPE_CONFIG(LIST_MAX_WIDTH, 500);
+ ADD_SHAPE_CONFIG(LIST_MAX_WIDTH, 696);
ADD_SHAPE_CONFIG(ITEM_MAX_COUNT, 7);
- ADD_SHAPE_CONFIG(LIST_MIN_WIDTH, 386);
+ ADD_SHAPE_CONFIG(LIST_MIN_WIDTH, 412);
ADD_SHAPE_CONFIG(LIST_ITEM_HEIGHT, 112);
ADD_SHAPE_CONFIG(LIST_DIVIDER_HEIGHT, 1);
ADD_IMAGE_CONFIG(ITEM_BG_NORMAL, #00_category_button.#.png);
ADD_IMAGE_CONFIG(ITEM_BG_PRESSED, #00_category_button_focus.#.png);
ADD_IMAGE_CONFIG(ITEM_BG_SELECTED, #00_category_button.#.png);
+ ADD_IMAGE_CONFIG(ITEM_BG_DISABLED, #00_category_button.#.png);
START_UI_CONFIG_MODE(480x800);
END_UI_CONFIG_MODE(480x800);
ADD_SHAPE_CONFIG(GROUPITEM_BAR_WIDTH, 7);
ADD_SHAPE_CONFIG(GROUPITEM_BAR_TOP_MARGIN, 4);
ADD_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_HEIGHT, 4);
- ADD_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_LEFT_MARGIN, 26);
+ ADD_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_LEFT_MARGIN, 0);
ADD_SHAPE_CONFIG(GROUPITEM_INDEX_BAR_BOTTOM_MARGIN, 14);
ADD_SHAPE_CONFIG(FASTSCROLL_INDEX_WIDTH, 51);
- ADD_SHAPE_CONFIG(ITEM_DIVIDER_LEFT_MARGIN, 4);
+ ADD_SHAPE_CONFIG(ITEM_DIVIDER_LEFT_MARGIN, 0);
ADD_FIXED_VALUE_CONFIG(ITEM_DIVIDER_HEIGHT, 1);
ADD_FIXED_VALUE_CONFIG(SECTIONITEM_TOP_MARGIN, 0);
ADD_FIXED_VALUE_CONFIG(ITEM_ANNEX_DIVIDER_WIDTH, 1);
projects / platform / framework / native / uifw.git / commitdiff
