X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.cpp;h=cc9f707efa1d9dadf008e585101f0a6365c15782;hb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;hp=5665ef5dc264391f7020005d5635be43c30009d8;hpb=af13797a82b242a3cd8fdd405b057a9e311631ac;p=libs%2Fgltk.git diff --git a/source/list.cpp b/source/list.cpp index 5665ef5..cc9f707 100644 --- a/source/list.cpp +++ b/source/list.cpp @@ -1,10 +1,11 @@ /* $Id$ This file is part of libmspgltk -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#include #include #include #include "graphic.h" @@ -20,24 +21,21 @@ namespace GLtk { List::List(const Resources &r): Widget(r), + Container(r), sel_index(-1), first(0), n_visible(1), + row_height(1), items_part(0), - slider(new VSlider(res)), - slider_active(false) + slider(res) { - slider->set_step(1); - slider->signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed)); + add(slider); + slider.set_step(1); + slider.signal_value_changed.connect(sigc::mem_fun(this, &List::slider_value_changed)); update_style(); } -List::~List() -{ - delete slider; -} - void List::append(const string &v) { items.push_back(v); @@ -71,6 +69,21 @@ void List::clear() { items.clear(); sel_index=-1; + + recalculate_parameters(); +} + +void List::set_selected_index(int i) +{ + if(i<0) + sel_index=-1; + else if(i(items.size())) + { + sel_index=i; + signal_item_selected.emit(sel_index, items[sel_index]); + } + else + throw InvalidParameterValue("Index out of range"); } const string &List::get_selected() const @@ -83,17 +96,9 @@ const string &List::get_selected() const void List::button_press(int x, int y, unsigned btn) { - if(slider->get_geometry().is_inside(x, y)) - { - const Geometry &sgeom=slider->get_geometry(); - slider->button_press(x-sgeom.x, y-sgeom.y, btn); - slider_active=true; - } - else if(btn==1) + Container::button_press(x, y, btn); + if(!click_focus && btn==1) { - const GL::Font *const font=style->get_font(); - const unsigned row_height=static_cast(font->get_default_size()); - if(items_part) y+=items_part->get_margin().top; @@ -107,49 +112,34 @@ void List::button_press(int x, int y, unsigned btn) } } -void List::button_release(int x, int y, unsigned btn) -{ - if(slider_active) - { - const Geometry &sgeom=slider->get_geometry(); - slider->button_release(x-sgeom.x, y-sgeom.y, btn); - slider_active=false; - } -} - -void List::pointer_motion(int x, int y) -{ - if(slider_active) - { - const Geometry &sgeom=slider->get_geometry(); - slider->pointer_motion(x-sgeom.x, y-sgeom.y); - } -} - void List::render_special(const Part &part) const { if(part.get_name()=="items") { - const GL::Font *const font=style->get_font(); - const float font_size=font->get_default_size(); - const unsigned row_height=static_cast(font_size); + const GL::Font &font=*style->get_font(); + const float font_size=font.get_default_size(); + const GL::Color &color=style->get_font_color(); const Sides &margin=part.get_margin(); Geometry pgeom=geom; pgeom.h=row_height; + pgeom.w-=margin.left+margin.right; for(unsigned i=0; (i(font->get_string_width(items[first+i])*font_size); - rgeom.h=static_cast((font->get_ascent()-font->get_descent())*font_size); - rgeom.y=geom.h-margin.top-(i+1)*row_height-static_cast(font->get_descent()*font_size); + rgeom.w=static_cast(font.get_string_width(items[first+i])*font_size); + rgeom.h=row_height; + rgeom.x=margin.left; + rgeom.y=geom.h-margin.top-(i+1)*row_height-static_cast(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(); } } @@ -157,9 +147,6 @@ void List::render_special(const Part &part) const { if(sel_index>=static_cast(first) && sel_index(first+n_visible)) { - const GL::Font *const font=style->get_font(); - const float font_size=font->get_default_size(); - const unsigned row_height=static_cast(font_size); const Sides &margin=part.get_margin(); Geometry pgeom=geom; @@ -178,7 +165,7 @@ void List::render_special(const Part &part) const } } else if(part.get_name()=="slider") - slider->render(); + slider.render(); } void List::on_geometry_change() @@ -197,6 +184,9 @@ void List::on_style_change() if(i->get_name()=="items") items_part=&*i; + const GL::Font &font=*style->get_font(); + row_height=static_cast((font.get_ascent()-font.get_descent())*font.get_default_size()); + recalculate_parameters(); } @@ -207,15 +197,12 @@ void List::reposition_slider() { Geometry sgeom=i->get_geometry(); i->get_alignment().apply(sgeom, geom, i->get_margin()); - slider->set_geometry(sgeom); + slider.set_geometry(sgeom); } } void List::recalculate_parameters() { - const GL::Font *font=style->get_font(); - unsigned row_height=static_cast(font->get_default_size()); - unsigned h=geom.h; if(items_part) { @@ -235,19 +222,20 @@ void List::recalculate_parameters() if(items.size()>n_visible) { - slider->set_range(0, items.size()-n_visible); - slider->set_value(items.size()-n_visible-first); + slider.set_range(0, items.size()-n_visible); + slider.set_value(items.size()-n_visible-first); } else { - slider->set_range(0, 0); - slider->set_value(0); + slider.set_range(0, 0); + slider.set_value(0); } } void List::slider_value_changed(double value) { - first=items.size()-n_visible-static_cast(value); + if(items.size()>n_visible) + first=items.size()-n_visible-static_cast(value); } @@ -259,7 +247,7 @@ List::Loader::Loader(List &l): void List::Loader::item(const string &v) { - static_cast(wdg).append(v); + dynamic_cast(wdg).append(v); } } // namespace GLtk