projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add codes for Dali Windows Backend"
[platform/core/uifw/dali-demo.git]
/
examples
/
text-fonts
/
text-fonts-example.cpp
diff --git
a/examples/text-fonts/text-fonts-example.cpp
b/examples/text-fonts/text-fonts-example.cpp
index
9cc4d8e
..
1519b87
100644
(file)
--- a/
examples/text-fonts/text-fonts-example.cpp
+++ b/
examples/text-fonts/text-fonts-example.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-185,7
+185,7
@@
public:
CreateTextLabel ( mLabel, LABEL_TEXT, Color::WHITE );
CreateTextLabel ( mLabel2, LABEL_TEXT, Color::WHITE );
CreateTextLabel ( mLabel, LABEL_TEXT, Color::WHITE );
CreateTextLabel ( mLabel2, LABEL_TEXT, Color::WHITE );
- mLabel2.SetStyleName("
textlabel-
Rosemary");
+ mLabel2.SetStyleName("
TextLabel
Rosemary");
CreateTextLabel ( mLabel3, LABEL_TEXT, Color::WHITE );
mLabel3.SetProperty( TextLabel::Property::FONT_FAMILY, "SamsungOneUI" );
CreateTextLabel ( mLabel3, LABEL_TEXT, Color::WHITE );
mLabel3.SetProperty( TextLabel::Property::FONT_FAMILY, "SamsungOneUI" );
@@
-245,19
+245,10
@@
private:
bool mToggle;
};
bool mToggle;
};
-void RunTest( Application& application )
-{
- TextFontsExample test( application );
-
- application.MainLoop();
-}
-
-/** Entry point for Linux & Tizen applications */
int DALI_EXPORT_API main( int argc, char **argv )
{
Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
int DALI_EXPORT_API main( int argc, char **argv )
{
Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
-
- RunTest( application );
-
+ TextFontsExample test( application );
+ application.MainLoop();
return 0;
}
return 0;
}