atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correction of the fond selection

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-04 21:00:46 +01:00
parent 1d58222faa
commit 5f7e692fa4
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/ewol/compositing/Text.cpp
View File

@ -269,6 +269,9 @@ void ewol::Text::setFontSize(int32_t _fontSize) {
etk::UString fontName = ""; etk::UString fontName = "";
if (m_font != NULL) { if (m_font != NULL) {
fontName = m_font->getName(); fontName = m_font->getName();
// Remove the :XX for the size ...
int32_t pos = fontName.findForward(':');
fontName.remove(pos, fontName.size()-pos);
} }
setFont(fontName, _fontSize); setFont(fontName, _fontSize);
} }

1
sources/ewol/renderer/ConfigFont.cpp
View File

@ -28,6 +28,7 @@ ewol::ConfigFont::~ConfigFont(void) {
void ewol::ConfigFont::set(const etk::UString& _fontName, int32_t _size) { void ewol::ConfigFont::set(const etk::UString& _fontName, int32_t _size) {
m_name = _fontName; m_name = _fontName;
m_size = _size; m_size = _size;
EWOL_INFO("Set default Font : '" << _fontName << "' size=" << _size);
} }

24
sources/ewol/renderer/ConfigFont.h
View File

@ -29,12 +29,16 @@ namespace ewol
* @brief Specify the default font folder for the Ewol search system (only needed when embended font) * @brief Specify the default font folder for the Ewol search system (only needed when embended font)
* @param[in] _folder basic folder of the font (ex: DATA:fonts) * @param[in] _folder basic folder of the font (ex: DATA:fonts)
*/ */
void setFolder(const etk::UString& _folder) { m_folder = _folder; }; void setFolder(const etk::UString& _folder) {
m_folder = _folder;
};
/** /**
* @brief get the default font folder. * @brief get the default font folder.
* @return The default font folder. * @return The default font folder.
*/ */
const etk::UString& getFolder(void) { return m_folder; }; const etk::UString& getFolder(void) {
return m_folder;
};
private: private:
etk::UString m_name; etk::UString m_name;
int32_t m_size; int32_t m_size;
@ -49,12 +53,16 @@ namespace ewol
* @brief get the current default font name * @brief get the current default font name
* @raturn a reference on the font name string * @raturn a reference on the font name string
*/ */
const etk::UString& getName(void) { return m_name; }; const etk::UString& getName(void) {
return m_name;
};
/** /**
* @brief get the default font size. * @brief get the default font size.
* @return the font size. * @return the font size.
*/ */
int32_t getSize(void) { return m_size; }; int32_t getSize(void) {
return m_size;
};
private: private:
bool m_useExternal; bool m_useExternal;
public: public:
@ -62,12 +70,16 @@ namespace ewol
* @brief set use of internal/external Font * @brief set use of internal/external Font
* @param[in] _val true to enable search of internal data. * @param[in] _val true to enable search of internal data.
*/ */
void setUseExternal(bool _val) { m_useExternal=_val; }; void setUseExternal(bool _val) {
m_useExternal=_val;
};
/** /**
* @brief get the use of internal/external Font * @brief get the use of internal/external Font
* @return true to enable search of internal data. * @return true to enable search of internal data.
*/ */
bool getUseExternal(void) { return m_useExternal; }; bool getUseExternal(void) {
return m_useExternal;
};
}; };
}; };