Revert "[3.0] Changed text controls to re-apply style after system font size change"

This reverts commit aed4dbdfdba9516c49210686008caf7fdf4bd586.

Change-Id: Ia07ebc4d6eba062df24cba602360312d8f42e177

diff --git a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
index 8d93d9c..d82faf3 100644 (file)
--- a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
+++ b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2014 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.
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <dali/devel-api/adaptor-framework/style-monitor.h>
-
 #include <iostream>
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
@@ -164,6 +162,7 @@ void dali_style_manager_cleanup(void)
   test_return_value = TET_PASS;
 }
 
+
 int UtcDaliStyleManagerConstructorP(void)
 {
   ToolkitTestApplication application;
@@ -574,9 +573,9 @@ int UtcDaliStyleManagerApplyStyle(void)
 }
 
 
-int UtcDaliStyleManagerStyleChangedSignalFontFamily(void)
+int UtcDaliStyleManagerStyleChangedSignal(void)
 {
-  tet_infoline("Test that the StyleChange signal is fired when the font family is altered" );
+  tet_infoline("Test that the StyleChange signal is fired when the font size is altered" );
   Test::StyleMonitor::SetThemeFileOutput( DALI_STYLE_DIR "dali-toolkit-default-theme.json",
                                           defaultTheme );
 
@@ -590,7 +589,7 @@ int UtcDaliStyleManagerStyleChangedSignalFontFamily(void)
   Stage::GetCurrent().Add( label2 );
 
   StyleChangedSignalChecker styleChangedSignalHandler;
-  Dali::StyleMonitor styleMonitor = Dali::StyleMonitor::Get();
+  StyleMonitor styleMonitor = StyleMonitor::Get();
   StyleManager styleManager = StyleManager::Get();
 
   styleManager.StyleChangedSignal().Connect(&styleChangedSignalHandler, &StyleChangedSignalChecker::OnStyleChanged);
@@ -612,251 +611,3 @@ int UtcDaliStyleManagerStyleChangedSignalFontFamily(void)
 
   END_TEST;
 }
-
-int UtcDaliStyleManagerStyleChangedSignalFontSize(void)
-{
-  tet_infoline("Test that the StyleChange signal is fired when the font size is altered" );
-
-  const char* defaultTheme =
-    "{\n"
-    "  \"styles\":\n"
-    "  {\n"
-    "    \"textlabelFontSize0\":\n"
-    "    {\n"
-    "      \"pointSize\":10\n"
-    "    },\n"
-    "    \"textlabelFontSize1\":\n"
-    "    {\n"
-    "      \"pointSize\":10\n"
-    "    },\n"
-    "    \"textlabelFontSize2\":\n"
-    "    {\n"
-    "      \"pointSize\":12\n"
-    "    },\n"
-    "    \"textlabelFontSize3\":\n"
-    "    {\n"
-    "      \"pointSize\":14\n"
-    "    },\n"
-    "    \"textlabelFontSize4\":\n"
-    "    {\n"
-    "      \"pointSize\":16\n"
-    "    }\n"
-    "  }\n"
-    "}\n";
-
-  Test::StyleMonitor::SetThemeFileOutput( DALI_STYLE_DIR "dali-toolkit-default-theme.json", defaultTheme );
-
-  ToolkitTestApplication application;
-
-  std::string labelStr("Label");
-  Toolkit::TextLabel label = Toolkit::TextLabel::New(labelStr);
-  Stage::GetCurrent().Add( label );
-
-  Toolkit::TextLabel label2 = Toolkit::TextLabel::New(labelStr);
-  Stage::GetCurrent().Add( label2 );
-
-  StyleChangedSignalChecker styleChangedSignalHandler;
-  StyleMonitor styleMonitor = StyleMonitor::Get();
-  StyleManager styleManager = StyleManager::Get();
-
-  label.SetProperty(TextLabel::Property::POINT_SIZE, 10.0f);
-
-  styleManager.StyleChangedSignal().Connect(&styleChangedSignalHandler, &StyleChangedSignalChecker::OnStyleChanged);
-
-  Test::StyleMonitor::SetDefaultFontSize(2);
-  styleMonitor.StyleChangeSignal().Emit( styleMonitor,  StyleChange::DEFAULT_FONT_SIZE_CHANGE);
-
-  tet_infoline("Test that the StyleChanged signal is received only once");
-  DALI_TEST_EQUALS( styleChangedSignalHandler.signalCount, 1, TEST_LOCATION );
-
-  tet_infoline("Test that the label's font size has been altered\n");
-  Property::Value pointSizeValue = label.GetProperty(TextLabel::Property::POINT_SIZE);
-  float pointSize;
-  pointSizeValue.Get( pointSize );
-
-  DALI_TEST_EQUALS( pointSize, 12.0f, 0.001, TEST_LOCATION );
-
-  styleChangedSignalHandler.signalCount = 0;
-
-  Test::StyleMonitor::SetDefaultFontSize(4);
-  styleMonitor.StyleChangeSignal().Emit( styleMonitor, StyleChange::DEFAULT_FONT_SIZE_CHANGE);
-
-  tet_infoline("Test that the StyleChanged signal is received only once");
-  DALI_TEST_EQUALS( styleChangedSignalHandler.signalCount, 1, TEST_LOCATION );
-
-  // Check that the label's font style has been altered
-  pointSizeValue = label.GetProperty(TextLabel::Property::POINT_SIZE);
-  pointSizeValue.Get( pointSize );
-
-  DALI_TEST_EQUALS( pointSize, 16.0f, 0.001, TEST_LOCATION );
-
-
-  END_TEST;
-}
-
-
-int UtcDaliStyleManagerStyleChangedSignalFontSizeTextField(void)
-{
-  tet_infoline("Test that the StyleChange signal is fired when the font size is altered" );
-
-  const char* defaultTheme =
-    "{\n"
-    "  \"styles\":\n"
-    "  {\n"
-    "    \"textfieldFontSize0\":\n"
-    "    {\n"
-    "      \"pointSize\":8\n"
-    "    },\n"
-    "    \"textfieldFontSize1\":\n"
-    "    {\n"
-    "      \"pointSize\":10\n"
-    "    },\n"
-    "    \"textfieldFontSize2\":\n"
-    "    {\n"
-    "      \"pointSize\":12\n"
-    "    },\n"
-    "    \"textfieldFontSize3\":\n"
-    "    {\n"
-    "      \"pointSize\":14\n"
-    "    },\n"
-    "    \"textfieldFontSize4\":\n"
-    "    {\n"
-    "      \"pointSize\":16\n"
-    "    }\n"
-    "  }\n"
-    "}\n";
-
-  Test::StyleMonitor::SetThemeFileOutput( DALI_STYLE_DIR "dali-toolkit-default-theme.json", defaultTheme );
-
-  ToolkitTestApplication application;
-
-  std::string fieldStr("Field");
-  Toolkit::TextField field = Toolkit::TextField::New();
-  field.SetProperty( Toolkit::TextField::Property::TEXT, fieldStr );
-  Stage::GetCurrent().Add( field );
-
-  Toolkit::TextField field2 = Toolkit::TextField::New();
-  Stage::GetCurrent().Add( field2 );
-  field2.SetProperty( Toolkit::TextField::Property::TEXT, fieldStr );
-
-  StyleChangedSignalChecker styleChangedSignalHandler;
-  StyleMonitor styleMonitor = StyleMonitor::Get();
-  StyleManager styleManager = StyleManager::Get();
-
-  field.SetProperty(TextField::Property::POINT_SIZE, 10.0f);
-
-  styleManager.StyleChangedSignal().Connect(&styleChangedSignalHandler, &StyleChangedSignalChecker::OnStyleChanged);
-
-  Test::StyleMonitor::SetDefaultFontSize(2);
-  styleMonitor.StyleChangeSignal().Emit( styleMonitor,  StyleChange::DEFAULT_FONT_SIZE_CHANGE);
-
-  tet_infoline("Test that the StyleChanged signal is received only once");
-  DALI_TEST_EQUALS( styleChangedSignalHandler.signalCount, 1, TEST_LOCATION );
-
-  tet_infoline("Test that the field's font size has been altered\n");
-  Property::Value pointSizeValue = field.GetProperty(TextField::Property::POINT_SIZE);
-  float pointSize;
-  pointSizeValue.Get( pointSize );
-
-  DALI_TEST_EQUALS( pointSize, 12.0f, 0.001, TEST_LOCATION );
-
-  styleChangedSignalHandler.signalCount = 0;
-
-  Test::StyleMonitor::SetDefaultFontSize(4);
-  styleMonitor.StyleChangeSignal().Emit( styleMonitor, StyleChange::DEFAULT_FONT_SIZE_CHANGE);
-
-  tet_infoline("Test that the StyleChanged signal is received only once");
-  DALI_TEST_EQUALS( styleChangedSignalHandler.signalCount, 1, TEST_LOCATION );
-
-  // Check that the field's font style has been altered
-  pointSizeValue = field.GetProperty(TextField::Property::POINT_SIZE);
-  pointSizeValue.Get( pointSize );
-
-  DALI_TEST_EQUALS( pointSize, 16.0f, 0.001, TEST_LOCATION );
-
-
-  END_TEST;
-}
-
-int UtcDaliStyleManagerStyleChangedSignalFontSizeTextEditor(void)
-{
-  tet_infoline("Test that the StyleChange signal is fired when the font size is altered" );
-
-  const char* defaultTheme =
-    "{\n"
-    "  \"styles\":\n"
-    "  {\n"
-    "    \"texteditorFontSize0\":\n"
-    "    {\n"
-    "      \"pointSize\":10\n"
-    "    },\n"
-    "    \"texteditorFontSize1\":\n"
-    "    {\n"
-    "      \"pointSize\":12\n"
-    "    },\n"
-    "    \"texteditorFontSize2\":\n"
-    "    {\n"
-    "      \"pointSize\":14\n"
-    "    },\n"
-    "    \"texteditorFontSize3\":\n"
-    "    {\n"
-    "      \"pointSize\":18\n"
-    "    },\n"
-    "    \"texteditorFontSize4\":\n"
-    "    {\n"
-    "      \"pointSize\":25\n"
-    "    }\n"
-    "  }\n"
-    "}\n";
-
-  Test::StyleMonitor::SetThemeFileOutput( DALI_STYLE_DIR "dali-toolkit-default-theme.json", defaultTheme );
-
-  ToolkitTestApplication application;
-
-  std::string editorStr("Editor");
-  Toolkit::TextEditor editor = Toolkit::TextEditor::New();
-  editor.SetProperty( Toolkit::TextEditor::Property::TEXT, editorStr );
-  Stage::GetCurrent().Add( editor );
-
-  Toolkit::TextEditor editor2 = Toolkit::TextEditor::New();
-  Stage::GetCurrent().Add( editor2 );
-  editor2.SetProperty( Toolkit::TextEditor::Property::TEXT, editorStr );
-
-  StyleChangedSignalChecker styleChangedSignalHandler;
-  StyleMonitor styleMonitor = StyleMonitor::Get();
-  StyleManager styleManager = StyleManager::Get();
-
-  editor.SetProperty(TextEditor::Property::POINT_SIZE, 10.0f);
-
-  styleManager.StyleChangedSignal().Connect(&styleChangedSignalHandler, &StyleChangedSignalChecker::OnStyleChanged);
-
-  Test::StyleMonitor::SetDefaultFontSize(2);
-  styleMonitor.StyleChangeSignal().Emit( styleMonitor,  StyleChange::DEFAULT_FONT_SIZE_CHANGE);
-
-  tet_infoline("Test that the StyleChanged signal is received only once");
-  DALI_TEST_EQUALS( styleChangedSignalHandler.signalCount, 1, TEST_LOCATION );
-
-  tet_infoline("Test that the editor's font size has been altered\n");
-  Property::Value pointSizeValue = editor.GetProperty(TextEditor::Property::POINT_SIZE);
-  float pointSize;
-  pointSizeValue.Get( pointSize );
-
-  DALI_TEST_EQUALS( pointSize, 14.0f, 0.001, TEST_LOCATION );
-
-  styleChangedSignalHandler.signalCount = 0;
-
-  Test::StyleMonitor::SetDefaultFontSize(4);
-  styleMonitor.StyleChangeSignal().Emit( styleMonitor, StyleChange::DEFAULT_FONT_SIZE_CHANGE);
-
-  tet_infoline("Test that the StyleChanged signal is received only once");
-  DALI_TEST_EQUALS( styleChangedSignalHandler.signalCount, 1, TEST_LOCATION );
-
-  // Check that the editor's font style has been altered
-  pointSizeValue = editor.GetProperty(TextEditor::Property::POINT_SIZE);
-  pointSizeValue.Get( pointSize );
-
-  DALI_TEST_EQUALS( pointSize, 25.0f, 0.001, TEST_LOCATION );
-
-
-  END_TEST;
-}

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
index e53798f..1a6a0b3 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
@@ -20,7 +20,16 @@
 
 // INTERNAL INCLUDES
 
+// dali-test-suite-utils.h needed first, but want to prevent certain headers
+// from being read, as we want to override as much of their behaviour as possible.
+#define __DALI_STYLE_MONITOR_H__
+#define __DALI_ACCESSIBILITY_MANAGER_H__
+#define __DALI_TIMER_H__
+#define __DALI_CLIPBOARD_H__
+#define __DALI_IMF_MANAGER_H__
+
 #include <dali-test-suite-utils.h>
+
 #include "toolkit-test-application.h"
 #include "toolkit-application.h"
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
index b4f20a2..a7e0b46 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
@@ -24,6 +24,13 @@
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/signals/dali-signal.h>
 
+namespace Dali
+{
+const std::string Dali::StyleMonitor::DEFAULT_FONT_FAMILY("DefaultFont");
+const std::string Dali::StyleMonitor::DEFAULT_FONT_STYLE("Regular");
+const float       Dali::StyleMonitor::DEFAULT_FONT_SIZE(1.0f);
+}
+
 namespace
 {
 const char* DEFAULT_THEME=
@@ -50,9 +57,9 @@ typedef std::vector< NamedTheme > NamedThemes;
 NamedThemes gThemes;
 
 std::string gTheme;
-std::string gFontFamily("LucidaSans");
-std::string gFontStyle("Regular");
-int         gFontSize(1);
+std::string gFontFamily = Dali::StyleMonitor::DEFAULT_FONT_FAMILY;
+std::string gFontStyle  = Dali::StyleMonitor::DEFAULT_FONT_STYLE;
+float       gFontSize   = Dali::StyleMonitor::DEFAULT_FONT_SIZE;
 }
 
 namespace Dali
@@ -127,6 +134,7 @@ std::string StyleMonitor::GetDefaultFontStyle() const
 float StyleMonitor::GetDefaultFontSize() const
 {
   return gFontSize;
+
 }
 
 const std::string& StyleMonitor::GetTheme() const
@@ -212,7 +220,7 @@ std::string StyleMonitor::GetDefaultFontStyle() const
   return GetImplementation(*this).GetDefaultFontStyle();
 }
 
-int StyleMonitor::GetDefaultFontSize() const
+float StyleMonitor::GetDefaultFontSize() const
 {
   return GetImplementation(*this).GetDefaultFontSize();
 }
@@ -222,7 +230,7 @@ const std::string& StyleMonitor::GetTheme() const
   return GetImplementation(*this).GetTheme();
 }
 
-void StyleMonitor::SetTheme(const std::string& themeFilePath)
+void StyleMonitor::SetTheme(std::string themeFilePath)
 {
   GetImplementation(*this).SetTheme(themeFilePath);
 }
@@ -232,6 +240,11 @@ StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
   return GetImplementation(*this).StyleChangeSignal();
 }
 
+void StyleMonitor::EmitStyleChangeSignal(StyleChange::Type styleChange)
+{
+  GetImplementation(*this).EmitStyleChangeSignal(styleChange);
+}
+
 bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
 {
   return GetImplementation(*this).LoadThemeFile(filename, output);

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
index dc9a018..b69a7db 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
@@ -22,10 +22,58 @@
 #include <string>
 
 // INTERNAL INCLUDES
+#define __DALI_STYLE_MONITOR_H__
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/adaptor-framework/style-change.h>
-#include <dali/devel-api/adaptor-framework/style-monitor.h>
+
+namespace Dali
+{
+
+namespace Internal
+{
+namespace Adaptor
+{
+class StyleMonitor;
+}
+}
+
+class StyleMonitor : public BaseHandle
+{
+public: // Typedefs
+  typedef Signal< void (StyleMonitor, StyleChange::Type) > StyleChangeSignalType;
+  static const std::string DEFAULT_FONT_FAMILY;
+  static const std::string DEFAULT_FONT_STYLE;
+  static const float       DEFAULT_FONT_SIZE;
+
+public: // Creation & Destruction
+  StyleMonitor();
+  StyleMonitor(const StyleMonitor& monitor);
+  static StyleMonitor Get();
+  ~StyleMonitor();
+  static StyleMonitor DownCast( BaseHandle handle );
+
+public: // Style Information
+  std::string GetDefaultFontFamily() const;
+  std::string GetDefaultFontStyle() const;
+  float GetDefaultFontSize() const;
+  const std::string& GetTheme() const;
+  void SetTheme(std::string themeFilePath);
+  bool LoadThemeFile( const std::string& filename, std::string& output );
+
+public: // Signals
+  StyleChangeSignalType& StyleChangeSignal();
+  void EmitStyleChangeSignal(StyleChange::Type handle);
+
+public: // Operators
+  StyleMonitor& operator=(const StyleMonitor& monitor);
+
+public:
+  StyleMonitor(Internal::Adaptor::StyleMonitor* styleMonitor);
+};
+
+
+} // namespace Dali
 
 namespace Test
 {

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 9bbce3b..75780c3 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -988,7 +988,13 @@ void TextEditor::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange:
 
     case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
     {
-      GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+      DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor::OnStyleChange StyleChange::DEFAULT_FONT_SIZE_CHANGE (%f)\n", mController->GetDefaultPointSize() );
+
+      if ( (mController->GetDefaultPointSize() <= 0.0f) ) // If DefaultPointSize not set by Property system it will be 0.0f
+      {
+        // Property system did not set the PointSize so should update it.
+        // todo instruct text-controller to update model
+      }
       break;
     }
     case StyleChange::THEME_CHANGE:

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 4436731..655b63b 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1168,7 +1168,13 @@ void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::
 
     case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
     {
-      GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+      DALI_LOG_INFO( gLogFilter, Debug::General, "TextField::OnStyleChange StyleChange::DEFAULT_FONT_SIZE_CHANGE (%f)\n", mController->GetDefaultPointSize() );
+
+      if ( (mController->GetDefaultPointSize() <= 0.0f) ) // If DefaultPointSize not set by Property system it will be 0.0f
+      {
+        // Property system did not set the PointSize so should update it.
+        // todo instruct text-controller to update model
+      }
       break;
     }
     case StyleChange::THEME_CHANGE:

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 19e674b..308f947 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -680,7 +680,13 @@ void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::
 
     case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
     {
-      GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+      DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::OnStyleChange StyleChange::DEFAULT_FONT_SIZE_CHANGE (%f)\n", mController->GetDefaultPointSize() );
+
+      if ( (mController->GetDefaultPointSize() <= 0.0f) ) // If DefaultPointSize not set by Property system it will be 0.0f
+      {
+        // Property system did not set the PointSize so should update it.
+        // todo instruct text-controller to update model
+      }
       break;
     }
     case StyleChange::THEME_CHANGE:

diff --git a/docs/content/shared-javascript-and-cpp-documentation/font-selection.md b/docs/content/shared-javascript-and-cpp-documentation/font-selection.md
index d2bda2d..c8f46da 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/font-selection.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/font-selection.md
@@ -70,11 +70,7 @@ However the text control will fall-back to using the default font, if the reques
 
 ### Font Styles
 
-Setting a font size programmatically is not ideal for applications which support multiple
-screen resolutions and platforms which support multiple logical font sizes.  Also, any
-changes to the platform font settings will override any sizes that have been programmatically
-set.
-
+Setting a font size programmatically is not ideal for applications which support multiple screen resolutions etc.
 A more flexible approach is to prepare various JSON stylesheets, and request a different style for each platform:
 
 ~~~{.cpp}
@@ -100,13 +96,7 @@ To change the font for standard text controls, this JSON syntax can be used:
 ~~~
 
 However the same pointSize is unlikely to be suitable for all text controls in an application.
-To define custom styles for existing controls, simply set a style name for each case, and
-then provide a style override in JSON.
-
-To provide flexibility for the end user, the platform offers a mechanism to alter the logical
-font size between 0 and 4 inclusive. This logical size is mapped to a physical size using the
-stylesheets, by appending FontSizeN to the style name. These sections ("textlabelFontSizeN")
-in the style sheet are applied after the base section ("textlabel"), so take precedence.
+To set custom sizes simply set a "style name" for each case, and then provide a style override in JSON:
 
 ~~~{.cpp}
   // C++
@@ -116,7 +106,7 @@ in the style sheet are applied after the base section ("textlabel"), so take pre
 ~~~{.js}
   // JavaScript
 
-  label.styleName = "customLabel"';
+  label.styleName = "custom"';
 ~~~
 
 ~~~{.json}
@@ -127,59 +117,17 @@ in the style sheet are applied after the base section ("textlabel"), so take pre
     {
       "fontFamily":"FreeSerif",
       "fontStyle":"{\"weight\":\"bold\",\"slant\":\"italic\"}",
-    },
-
-    "textlabelFontSize0":
-    {
       "pointSize":8
     },
-    "textlabelFontSize1":
-    {
-      "pointSize":10
-    },
-    "textlabelFontSize2":
-    {
-      "pointSize":15
-    },
-    "textlabelFontSize3":
-    {
-      "pointSize":19
-    },
-    "textlabelFontSize4":
-    {
-      "pointSize":25
-    },
 
-    "customLabel":
-    {
-      "fontFamily":"TimesNewRoman",
-      "fontStyle":"{\"weight\":\"regular\",\"slant\":\"regular\"}",
-    },
-    "customLabelFontSize0":
+    "custom":
     {
       "pointSize":10
-    },
-    "customLabelFontSize1":
-    {
-      "pointSize":12
-    },
-    "customLabelFontSize2":
-    {
-      "pointSize":15
-    },
-    "customLabelFontSize3":
-    {
-      "pointSize":20
-    },
-    "customLabelFontSize4":
-    {
-      "pointSize":28
     }
   }
 }
 ~~~
 
-In the example above, at platform logical text size 0, standard text labels will have pointSize 8, and custom labels will have pointSize 10.
-
+In the example above, standard text labels will have pointSize 8, and "custom" labels will have pointSize 10.
 
 */

diff --git a/docs/content/shared-javascript-and-cpp-documentation/markup-style.md b/docs/content/shared-javascript-and-cpp-documentation/markup-style.md
index 1893273..dd40aa1 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/markup-style.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/markup-style.md
@@ -25,8 +25,7 @@ field.enableMarkup = true;
 dali.stage.add( field );
 ~~~
 
-Note the mark-up processor doesn't check the correctness of the mark-up string. This may
-cause the text to be badly rendered.
+Note the mark-up processor doesn't check the correctness of the mark-up string. This may cause the text to be badly rendered.
 
 The table below describes the priorities when styles are applied while rendering text.
 |  |  |  |  |
@@ -35,20 +34,6 @@ The table below describes the priorities when styles are applied while rendering
 | Priority 2 | Style set through the control properties. | Will override the default platform style. |  |
 | Priority 3 | Default platform style. |  |  |
 
-Font size has slightly different priorities - the size provided by the platform is a logical
-size, and can be mapped to physical point sizes using style sheets. There is a default set of
-sizes defined for DALi, and these can be overridden by application specific stylesheets. Thus
-the priorities are:
-
-|  |  |  |
-|--|--|--|
-| Priority 1 | Size set by markup string. | Will override the style set through the stylesheets. |
-| Priority 2 | Physical Size set by application style sheet | |
-| Priority 2 | Logical Size set by application style sheet | Mapping from platform logical to physical |
-| Priority 3 | Logical Size set by DALi style sheet | Mapping from platform logical to physical |
-
-See [Font Selection](@ref font-selection) for more details.
-
 Current supported tags are:
 
 ## \<color\>