Fix Alignment to not fail when geom is larger han parent

[libs/gltk.git] / source / list.cpp

diff --git a/source/list.cpp b/source/list.cpp
index 8c0d789188ab917221336d98f09efbc66bb561fe..04adb399cc2adf237b3384384ac807ea5b6b5ff3 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
 #include "graphic.h"
@@ -147,6 +148,7 @@ void List::render_special(const Part &part) const
        {
                const GL::Font *const font=style->get_font();
                const float font_size=font->get_default_size();
+               const GL::Color &color=style->get_font_color();
                const unsigned row_height=static_cast<unsigned>(font_size);
                const Sides &margin=part.get_margin();
 
@@ -159,13 +161,16 @@ void List::render_special(const Part &part) const
                        Geometry rgeom;
                        rgeom.w=static_cast<unsigned>(font->get_string_width(items[first+i])*font_size);
                        rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+                       rgeom.x=margin.left;
                        rgeom.y=geom.h-margin.top-(i+1)*row_height-static_cast<int>(font->get_descent()*font_size);
                        part.get_alignment().apply(rgeom, pgeom);
 
                        GL::push_matrix();
                        GL::translate(rgeom.x, rgeom.y, 0);
                        GL::scale_uniform(font_size);
-                       font->draw_string(items[first+i]);
+                       GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
+                       imm.color(color.r, color.g, color.b);
+                       font->draw_string(items[first+i], imm);
                        GL::pop_matrix();
                }
        }