diff options
| author | Alessandro Ghedini <al3xbio@gmail.com> | 2012-03-19 16:35:31 +0100 |
|---|---|---|
| committer | Alessandro Ghedini <al3xbio@gmail.com> | 2012-03-19 16:35:31 +0100 |
| commit | 29a84e1125d507fcaf5d0cb39148ccaaa2d7ae58 (patch) | |
| tree | 7d1c8e1c1b1d89af3a962671f60a422aa62af890 /src/images | |
| parent | 178b4f90e26d6240aeaf5e455e4e78b3f4883bba (diff) | |
| parent | a248b1597394b4ee9a5817bc95c3c116e76cdd8f (diff) | |
Merge tag 'upstream/0.5.2'
Upstream version 0.5.2
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/icon.vala | 4 | ||||
| -rw-r--r-- | src/images/renderedText.vala | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/images/icon.vala b/src/images/icon.vala index e942e7c..42be41f 100644 --- a/src/images/icon.vala +++ b/src/images/icon.vala @@ -105,7 +105,7 @@ public class Icon : Image { return icon_name; warning("Icon \"" + icon_name + "\" not found! Using default icon..."); - icon_name = "application-default-icon"; + icon_name = "stock_unknown"; } @@ -115,7 +115,7 @@ public class Icon : Image { if (result == "") { warning("Icon \"" + icon_name + "\" not found! Using default icon..."); - icon_name = "application-default-icon"; + icon_name = "stock_unknown"; file = icon_theme.lookup_icon(icon_name, size, 0); if (file != null) result = file.get_filename(); } diff --git a/src/images/renderedText.vala b/src/images/renderedText.vala index e99d26a..544af1f 100644 --- a/src/images/renderedText.vala +++ b/src/images/renderedText.vala @@ -71,21 +71,29 @@ public class RenderedText : Image { // add newlines at the end of each line, in order to allow ellipsizing string broken_string = ""; - var lines = layout.get_lines().copy(); - foreach (var line in lines) { + for (int i=0; i<layout.get_line_count(); ++i) { - string next_line = text.substring(line.start_index, line.length); + string next_line = ""; + if (i == layout.get_line_count() -1) + next_line = text.substring(layout.get_line(i).start_index, -1); + else + next_line = text.substring(layout.get_line(i).start_index, layout.get_line(i).length); if (broken_string == "") { broken_string = next_line; } else if (next_line != "") { // test whether the addition of a line would cause the height to become too large string broken_string_tmp = broken_string + "\n" + next_line; + + var layout_tmp = Pango.cairo_create_layout(ctx); + layout_tmp.set_width(Pango.units_from_double(width)); + + layout_tmp.set_font_description(font_description); - layout.set_text(broken_string_tmp, -1); + layout_tmp.set_text(broken_string_tmp, -1); Pango.Rectangle extents; - layout.get_pixel_extents(null, out extents); + layout_tmp.get_pixel_extents(null, out extents); if (extents.height > height) broken_string = broken_string + next_line; else broken_string = broken_string_tmp; |