Remove some short cuts

Changed files (3)

• modified fonts/Downstream.bf
• modified libbirdfont/BackgroundImage.vala
• modified libbirdfont/DrawingTools.vala

Diff

diff --git a/fonts/Downstream.bf b/fonts/Downstream.bfindex e6702fe..2317683 100644--- a/fonts/Downstream.bf+++ b/fonts/Downstream.bf@@ -21,7 +21,7 @@ 	<bottom_limit>-27.0000000000</bottom_limit> </horizontal> -<grid width="2.000"/>+<grid width="4.000"/> <grid width="2.000"/>  <background scale="1.000" />@@ -92,7 +92,7 @@ 	<selected id="1"/> 	<glyph id="1" left="-28" right="37.966999999999999"> 		<path stroke="0" data="S 27.9398340249,35.9453665284 Q 27.9398340249,0.0615491010 -0.0546334716,0.0615491010 Q -28.0491009682,0.0615491010 -28.0491009682,35.9453665284 Q -27.7911632711,71.7892798223 -0.0546334716,71.9564315353 Q 27.9398340249,71.9564315353 27.9398340249,35.9453665284" />-		<path stroke="0" data="S -0.0546334716,59.9951590595 Q -9.9799446750,59.9951590595 -9.9799446750,35.9453665284 Q -9.9799446750,12.0228215768 -0.0546334716,12.0228215768 Q 9.9979253112,12.0228215768 9.9979253112,35.9453665284 Q 9.9979253112,59.9951590595 -0.0546334716,59.9951590595" />+		<path stroke="0" data="S -0.0546334716,59.9951590595 Q -7.9351081531,60.0140188206 -7.9351081531,35.9642262895 Q -7.9351081531,12.0416813379 -0.0546334716,12.0228215768 Q 8.0079086723,12.0228215768 8.0079086723,35.9453665284 Q 8.0079086723,59.9951590595 -0.0546334716,59.9951590595" /> 	</glyph> </collection> <collection unicode="U+31">@@ -136,6 +136,13 @@ 		<path stroke="0" data="S 18.0209553367,43.7690758044 Q 25.0951574944,37.3031543954 24.7928049250,25.1769911504 Q 24.8490542963,18.8231542727 22.1486970492,13.5296665407 Q 19.6298764238,8.5920435301 14.7126270049,4.5769939131 Q 8.7909672673,0.6135654969 -4.0652173913,0.0000000000 Q -14.2891199263,0.4076291476 -19.8913043478,4.0000000000 L -25.4565217391,9.7391304348 L -18.8420546364,21.1127356676 Q -8.0885477159,10.0024211066 0.6008080031,16.2431704502 Q 3.7839796311,18.4654955494 3.6541256985,24.6876334281 Q 3.5174738155,29.5151444054 1.0879184302,32.2258560985 Q -4.1589042274,38.0798586932 -11.8970757984,33.8141592920 L -19.8970757984,33.8141592920 L -23.8761061947,36.3362831858 L -21.9782608696,72.0000000000 L 20.0088495575,71.9823008850 L 20.0088495575,60.0442477876 L -3.3695652174,60.0000000000 L -4.4015005771,45.8141592920 Q 1.2937228803,48.7516262541 7.1423597912,48.3395371667 Q 13.9009511431,47.5348182481 18.0209553367,43.7690758044 T" /> 	</glyph> </collection>+<collection unicode="U+36">+	<selected id="1"/>+	<glyph id="1" left="-28" right="28">+		<path stroke="0" data="S 16.0374376040,59.9975041597 Q -7.3835274542,60.6098169717 -7.3835274542,43.0058236273 Q 5.6281198003,51.7312811980 16.4966722130,45.4550748752 Q 28.7429284526,39.0257903494 27.9775374376,24.0241264559 Q 27.9775374376,-0.0091514143 -0.0357737105,-0.0091514143 Q -28.0490848586,-0.0091514143 -28.0490848586,35.9642262895 Q -28.0490848586,76.0707154742 16.0374376040,71.9376039933 Q 16.0374376040,65.9675540765 16.0374376040,59.9975041597" />+		<path stroke="0" data="S 6.3935108153,24.6364392679 Q 6.1124240627,35.8210507165 -0.4950083195,35.8111480865 Q -8.4418502014,35.6081393089 -7.3835274542,24.4833610649 Q -7.3096606909,12.8742458253 -0.8011647255,12.6963394343 Q 7.0817728300,12.3589226200 6.3935108153,24.6364392679" />+	</glyph>+</collection> <collection unicode="U+3a"> 	<selected id="1"/> 	<glyph id="1" left="-28" right="-2.0130000000000003">diff --git a/libbirdfont/BackgroundImage.vala b/libbirdfont/BackgroundImage.valaindex 46ee5aa..d5f1bdd 100644--- a/libbirdfont/BackgroundImage.vala+++ b/libbirdfont/BackgroundImage.vala@@ -301,7 +301,8 @@ public class BackgroundImage { 		double bcx, bcy; 		double a, b, c, length; -		img_center (out bcx, out bcy);+		bcx = img_middle_x;+		bcy = img_middle_y;  		a = bcx - x; 		b = bcy - y;@@ -449,20 +450,11 @@ public class BackgroundImage { 		}	 	} -	void img_center (out double x, out double y) {-		Glyph g = MainWindow.get_current_glyph ();-		-		x = img_offset_x - g.view_offset_x + (size_margin / 2) * img_scale_x;-		y = img_offset_y - g.view_offset_y + (size_margin / 2) * img_scale_y;--		y *= g.view_zoom;-		x *= g.view_zoom;-	}- 	bool is_over_rotate (double nx, double ny) { 		double x, y, d; -		img_center (out x, out y);+		x = img_middle_x;+		y = img_middle_y;  		x += cos (img_rotation) * 75; 		y += sin (img_rotation) * 75;diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex b1dd742..2e33668 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -471,13 +471,13 @@ public class DrawingTools : ToolCollection  { 		}); 		view_tools.add_tool (zoom_bg); -		Tool zoom_prev = new Tool ("prev", t_("Previous view"), 'j', CTRL);+		Tool zoom_prev = new Tool ("prev", t_("Previous view")); 		zoom_prev.select_action.connect((self) => { 			zoom_tool.previous_view (); 		}); 		view_tools.add_tool (zoom_prev); -		Tool zoom_next = new Tool ("next", t_("Next view"), 'l', CTRL);+		Tool zoom_next = new Tool ("next", t_("Next view")); 		zoom_next.select_action.connect((self) => { 			zoom_tool.next_view (); 		});