Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-24 00:05:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compile with clang and add cotire

Browse Source 
* Add cotire cmake module to speedup compilation https://github.com/sakra/cotire
* Fix clang error and warnings
* Rename Font to BitmapFont to fix conflict with Xlib.g Font typedef
* Remove legacy PCH support
* Improve Position hash
This commit is contained in:
Eduardo Bart
2012-06-16 20:19:43 -03:00
parent 4813b7eb4b
commit 10b33c6124
24 changed files with 2835 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/framework/graphics/cachedtext.h
View File

@@ -34,13 +34,13 @@ public:
void draw(const Rect& rect);
void wrapText(int maxWidth);
void setFont(const FontPtr& font) { m_font = font; update(); }
void setFont(const BitmapFontPtr& font) { m_font = font; update(); }
void setText(const std::string& text) { m_text = text; update(); }
void setAlign(Fw::AlignmentFlag align) { m_align = align; update(); }
Size getTextSize() { return m_textSize; }
std::string getText() { return m_text; }
FontPtr getFont() { return m_font; }
BitmapFontPtr getFont() { return m_font; }
Fw::AlignmentFlag getAlign() { return m_align; }
private:
@@ -51,7 +51,7 @@ private:
Boolean<true> m_textMustRecache;
CoordsBuffer m_textCoordsBuffer;
Rect m_textCachedScreenCoords;
FontPtr m_font;
BitmapFontPtr m_font;
Fw::AlignmentFlag m_align;
};