mirror of
				https://github.com/2dust/v2rayN.git
				synced 2025-10-27 02:34:41 +00:00 
			
		
		
		
	Added emoji support in SubSettingWindow
This commit is contained in:
		
							parent
							
								
									692e72ec18
								
							
						
					
					
						commit
						422f58ca18
					
				
					 1 changed files with 9 additions and 3 deletions
				
			
		|  | @ -9,6 +9,7 @@ | ||||||
|     xmlns:reactiveui="http://reactiveui.net" |     xmlns:reactiveui="http://reactiveui.net" | ||||||
|     xmlns:resx="clr-namespace:v2rayN.Resx" |     xmlns:resx="clr-namespace:v2rayN.Resx" | ||||||
|     xmlns:vms="clr-namespace:v2rayN.ViewModels" |     xmlns:vms="clr-namespace:v2rayN.ViewModels" | ||||||
|  |     xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf" | ||||||
|     Title="{x:Static resx:ResUI.menuSubSetting}" |     Title="{x:Static resx:ResUI.menuSubSetting}" | ||||||
|     Width="800" |     Width="800" | ||||||
|     Height="600" |     Height="600" | ||||||
|  | @ -101,10 +102,15 @@ | ||||||
|                 IsReadOnly="True" |                 IsReadOnly="True" | ||||||
|                 Style="{StaticResource DefDataGrid}"> |                 Style="{StaticResource DefDataGrid}"> | ||||||
|                 <DataGrid.Columns> |                 <DataGrid.Columns> | ||||||
|                     <DataGridTextColumn |                     <DataGridTemplateColumn | ||||||
|                         Width="120" |                         Width="120" | ||||||
|                         Binding="{Binding remarks}" |                         Header="{x:Static resx:ResUI.LvRemarks}"> | ||||||
|                         Header="{x:Static resx:ResUI.LvRemarks}" /> |                         <DataGridTemplateColumn.CellTemplate> | ||||||
|  |                             <DataTemplate> | ||||||
|  |                                 <emoji:TextBlock Text="{Binding remarks}" /> | ||||||
|  |                             </DataTemplate> | ||||||
|  |                         </DataGridTemplateColumn.CellTemplate> | ||||||
|  |                     </DataGridTemplateColumn> | ||||||
|                     <DataGridTextColumn |                     <DataGridTextColumn | ||||||
|                         Width="150" |                         Width="150" | ||||||
|                         Binding="{Binding url}" |                         Binding="{Binding url}" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Private
						Private