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>2011-07-30 13:36:45 +0000
committerStijn Buys <ingar@osirion.org>2011-07-30 13:36:45 +0000
commitb492615fb68e5c97fce87bcc946e92f115cfc3a2 (patch)
treeeb90e46894bd351332f64874babc5cef3959a2bd /src/ui/ui.cc
parent3a28abfa64d02b8d530689c425f6ed476a14fe9c (diff)
Added support for tiled ui materials, changed default widget backgrounds to use ui materials.
Diffstat (limited to 'src/ui/ui.cc')
-rw-r--r--src/ui/ui.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ui/ui.cc b/src/ui/ui.cc
index b162394..252faa6 100644
--- a/src/ui/ui.cc
+++ b/src/ui/ui.cc
@@ -568,7 +568,6 @@ void UI::draw_pointer()
} else {
c.a = 0.5f;
}
- Paint::set_color(c);
math::Vector2f pos(mouse_cursor.x() - pointer_size * 0.5f, mouse_cursor.y() - pointer_size * 0.5f);
math::Vector2f s(pointer_size, pointer_size);
@@ -586,7 +585,7 @@ void UI::draw_pointer()
gl::translate(-mouse_cursor.x(), -mouse_cursor.y(), 0);
}
- Paint::draw_bitmap(pos, s, texture);
+ Paint::draw_bitmap(pos, s, c, texture);
if (mouse_pointer_animated) {
gl::pop();