diff options
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/FbDrawable.hh | 2 | ||||
-rw-r--r-- | src/FbTk/Font.cc | 1 | ||||
-rw-r--r-- | src/FbTk/Font.hh | 20 | ||||
-rw-r--r-- | src/FbTk/Theme.hh | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh index 0aeeb9a..709e91b 100644 --- a/src/FbTk/FbDrawable.hh +++ b/src/FbTk/FbDrawable.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // FbDrawable.hh for FbTk - Fluxbox ToolKit | 1 | // FbDrawable.hh for FbTk - Fluxbox ToolKit |
2 | // Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org) | 2 | // Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index e1fa88e..3b17fda 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
@@ -352,6 +352,7 @@ void Font::setAntialias(bool flag) { | |||
352 | } | 352 | } |
353 | 353 | ||
354 | bool Font::load(const std::string &name) { | 354 | bool Font::load(const std::string &name) { |
355 | |||
355 | if (name.size() == 0) | 356 | if (name.size() == 0) |
356 | return false; | 357 | return false; |
357 | // default values for font options | 358 | // default values for font options |
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index 3b04790..d8f0f46 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh | |||
@@ -1,6 +1,6 @@ | |||
1 | // Font.cc for FbTk | 1 | // Font.cc for FbTk |
2 | // Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org) | 2 | // Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
6 | // to deal in the Software without restriction, including without limitation | 6 | // to deal in the Software without restriction, including without limitation |
@@ -54,7 +54,7 @@ public: | |||
54 | 54 | ||
55 | /// called at FbTk::App destruction time, cleans up what was inited first | 55 | /// called at FbTk::App destruction time, cleans up what was inited first |
56 | static void shutdown(); | 56 | static void shutdown(); |
57 | 57 | ||
58 | /// @return true if multibyte is enabled, else false | 58 | /// @return true if multibyte is enabled, else false |
59 | static bool multibyte() { return m_multibyte; } | 59 | static bool multibyte() { return m_multibyte; } |
60 | /// @return true if utf-8 mode is enabled, else false | 60 | /// @return true if utf-8 mode is enabled, else false |
@@ -64,7 +64,7 @@ public: | |||
64 | 64 | ||
65 | Font(const char *name=0, bool antialias = false); | 65 | Font(const char *name=0, bool antialias = false); |
66 | virtual ~Font(); | 66 | virtual ~Font(); |
67 | /** | 67 | /** |
68 | Load a font | 68 | Load a font |
69 | @return true on success, else false and it'll fall back on the last | 69 | @return true on success, else false and it'll fall back on the last |
70 | loaded font | 70 | loaded font |
@@ -80,11 +80,11 @@ public: | |||
80 | @return size of text in pixels | 80 | @return size of text in pixels |
81 | */ | 81 | */ |
82 | unsigned int textWidth(const char * const text, unsigned int size) const; | 82 | unsigned int textWidth(const char * const text, unsigned int size) const; |
83 | unsigned int height() const; | 83 | unsigned int height() const; |
84 | int ascent() const; | 84 | int ascent() const; |
85 | int descent() const; | 85 | int descent() const; |
86 | /** | 86 | /** |
87 | Rotate font in any angle | 87 | Rotate font in any angle |
88 | (currently only 90 degrees supported and just XFont implementation) | 88 | (currently only 90 degrees supported and just XFont implementation) |
89 | */ | 89 | */ |
90 | void rotate(float angle); | 90 | void rotate(float angle); |
@@ -99,9 +99,9 @@ public: | |||
99 | @param x position | 99 | @param x position |
100 | @param y position | 100 | @param y position |
101 | @param rotate if the text should be drawn rotated (if it's rotated before) | 101 | @param rotate if the text should be drawn rotated (if it's rotated before) |
102 | */ | 102 | */ |
103 | void drawText(const FbDrawable &w, int screen, GC gc, | 103 | void drawText(const FbDrawable &w, int screen, GC gc, |
104 | const char *text, size_t len, | 104 | const char *text, size_t len, |
105 | int x, int y, bool rotate=true) const; | 105 | int x, int y, bool rotate=true) const; |
106 | bool isAntialias() const { return m_antialias; } | 106 | bool isAntialias() const { return m_antialias; } |
107 | /// @return true if the font is rotated, else false | 107 | /// @return true if the font is rotated, else false |
@@ -111,7 +111,7 @@ public: | |||
111 | bool shadow() const { return m_shadow; } | 111 | bool shadow() const { return m_shadow; } |
112 | bool halo() const { return m_halo; } | 112 | bool halo() const { return m_halo; } |
113 | private: | 113 | private: |
114 | 114 | ||
115 | std::auto_ptr<FontImp> m_fontimp; ///< font implementation | 115 | std::auto_ptr<FontImp> m_fontimp; ///< font implementation |
116 | std::string m_fontstr; ///< font name | 116 | std::string m_fontstr; ///< font name |
117 | static bool m_multibyte; ///< if the fontimp should be a multibyte font | 117 | static bool m_multibyte; ///< if the fontimp should be a multibyte font |
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh index affd60a..18348c2 100644 --- a/src/FbTk/Theme.hh +++ b/src/FbTk/Theme.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // Theme.hh for FbTk - Fluxbox ToolKit | 1 | // Theme.hh for FbTk - Fluxbox ToolKit |
2 | // Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at fluxbox dot org) | 2 | // Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |