Return a reference from Style::get_font

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

diff --git a/source/list.cpp b/source/list.cpp
index ea3969ce16dbb466591a642bdcff01c1e1150ed5..a886118ed6c98b8341effd74de1d6fc4c6f61018 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
@@ -47,12 +40,13 @@ void List::autosize_rows(unsigned n)
        if(items_part)
        {
                const Sides &margin = items_part->get_margin();
-               float font_size = style->get_font()->get_default_size();
+               const GL::Font &font = style->get_font();
+               float font_size = style->get_font_size();
 
                unsigned max_w = 0;
                for(vector<string>::iterator i=items.begin(); i!=items.end(); ++i)
                {
-                       unsigned w = static_cast<unsigned>(style->get_font()->get_string_width(*i)*font_size);
+                       unsigned w = static_cast<unsigned>(font.get_string_width(*i)*font_size);
                        max_w = max(max_w, w);
                }
 
@@ -91,21 +85,23 @@ void List::append(const string &v)
 {
        items.push_back(v);
        check_view_range();
+       signal_autosize_changed.emit();
 }
 
 void List::insert(unsigned i, const string &v)
 {
        if(i>items.size())
-               throw InvalidParameterValue("Index out of range");
+               throw out_of_range("List::insert");
 
        items.insert(items.begin()+i, v);
        check_view_range();
+       signal_autosize_changed.emit();
 }
 
 void List::remove(unsigned i)
 {
        if(i>items.size())
-               throw InvalidParameterValue("Index out of range");
+               throw out_of_range("List::remove");
 
        items.erase(items.begin()+i);
        if(sel_index>static_cast<int>(i))
@@ -114,6 +110,7 @@ void List::remove(unsigned i)
                sel_index = -1;
 
        check_view_range();
+       signal_autosize_changed.emit();
 }
 
 void List::clear()
@@ -122,6 +119,7 @@ void List::clear()
        sel_index = -1;
 
        check_view_range();
+       signal_autosize_changed.emit();
 }
 
 void List::set_selected_index(int i)
@@ -134,13 +132,13 @@ void List::set_selected_index(int i)
                signal_item_selected.emit(sel_index, items[sel_index]);
        }
        else
-               throw InvalidParameterValue("Index out of range");
+               throw out_of_range("List::set_selected_index");
 }
 
 const string &List::get_selected() const
 {
        if(sel_index<0)
-               throw InvalidState("No selection");
+               throw logic_error("sel_index<0");
 
        return items[sel_index];
 }
@@ -225,8 +223,8 @@ void List::on_style_change()
 
        items_part = style->get_part("items");
 
-       const GL::Font &font = *style->get_font();
-       row_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_default_size());
+       const GL::Font &font = style->get_font();
+       row_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
 
        check_view_range();
 }