Fixed Nabi Issues N_SE-56966,56735

[apps/osp/Internet.git] / src / IntDefaultCustomItem.cpp

diff --git a/src/IntDefaultCustomItem.cpp b/src/IntDefaultCustomItem.cpp
index c5accf6..53209c0 100644 (file)
--- a/src/IntDefaultCustomItem.cpp
+++ b/src/IntDefaultCustomItem.cpp
@@ -1,87 +1,89 @@
-//\r
-\r
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Flora License, Version 1.0 (the License);\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-//     http://floralicense.org/license/\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an AS IS BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// !Internet\r
-/*@file:    IntDefaultCustomItem\r
- *@brief:\r
- *\r
- */\r
-\r
-#include <FUiControls.h>\r
-#include "IntDefaultCustomItem.h"\r
-#include "IntTypes.h"\r
-\r
-using namespace Tizen::Base;\r
-using namespace Tizen::Graphics;\r
-using namespace Tizen::Ui::Controls;\r
-\r
-const int DefaultCustomItem::IDA_FORMAT_STRING = 101;\r
-\r
-DefaultCustomItem::DefaultCustomItem(void)\r
-{\r
-       __width = 0;\r
-       __height = 0;\r
-       __text = L"";\r
-}\r
-\r
-DefaultCustomItem::~DefaultCustomItem(void)\r
-{\r
-\r
-}\r
-\r
-result\r
-DefaultCustomItem::Construct(int width, int height)\r
-{\r
-       result r = E_FAILURE;\r
-       __width = width;\r
-       __height = height;\r
-       const Dimension dim(width, height);\r
-       r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_NORMAL);\r
-       return r;\r
-\r
-}\r
-\r
-void\r
-DefaultCustomItem::SetText(String& text)\r
-{\r
-       __text = text;\r
-}\r
-\r
-String\r
-DefaultCustomItem::GetText(void)\r
-{\r
-       return __text;\r
-}\r
-\r
-\r
-result\r
-DefaultCustomItem::Make(void)\r
-{\r
-       result r = E_SUCCESS;\r
-       const Color pressedTextColor = Color(249, 249, 249);\r
-       const int textSize = 40;\r
-       const int x_Margin_Element = 26;\r
-       const int y_Margin_Element = 26;\r
-       const int width_Element = __width - 60;\r
-\r
-       r = AddElement(Rectangle(x_Margin_Element, y_Margin_Element, width_Element,60), IDA_FORMAT_STRING, __text, textSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);\r
-       TryCatch( !IsFailed(r),,"DefaultCustomItem::Make %s",GetErrorMessage(r));\r
-\r
-       SetElementSelectionEnabled(IDA_FORMAT_STRING, true);\r
-\r
-       CATCH:return r;\r
-}\r
+//
+
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.1 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// 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.
+//
+
+// !Internet
+/*@file:    IntDefaultCustomItem
+ *@brief:
+ *
+ */
+
+#include <FUiControls.h>
+#include "IntCommonLib.h"
+#include "IntDefaultCustomItem.h"
+#include "IntTypes.h"
+
+using namespace Tizen::Base;
+using namespace Tizen::Graphics;
+using namespace Tizen::Ui::Controls;
+
+const int DefaultCustomItem::IDA_FORMAT_STRING = 101;
+
+DefaultCustomItem::DefaultCustomItem(void)
+{
+       __width = 0;
+       __height = 0;
+       __text = L"";
+}
+
+DefaultCustomItem::~DefaultCustomItem(void)
+{
+
+}
+
+result
+DefaultCustomItem::Construct(int width, int height)
+{
+       result r = E_FAILURE;
+       __fontSize = CommonUtil::GetFontSize();
+       __width = width;
+       __height = height;
+       const Dimension dim(width, height);
+       r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_NORMAL);
+       return r;
+
+}
+
+void
+DefaultCustomItem::SetText(String& text)
+{
+       __text = text;
+}
+
+String
+DefaultCustomItem::GetText(void)
+{
+       return __text;
+}
+
+
+result
+DefaultCustomItem::Make(void)
+{
+       result r = E_SUCCESS;
+       const Color pressedTextColor = Color(249, 249, 249);
+       const int textSize = 40;
+       const int x_Margin_Element = 26;
+       const int y_Margin_Element = 26;
+       const int width_Element = __width - 60;
+
+       r = AddElement(Rectangle(x_Margin_Element, y_Margin_Element, width_Element,60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize , CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
+       TryCatch( !IsFailed(r),,"DefaultCustomItem::Make %s",GetErrorMessage(r));
+
+//     SetElementSelectionEnabled(IDA_FORMAT_STRING, true);
+
+       CATCH:return r;
+}