Merge ../birdfont-2.x

Changed files (2)

• modified libbirdfont/OverView.vala
• modified libbirdfont/OverviewTools.vala

Diff

diff --git a/libbirdfont/OverView.vala b/libbirdfont/OverView.valaindex 0460731..d3a8e07 100644--- a/libbirdfont/OverView.vala+++ b/libbirdfont/OverView.vala@@ -51,7 +51,7 @@ public class OverView : FontDisplay { 	 	string search_query = ""; 	-	Gee.ArrayList<OverViewItem> visible_items = new Gee.ArrayList<OverViewItem> ();+	public Gee.ArrayList<OverViewItem> visible_items = new Gee.ArrayList<OverViewItem> (); 	 	/** List of undo commands. */ 	public Gee.ArrayList<OverViewUndoItem> undo_items = new Gee.ArrayList<OverViewUndoItem> ();@@ -1335,11 +1335,10 @@ public class OverView : FontDisplay { 					} 				} 				-				if (is_null(i.version_menu)) {-					update = true;+				if (!is_null (i.version_menu)) {+					update = !i.version_menu.menu_visible; 				} else {-					VersionList v = (!) i.version_menu;-					update = !v.menu_visible;+					update = true; 				} 			} 			index++;diff --git a/libbirdfont/OverviewTools.vala b/libbirdfont/OverviewTools.valaindex 0c44523..e917d2a 100644--- a/libbirdfont/OverviewTools.vala+++ b/libbirdfont/OverviewTools.vala@@ -284,6 +284,10 @@ public class OverviewTools : ToolCollection  { 			} 		} 		+		foreach (OverViewItem item in o.visible_items) {+			item.draw_glyph_from_font ();	+		}+		 		o.undo_items.add (ui); 		 		MainWindow.get_overview ().update_item_list ();