Show cursor in dialog

Changed files (6)

• modified libbirdfont/ForesightTool.vala
• modified libbirdfont/MainWindow.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/StrokeTool.vala
• modified libbirdfont/TabBar.vala
• modified libbirdfont/Toolbox.vala

Diff

diff --git a/libbirdfont/ForesightTool.vala b/libbirdfont/ForesightTool.valaindex 3edd16f..36d49cf 100644--- a/libbirdfont/ForesightTool.vala+++ b/libbirdfont/ForesightTool.vala@@ -72,10 +72,11 @@ public class ForesightTool : Tool { 				p.release_action (p, 2, x, y); 				current_path.hide_end_handle = true; 				state = NONE;-				MainWindow.native_window.set_cursor (NativeWindow.VISIBLE);+				MainWindow.set_cursor (NativeWindow.VISIBLE); 				return; 			}  +			BirdFont.get_current_font ().touch (); 			MainWindow.get_current_glyph ().store_undo_state ();  			last_move_x = x;@@ -195,8 +196,13 @@ public class ForesightTool : Tool { 			last_move_x = x; 			last_move_y = y; 			+			if (MainWindow.dialog.visible && state != NONE) {+				state = NONE;+				p.release_action (p, 1, last_move_x, last_move_y);+			}+			 			if (state == NONE) {-				MainWindow.native_window.set_cursor (NativeWindow.VISIBLE);+				MainWindow.set_cursor (NativeWindow.VISIBLE); 			} 			 			PenTool.active_path = current_path;diff --git a/libbirdfont/MainWindow.vala b/libbirdfont/MainWindow.valaindex 09ff8ff..5af76b9 100644--- a/libbirdfont/MainWindow.vala+++ b/libbirdfont/MainWindow.vala@@ -75,6 +75,16 @@ public class MainWindow : GLib.Object { 		dialog = d;
 		dialog.visible = true;
 		GlyphCanvas.redraw ();
+		
+		set_cursor (NativeWindow.VISIBLE);
+	}
+
+	public static void set_cursor (int flags) {
+		if (dialog.visible) {
+			native_window.set_cursor (NativeWindow.VISIBLE);
+		} else {
+			native_window.set_cursor (flags);
+		}
 	}
 
 	public static void show_message (string text) {
diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex dadc434..cc606d2 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -176,7 +176,7 @@ public class PenTool : Tool { 				} 			} 			-			MainWindow.native_window.set_cursor (NativeWindow.VISIBLE);+			MainWindow.set_cursor (NativeWindow.VISIBLE); 			 			point_selection_image = false; 			BirdFont.get_current_font ().touch ();@@ -560,9 +560,9 @@ public class PenTool : Tool { 		} 		 		if (move_selected_handle || move_selected) {-			MainWindow.native_window.set_cursor (NativeWindow.HIDDEN);+			MainWindow.set_cursor (NativeWindow.HIDDEN); 		} else {-			MainWindow.native_window.set_cursor (NativeWindow.VISIBLE);+			MainWindow.set_cursor (NativeWindow.VISIBLE); 		}  		// move control point handlesdiff --git a/libbirdfont/StrokeTool.vala b/libbirdfont/StrokeTool.valaindex 93e212e..0c93467 100644--- a/libbirdfont/StrokeTool.vala+++ b/libbirdfont/StrokeTool.vala@@ -2068,11 +2068,13 @@ first.color = Color.pink (); 		int i; 		 		if (path.is_open ()) {+		/* 			get_segment (thickness, 0, 0.001, p2, p3, out start); 			add_corner (side1, previous, start, p2.copy (), thickness);  			get_segment (-thickness, 0, 0.001, p2, p3, out start); 			add_corner (side2, previous_inside, start, p2.copy (), thickness);+			*/ 		}  		for (i = 0; i < size; i++) {diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex ac76a50..0df5e74 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -83,7 +83,7 @@ public class TabBar : GLib.Object { 	} 	 	public void motion (double x, double y) {-		MainWindow.native_window.set_cursor (NativeWindow.VISIBLE);+		MainWindow.set_cursor (NativeWindow.VISIBLE); 		 		if (MenuTab.suppress_event) { 			warn_if_test ("Event suppressed");diff --git a/libbirdfont/Toolbox.vala b/libbirdfont/Toolbox.valaindex 557356c..427b58d 100644--- a/libbirdfont/Toolbox.vala+++ b/libbirdfont/Toolbox.vala@@ -258,7 +258,7 @@ public class Toolbox : GLib.Object  { 		bool consumed = false; 		bool active; 		-		MainWindow.native_window.set_cursor (NativeWindow.VISIBLE);+		MainWindow.set_cursor (NativeWindow.VISIBLE); 			 		foreach (Expander exp in current_set.get_expanders ()) { 			if (exp.visible) {