Fix copy and paste in overview

Changed files (6)

• modified libbirdfont/GlyphSelection.vala
• modified libbirdfont/LanguageSelectionTab.vala
• modified libbirdfont/MainWindow.vala
• modified libbirdfont/MenuTab.vala
• modified libbirdfont/OverView.vala
• modified libbirdfont/OverviewTools.vala

Diff

diff --git a/libbirdfont/GlyphSelection.vala b/libbirdfont/GlyphSelection.valaindex 19ecf9c..b5a2cd1 100644--- a/libbirdfont/GlyphSelection.vala+++ b/libbirdfont/GlyphSelection.vala@@ -26,7 +26,7 @@ public class GlyphSelection : OverView { 		} else { 			GlyphRange gr = new GlyphRange (); 			DefaultCharacterSet.use_default_range (gr);-			set_glyph_range (gr);+			set_current_glyph_range (gr); 		}  		OverviewTools.update_overview_characterset (this);diff --git a/libbirdfont/LanguageSelectionTab.vala b/libbirdfont/LanguageSelectionTab.valaindex b8ecf86..2f2bf0f 100644--- a/libbirdfont/LanguageSelectionTab.vala+++ b/libbirdfont/LanguageSelectionTab.vala@@ -59,7 +59,7 @@ public class LanguageSelectionTab : Table { 		overview = MainWindow.get_overview (); 		gr = new GlyphRange (); 		DefaultCharacterSet.use_default_range (gr);-		overview.set_glyph_range (gr);+		overview.set_current_glyph_range (gr); 		OverviewTools.update_overview_characterset (); 		FontDisplay.dirty_scrollbar = true; 	}diff --git a/libbirdfont/MainWindow.vala b/libbirdfont/MainWindow.valaindex f552f51..dca9ba0 100644--- a/libbirdfont/MainWindow.vala+++ b/libbirdfont/MainWindow.vala@@ -201,6 +201,12 @@ public class MainWindow : GLib.Object { 	}
 
 	public static OverView get_overview () {
+		foreach (Tab t in tabs.tabs) {
+			if (t.get_display () is OverView) {
+				return (OverView) t.get_display ();
+			}
+		}
+		
 		return overview;
 	}
 	
diff --git a/libbirdfont/MenuTab.vala b/libbirdfont/MenuTab.valaindex 24260a9..a84adc8 100644--- a/libbirdfont/MenuTab.vala+++ b/libbirdfont/MenuTab.vala@@ -646,7 +646,7 @@ public class MenuTab : FontDisplay { 		} 			 		DefaultCharacterSet.use_default_range (gr);-		o.set_glyph_range (gr);+		o.set_current_glyph_range (gr);  		MainWindow.get_tab_bar ().select_tab_name ("Overview"); 	}diff --git a/libbirdfont/OverView.vala b/libbirdfont/OverView.valaindex 7a132f1..24c5575 100644--- a/libbirdfont/OverView.vala+++ b/libbirdfont/OverView.vala@@ -36,7 +36,18 @@ public class OverView : FontDisplay { 	public signal void open_new_glyph_signal (unichar c); 	public signal void open_glyph_signal (GlyphCollection c); 	-	public GlyphRange glyph_range;+	public GlyphRange glyph_range {+		get {+			return _glyph_range;+		}+		+		set {+			_glyph_range = value;+		}+	}+	+	GlyphRange _glyph_range;+	 	string search_query = ""; 	 	Gee.ArrayList<OverViewItem> visible_items = new Gee.ArrayList<OverViewItem> ();@@ -67,10 +78,10 @@ public class OverView : FontDisplay {  	public OverView (GlyphRange? range = null, bool open_selected = true) { 		GlyphRange gr;-+		 		if (range == null) { 			gr = new GlyphRange ();-			set_glyph_range (gr);+			set_current_glyph_range (gr); 		}  		if (open_selected) {@@ -113,7 +124,7 @@ public class OverView : FontDisplay { 		GlyphRange gr = new GlyphRange (); 		all_available = false; 		DefaultCharacterSet.use_default_range (gr);-		set_glyph_range (gr);+		set_current_glyph_range (gr); 		OverviewTools.update_overview_characterset (); 		FontDisplay.dirty_scrollbar = true; 	}@@ -204,7 +215,7 @@ public class OverView : FontDisplay { 		listener.signal_submit.connect (() => { 			OverView o = MainWindow.get_overview (); 			GlyphRange r = CharDatabase.search (o.search_query);-			o.set_glyph_range (r);+			o.set_current_glyph_range (r); 			TabContent.hide_text_input (); 			MainWindow.get_tab_bar ().select_tab_name ("Overview"); 		});@@ -290,16 +301,6 @@ public class OverView : FontDisplay { 		update_item_list (); 		selected_item = get_selected_item (); 		GlyphCanvas.redraw ();--		IdleSource idle = new IdleSource ();--		idle.set_callback (() => {	-			use_default_character_set ();-			GlyphCanvas.redraw ();-			return false;-		});-		-		idle.attach (null); 	} 	 	public void update_zoom_bar () {@@ -846,6 +847,7 @@ public class OverView : FontDisplay { 		} 		 		update_item_list ();+		GlyphCanvas.redraw (); 	} 	 	public void delete_selected_glyph () {@@ -860,6 +862,9 @@ public class OverView : FontDisplay { 		foreach (GlyphCollection gc in selected_items) { 			font.delete_glyph (gc); 		}++		update_item_list ();+		GlyphCanvas.redraw (); 	} 	 	public override void undo () {@@ -1159,7 +1164,7 @@ public class OverView : FontDisplay { 		return t >= glyph_range.length (); 	} -	public void set_glyph_range (GlyphRange range) {+	public void set_current_glyph_range (GlyphRange range) { 		GlyphRange? current = glyph_range; 		string c; 		@@ -1397,7 +1402,7 @@ public class OverView : FontDisplay {  				character_string = glyph_range.get_char ((uint32) (index + skip)); 				c = f.get_glyph_collection_by_name (character_string);-+				 				if (c == null) { 					gc = add_empty_character_to_font (character_string.get_char (),  						copied_glyphs.get (i).is_unassigned (),diff --git a/libbirdfont/OverviewTools.vala b/libbirdfont/OverviewTools.valaindex 9499350..31befc0 100644--- a/libbirdfont/OverviewTools.vala+++ b/libbirdfont/OverviewTools.vala@@ -61,7 +61,7 @@ public class OverviewTools : ToolCollection  { 			OverView overview = get_overview (); 			GlyphRange gr = new GlyphRange (); 			DefaultCharacterSet.use_default_range (gr);-			overview.set_glyph_range (gr);+			overview.set_current_glyph_range (gr); 			update_overview_characterset (); 			FontDisplay.dirty_scrollbar = true; 		});@@ -73,7 +73,7 @@ public class OverviewTools : ToolCollection  { 			OverView overview = get_overview (); 			GlyphRange gr = new GlyphRange (); 			DefaultCharacterSet.use_full_unicode_range (gr);-			overview.set_glyph_range (gr);+			overview.set_current_glyph_range (gr); 			update_overview_characterset (); 			FontDisplay.dirty_scrollbar = true; 		});