mirror of
				https://github.com/MathiasLui/CSGO-Projects.git
				synced 2025-10-31 20:53:31 +00:00 
			
		
		
		
	Fix zoom not having focus after selecting radio button
This commit is contained in:
		
							parent
							
								
									374d66e854
								
							
						
					
					
						commit
						20c7a8f126
					
				
					 14 changed files with 12 additions and 14 deletions
				
			
		
										
											Binary file not shown.
										
									
								
							|  | @ -10,8 +10,8 @@ | |||
|         WindowStartupLocation="CenterScreen" Icon="27.ico" | ||||
|         WindowState="Maximized" | ||||
|         MouseMove="Window_MouseMove" | ||||
|         KeyDown="Window_KeyDown" | ||||
|         KeyUp="Window_KeyUp" | ||||
|         PreviewKeyDown="Window_PreviewKeyDown" | ||||
|         PreviewKeyUp="Window_PreviewKeyUp" | ||||
|         PreviewMouseDown="Window_PreviewMouseDown"> | ||||
|     <Grid> | ||||
|         <Menu> | ||||
|  |  | |||
|  | @ -1034,7 +1034,7 @@ namespace Damage_Calculator | |||
|                 txtCursorX.Text = txtCursorY.Text = "0"; | ||||
|             } | ||||
|         } | ||||
|         private void Window_KeyDown(object sender, KeyEventArgs e) | ||||
|         private void Window_PreviewKeyDown(object sender, KeyEventArgs e) | ||||
|         { | ||||
|             if (e.Key == Key.C && Keyboard.Modifiers == ModifierKeys.Control) | ||||
|             { | ||||
|  | @ -1043,12 +1043,14 @@ namespace Damage_Calculator | |||
| 
 | ||||
|             // Pass it on for spacebar pan start | ||||
|             this.rightZoomBorder.KeyDown(sender, e); | ||||
|             e.Handled = true; | ||||
|         } | ||||
| 
 | ||||
|         private void Window_KeyUp(object sender, KeyEventArgs e) | ||||
|         private void Window_PreviewKeyUp(object sender, KeyEventArgs e) | ||||
|         { | ||||
|             // Pass it on for spacebar pan stop | ||||
|             this.rightZoomBorder.KeyUp(sender, e); | ||||
|             e.Handled = true; | ||||
|         } | ||||
|         #endregion | ||||
|     } | ||||
|  |  | |||
|  | @ -131,7 +131,6 @@ namespace Damage_Calculator | |||
|                 var tt = GetTranslateTransform(child); | ||||
|                 start = e.GetPosition(this); | ||||
|                 origin = new Point(tt.X, tt.Y); | ||||
|                 this.Cursor = Cursors.Hand; | ||||
|                 child.CaptureMouse(); | ||||
|             } | ||||
|         } | ||||
|  | @ -139,10 +138,7 @@ namespace Damage_Calculator | |||
|         private void child_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) | ||||
|         { | ||||
|             if (child != null) | ||||
|             { | ||||
|                 child.ReleaseMouseCapture(); | ||||
|                 this.Cursor = Cursors.Arrow; | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         private void child_MouseMove(object sender, MouseEventArgs e) | ||||
|  |  | |||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							|  | @ -1,4 +1,4 @@ | |||
| #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "520310F22F68AE4E47B66F6D92CC98AD8018EE1647882A1C45F9B52AC540A4BB" | ||||
| #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "27FCD8BFBBC438E9A51021C3BEB68479D527817CDA486F3B2805D4C67A922CFB" | ||||
| //------------------------------------------------------------------------------ | ||||
| // <auto-generated> | ||||
| //     This code was generated by a tool. | ||||
|  | @ -422,13 +422,13 @@ namespace Damage_Calculator { | |||
|             #line hidden | ||||
|              | ||||
|             #line 13 "..\..\MainWindow.xaml" | ||||
|             ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); | ||||
|             ((Damage_Calculator.MainWindow)(target)).PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyDown); | ||||
|              | ||||
|             #line default | ||||
|             #line hidden | ||||
|              | ||||
|             #line 14 "..\..\MainWindow.xaml" | ||||
|             ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); | ||||
|             ((Damage_Calculator.MainWindow)(target)).PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyUp); | ||||
|              | ||||
|             #line default | ||||
|             #line hidden | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "520310F22F68AE4E47B66F6D92CC98AD8018EE1647882A1C45F9B52AC540A4BB" | ||||
| #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "27FCD8BFBBC438E9A51021C3BEB68479D527817CDA486F3B2805D4C67A922CFB" | ||||
| //------------------------------------------------------------------------------ | ||||
| // <auto-generated> | ||||
| //     This code was generated by a tool. | ||||
|  | @ -422,13 +422,13 @@ namespace Damage_Calculator { | |||
|             #line hidden | ||||
|              | ||||
|             #line 13 "..\..\MainWindow.xaml" | ||||
|             ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); | ||||
|             ((Damage_Calculator.MainWindow)(target)).PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyDown); | ||||
|              | ||||
|             #line default | ||||
|             #line hidden | ||||
|              | ||||
|             #line 14 "..\..\MainWindow.xaml" | ||||
|             ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); | ||||
|             ((Damage_Calculator.MainWindow)(target)).PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Window_PreviewKeyUp); | ||||
|              | ||||
|             #line default | ||||
|             #line hidden | ||||
|  |  | |||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 MathiasL
						MathiasL