projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d0a152d
)
Fixed some TCT issues
21/37221/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Sun, 22 Mar 2015 13:34:38 +0000
(13:34 +0000)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Sun, 22 Mar 2015 13:34:38 +0000
(13:34 +0000)
Change-Id: I933caca09e5b4817216112aa187ccd485c963742
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
patch
|
blob
|
history
automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
patch
|
blob
|
history
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
index
7568a11
..
3d4d1d5
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
@@
-160,6
+160,23
@@
bool TestPlatformAbstraction::IsLoading()
}
/**
}
/**
+ * @copydoc PlatformAbstraction::GetDefaultFontDescription()
+ */
+void TestPlatformAbstraction::GetDefaultFontDescription( std::string& family, std::string& style ) const
+{
+ // TODO
+}
+
+/**
+ * @copydoc PlatformAbstraction::GetDefaultFontSize()
+ */
+int TestPlatformAbstraction::GetDefaultFontSize() const
+{
+ // TODO
+ return int();
+}
+
+/**
* @copydoc PlatformAbstraction::SetDpi()
*/
void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
* @copydoc PlatformAbstraction::SetDpi()
*/
void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical)
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
index
bd9b592
..
a4ec8d3
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h
@@
-136,6
+136,16
@@
public:
virtual bool IsLoading();
/**
virtual bool IsLoading();
/**
+ * @copydoc PlatformAbstraction::GetDefaultFontDescription()
+ */
+ virtual void GetDefaultFontDescription( std::string& family, std::string& style ) const;
+
+ /**
+ * @copydoc PlatformAbstraction::GetDefaultFontSize()
+ */
+ virtual int GetDefaultFontSize() const;
+
+ /**
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
* @copydoc PlatformAbstraction::SetDpi()
*/
virtual void SetDpi (unsigned int dpiHorizontal, unsigned int dpiVertical);
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
index
b3cb881
..
4e81bf6
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
@@
-332,6
+332,9
@@
int UtcDaliNavigationControlCreateNavigationTitleBar(void)
NavigationControl naviControl = NavigationControl::New();
stage.Add( naviControl );
NavigationControl naviControl = NavigationControl::New();
stage.Add( naviControl );
+ Toolkit::NaviTitleBarStyle titleBarStyle( background, 720, 111, 68, 48, 34, 16, 11, 45, 63, 26, 14, 22 );
+ naviControl.CreateNavigationTitleBar( titleBarStyle, titleBarStyle );
+
Page naviItem = Page::New();
PushButton firstControl = PushButton::New();
Page naviItem = Page::New();
PushButton firstControl = PushButton::New();