wok-next annotate font-manager/stuff/patches/2017.06.patch @ rev 20715
Up nsd (4.1.21)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun May 27 13:10:46 2018 +0300 (2018-05-27) |
| parents | |
| children |
| rev | line source |
|---|---|
| al@20108 | 1 --- lib/UX/Models/CollectionModel.vala 2017-06-29 16:17:28.997795458 +0800 |
| al@20108 | 2 +++ lib/UX/Models/CollectionModel.vala 2017-06-29 16:17:22.227415589 +0800 |
| al@20108 | 3 @@ -104,7 +104,7 @@ |
| al@20108 | 4 return sorted; |
| al@20108 | 5 } |
| al@20108 | 6 |
| al@20108 | 7 - void insert_children (Gee.ArrayList <Filter> groups, Gtk.TreeIter parent) { |
| al@20108 | 8 + void insert_children (Gee.ArrayList <Collection> groups, Gtk.TreeIter parent) { |
| al@20108 | 9 var sorted = sort_groups(groups); |
| al@20108 | 10 foreach(var child in sorted) { |
| al@20108 | 11 Gtk.TreeIter _iter; |
| al@20108 | 12 --- src/font-manager/State.vala 2017-06-29 16:42:40.268868810 +0800 |
| al@20108 | 13 +++ src/font-manager/State.vala 2017-06-29 16:42:55.579554795 +0800 |
| al@20108 | 14 @@ -25,8 +25,8 @@ |
| al@20108 | 15 |
| al@20108 | 16 public class State : Object { |
| al@20108 | 17 |
| al@20108 | 18 - internal static const int DEFAULT_WIDTH = 700; |
| al@20108 | 19 - internal static const int DEFAULT_HEIGHT = 480; |
| al@20108 | 20 + internal const int DEFAULT_WIDTH = 700; |
| al@20108 | 21 + internal const int DEFAULT_HEIGHT = 480; |
| al@20108 | 22 |
| al@20108 | 23 public Settings? settings { get; set; default = null; } |
| al@20108 | 24 public weak MainWindow? main_window { get; set; default = null; } |
| al@20108 | 25 --- src/font-manager/Compare.vala 2017-06-29 16:43:14.080385035 +0800 |
| al@20108 | 26 +++ src/font-manager/Compare.vala 2017-06-29 16:43:31.427831486 +0800 |
| al@20108 | 27 @@ -280,9 +280,17 @@ |
| al@20108 | 28 * the iter was always being set to null after calling remove. |
| al@20108 | 29 */ |
| al@20108 | 30 string iter_as_string = store.get_string_from_iter(iter); |
| al@20108 | 31 +#if VALA_0_36 |
| al@20108 | 32 + store.remove(ref iter); |
| al@20108 | 33 +#else |
| al@20108 | 34 store.remove(iter); |
| al@20108 | 35 +#endif |
| al@20108 | 36 store.get_iter_from_string(out iter, iter_as_string); |
| al@20108 | 37 +#if VALA_0_36 |
| al@20108 | 38 + bool still_valid = store.remove(ref iter); |
| al@20108 | 39 +#else |
| al@20108 | 40 bool still_valid = store.remove(iter); |
| al@20108 | 41 +#endif |
| al@20108 | 42 /* Set the cursor to a remaining row instead of having the cursor disappear. |
| al@20108 | 43 * This allows for easy deletion of multiple previews by hitting the remove |
| al@20108 | 44 * button repeatedly. |