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