Framework for Font styles

Change-Id: I4ef46e6e2d6ce644aa4a4aa507aa274728f9c736

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
index ee71ec4e0959acb069fdfaba548d8ba867723278..30ae3102d9cbea5ea4b4b10514a24e4d0dda59c3 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
@@ -162,6 +162,25 @@ bool TestPlatformAbstraction::IsLoading()
   return mIsLoadingResult;
 }
 
+/**
+ * @copydoc PlatformAbstraction::GetDefaultFontDescription()
+ */
+void TestPlatformAbstraction::GetDefaultFontDescription( std::string& family, std::string& style ) const
+{
+  mTrace.PushCall("GetDefaultFontFamily", "");
+  family = mGetDefaultFontFamilyResult;
+  style = mGetDefaultFontStyleResult;
+}
+
+/**
+ * @copydoc PlatformAbstraction::GetDefaultFontSize()
+ */
+int TestPlatformAbstraction::GetDefaultFontSize() const
+{
+  mTrace.PushCall("GetDefaultFontSize", "");
+  return mGetDefaultFontSizeResult;
+}
+
 /**
  * @copydoc PlatformAbstraction::SetDpi()
  */

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
index 682dd0df39b8d10c09598d4e7a3ae377dd09de13..3c19c751878ac31b24198dfdc8c1223df91d2d62 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <cstring>
+#include <string>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/set-wrapper.h>
@@ -132,6 +133,16 @@ public:
    */
   virtual bool IsLoading();
 
+  /**
+   * @copydoc PlatformAbstraction::GetDefaultFontFamily()
+   */
+  virtual void GetDefaultFontDescription( std::string& family, std::string& style ) const;
+
+  /**
+   * @copydoc PlatformAbstraction::GetDefaultFontSize()
+   */
+  virtual int GetDefaultFontSize() const;
+
   /**
    * @copydoc PlatformAbstraction::SetDpi()
    */
@@ -221,6 +232,9 @@ private:
   size_t                        mSeconds;
   size_t                        mMicroSeconds;
   bool                          mIsLoadingResult;
+  std::string                   mGetDefaultFontFamilyResult;
+  std::string                   mGetDefaultFontStyleResult;
+  int                           mGetDefaultFontSizeResult;
   Resources                     mResources;
   Integration::ResourceRequest* mRequest;
   Vector2                       mSize;

diff --git a/dali/integration-api/platform-abstraction.h b/dali/integration-api/platform-abstraction.h
index 9708d1cb3b81b243e8f3762228e003638adcb8ec..d256ccd7ca18cae95592cd10612f97d1abf105c9 100644 (file)
--- a/dali/integration-api/platform-abstraction.h
+++ b/dali/integration-api/platform-abstraction.h
@@ -161,6 +161,27 @@ public:
    */
   virtual void JoinLoaderThreads() = 0;
 
+  // Font Queries
+
+  /**
+   * Called by Dali to retrieve the default font family & style for the platform.
+   * Multi-threading note: this method will be called from the main thread only i.e. not
+   * from within the Core::Render() method.
+   * @param[out] The default font family.
+   * @param[out] The default font style.
+   */
+  virtual void GetDefaultFontDescription( std::string& family, std::string& style ) const = 0;
+
+  /**
+   * Called by Dali to retrieve the default font size for the platform.
+   * This is an accessibility size, which is mapped to a UI Control specific point-size in stylesheets.
+   * For example if zero the smallest size, this could potentially map to TextLabel point-size 8.
+   * Multi-threading note: this method will be called from the main thread only i.e. not
+   * from within the Core::Render() method.
+   * @return The default font size.
+   */
+  virtual int GetDefaultFontSize() const = 0;
+
   /**
    * Sets horizontal and vertical pixels per inch value that is used by the display
    * @param[in] dpiHorizontal horizontal dpi value