diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-05-29 02:28:49 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-05-29 02:28:49 +0300 |
| commit | 9b755e9b789533846fd0fd0ff7b819c5b6149a6a (patch) | |
| tree | e6b41b48778da8cfd3957b42995f5b6e06bd40d0 /Software/Visual_Studio/TEMP/Tango.Graphics2D | |
| parent | 65a723fc6472667a8ad6c65c4d824dea8f1575e9 (diff) | |
| download | Tango-9b755e9b789533846fd0fd0ff7b819c5b6149a6a.tar.gz Tango-9b755e9b789533846fd0fd0ff7b819c5b6149a6a.zip | |
Fixed issue with dirty rectangles overflow on JobView.
Diffstat (limited to 'Software/Visual_Studio/TEMP/Tango.Graphics2D')
| -rw-r--r-- | Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml | 19 | ||||
| -rw-r--r-- | Software/Visual_Studio/TEMP/Tango.Graphics2D/VisualBinders/TextBlockBinder.cs | 3 |
2 files changed, 15 insertions, 7 deletions
diff --git a/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml b/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml index 8a2dd2fc2..1920f3415 100644 --- a/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml +++ b/Software/Visual_Studio/TEMP/Tango.Graphics2D/MainWindow.xaml @@ -9,6 +9,11 @@ <Window.Resources> <SolidColorBrush x:Key="RRR" Color="Blue"></SolidColorBrush> + + <Style TargetType="TextBlock" x:Key="textBlock"> + <Setter Property="FontSize" Value="12"></Setter> + <Setter Property="FontFamily" Value="Arial"></Setter> + </Style> </Window.Resources> <Grid> <!--<ListBox ItemsSource="{Binding Persons}" VirtualizingPanel.IsVirtualizing="False" ScrollViewer.CanContentScroll="False"> @@ -48,10 +53,10 @@ <Border x:Name="border" Margin="10" MouseDown="Border_MouseDown" MouseUp="Border_MouseUp" Background="Gainsboro" BorderBrush="DimGray" BorderThickness="1" CornerRadius="5"> </Border> - <Ellipse Fill="Blue" Width="50" Height="50"> + <!--<Ellipse Fill="Blue" Width="50" Height="50"> - </Ellipse> - <TextBlock x:Name="txt" MouseEnter="Txt_MouseEnter" MouseLeave="Txt_MouseLeave" MouseDown="Txt_MouseDown" Text="HGI Roy asd as" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"> + </Ellipse>--> + <TextBlock x:Name="txt" Style="{StaticResource textBlock}" MouseEnter="Txt_MouseEnter" MouseLeave="Txt_MouseLeave" MouseDown="Txt_MouseDown" Text="HGI Roy asd as" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"> <TextBlock.Foreground> <SolidColorBrush Color="Red" /> </TextBlock.Foreground> @@ -80,10 +85,10 @@ </TextBlock.RenderTransform> </TextBlock> - <Line Stroke="Red" X1="0" Y1="0" X2="30" Y2="30"></Line> - <Image Source="/Images/sample.png" Width="50" Height="50" /> + <!--<Line Stroke="Red" X1="0" Y1="0" X2="30" Y2="30"></Line>--> + <!--<Image Source="/Images/sample.png" Width="50" Height="50" />--> - <Path Stroke="Black" StrokeThickness="5" Fill="Goldenrod" Stretch="Fill"> + <!--<Path Stroke="Black" StrokeThickness="5" Fill="Goldenrod" Stretch="Fill"> <Path.Data> <PathGeometry> <PathGeometry.Figures> @@ -97,7 +102,7 @@ </PathGeometry.Figures> </PathGeometry> </Path.Data> - </Path> + </Path>--> </local:Drawing2DFrame> </Grid> </StackPanel> diff --git a/Software/Visual_Studio/TEMP/Tango.Graphics2D/VisualBinders/TextBlockBinder.cs b/Software/Visual_Studio/TEMP/Tango.Graphics2D/VisualBinders/TextBlockBinder.cs index 93c6574e1..59f2b808d 100644 --- a/Software/Visual_Studio/TEMP/Tango.Graphics2D/VisualBinders/TextBlockBinder.cs +++ b/Software/Visual_Studio/TEMP/Tango.Graphics2D/VisualBinders/TextBlockBinder.cs @@ -69,6 +69,9 @@ namespace Tango.Graphics2D.VisualBinders TextBlock.VisibilityProperty, TextBlock.ForegroundProperty, TextBlock.TextProperty, + TextBlock.FontSizeProperty, + TextBlock.FontFamilyProperty, + TextBlock.FontWeightProperty, }; } } |