X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Ftext.cpp;fp=source%2Ftext.cpp;h=2e4d9cb88f4c5c0394b2edf137866dc14cbb295f;hp=166bbb5212c7145fbc1c39bbfccf44cf7441354f;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hpb=762a689d799075c0a10e1633bf95d53de80b4572 diff --git a/source/text.cpp b/source/text.cpp index 166bbb5..2e4d9cb 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -18,8 +18,8 @@ struct Text::RenderData struct Text::CoordsToGeomData { - unsigned row; - unsigned col; + size_t row; + size_t col; Geometry result; }; @@ -80,7 +80,7 @@ void Text::set(const string &t) find_lines(); } -void Text::erase(unsigned pos, unsigned len) +void Text::erase(size_t pos, size_t len) { check_alignment(pos); check_alignment(pos+len); @@ -100,7 +100,7 @@ void Text::erase(unsigned pos, unsigned len) } } -void Text::insert(unsigned pos, const string &s) +void Text::insert(size_t pos, const string &s) { check_alignment(pos); text.insert(pos, s); @@ -119,7 +119,7 @@ void Text::insert(unsigned pos, const string &s) } } -unsigned Text::get_visible_lines(const Part &part, const Geometry &parent, unsigned *fit_height) const +size_t Text::get_visible_lines(const Part &part, const Geometry &parent, unsigned *fit_height) const { const GL::Font &font = style->get_font(); float font_size = style->get_font_size(); @@ -129,21 +129,21 @@ unsigned Text::get_visible_lines(const Part &part, const Geometry &parent, unsig const Sides &margin = part.get_margin(); unsigned vmargin = margin.top+margin.bottom; unsigned free_height = max(parent.h, vmargin)-vmargin+line_spacing-line_height; - unsigned n_lines = min(lines.size(), max(free_height/line_spacing, 1U)); + size_t n_lines = min(lines.size(), max(free_height/line_spacing, 1U)); if(fit_height) *fit_height = line_height+(n_lines-1)*line_spacing; return n_lines; } -unsigned Text::get_line_length(unsigned i) const +size_t Text::get_line_length(size_t i) const { if(i>=lines.size()) throw out_of_range("Text::get_line_length"); return lines[i].length; } -unsigned Text::move_offset(unsigned offs, int change) const +size_t Text::move_offset(size_t offs, ptrdiff_t change) const { check_alignment(offs); if(!change) @@ -169,7 +169,7 @@ unsigned Text::move_offset(unsigned offs, int change) const return i-text.begin(); } -void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const +void Text::offset_to_coords(size_t offs, size_t &row, size_t &col) const { if(lines.empty()) { @@ -178,7 +178,7 @@ void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const return; } - for(unsigned i=0; i=lines[i].start && offs<=lines[i].start+lines[i].bytes) { row = i; @@ -190,7 +190,7 @@ void Text::offset_to_coords(unsigned offs, unsigned &row, unsigned &col) const } } -unsigned Text::coords_to_offset(unsigned row, unsigned col) const +size_t Text::coords_to_offset(size_t row, size_t col) const { if(row>=lines.size()) return text.size(); @@ -210,7 +210,7 @@ unsigned Text::coords_to_offset(unsigned row, unsigned col) const } } -Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsigned first_row, unsigned row, unsigned col) const +Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, size_t first_row, size_t row, size_t col) const { if(row>=lines.size()) row = lines.size()-1; @@ -232,7 +232,7 @@ void Text::build(const Part &part, State state, const Geometry &parent, PartCach build(part, state, parent, 0, cache); } -void Text::build(const Part &part, State state, const Geometry &parent, unsigned first_row, PartCache &cache) const +void Text::build(const Part &part, State state, const Geometry &parent, size_t first_row, PartCache &cache) const { if(!style || lines.empty()) return; @@ -280,18 +280,18 @@ void Text::find_lines() } } -unsigned Text::count_characters(unsigned start, unsigned bytes) const +size_t Text::count_characters(size_t start, size_t bytes) const { StringCodec::Utf8::Decoder dec; auto i = text.begin()+start; auto end = i+bytes; - unsigned count = 0; + size_t count = 0; for(; i -void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, void (Text::*func)(unsigned, const Geometry &, T &) const, T &data) const +void Text::process_lines(const Part &part, const Geometry &parent, size_t first_row, void (Text::*func)(size_t, const Geometry &, T &) const, T &data) const { if(!style) return; @@ -310,10 +310,10 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs int y_offset = static_cast(-font.get_descent()*font_size); unsigned fit_height; - unsigned n_lines = get_visible_lines(part, parent, &fit_height); - first_row = min(first_row, lines.size()-n_lines); + size_t n_lines = get_visible_lines(part, parent, &fit_height); + first_row = min(first_row, lines.size()-n_lines); - for(unsigned i=0; iget_font().build_string(text.substr(line.start, line.bytes), *data.bld); } -void Text::coords_to_geom_line(unsigned i, const Geometry &rgeom, CoordsToGeomData &data) const +void Text::coords_to_geom_line(size_t i, const Geometry &rgeom, CoordsToGeomData &data) const { if(i==data.row) { @@ -349,7 +349,7 @@ void Text::coords_to_geom_line(unsigned i, const Geometry &rgeom, CoordsToGeomDa else { StringCodec::Utf8::Decoder dec; - for(unsigned c=data.col; c; --c) + for(size_t c=data.col; c; --c) dec.decode_char(text, j); } float w = style->get_font().get_string_width(string(begin, j));