Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-10-08 18:28:21 +0000
committerStijn Buys <ingar@osirion.org>2008-10-08 18:28:21 +0000
commit4331f5c17901f46693dcb5c2df96276f6851be25 (patch)
tree903f70d18c7842121c5409a5ec121e0a565fd5ef /src/ui/label.cc
parente3b810e1fe8ced1e0245f8d999bdc9136cfcdc70 (diff)
libui updates, paint namespace, font and palette fixes, button sound
Diffstat (limited to 'src/ui/label.cc')
-rw-r--r--src/ui/label.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/label.cc b/src/ui/label.cc
index aee6a36..1b142c4 100644
--- a/src/ui/label.cc
+++ b/src/ui/label.cc
@@ -5,7 +5,7 @@
*/
#include "math/vector2f.h"
-#include "render/primitives.h"
+#include "ui/paint.h"
#include "ui/label.h"
using math::Vector2f;
@@ -53,10 +53,8 @@ void Label::draw_text()
if (!label_text.size())
return;
- if (palette())
- render::gl::color(palette()->foreground());
-
- render::primitives::text_centered(global_location(), size(), label_text);
+ paint::color(palette()->foreground());
+ paint::text_centered(global_location(), size(), text(), font());
}
}