개정판 20ef6ffe
Revert "markus 성능개선"
This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ibefadea6bec24a0b94e5f61f95f9e8d838ae369d
KCOM/Controls/thumbnailControl.xaml | ||
---|---|---|
9 | 9 |
<!--d:DesignHeight="110" d:DesignWidth="80">--> |
10 | 10 |
|
11 | 11 |
<Grid x:Name="LayoutRoot"> |
12 |
<Grid.Resources> |
|
13 |
<Storyboard x:Key="FadeImageStoryboard" RepeatBehavior="Forever"> |
|
14 |
<DoubleAnimation From="1.0" |
|
15 |
To="0.0" |
|
16 |
Duration="0:0:0.1" |
|
17 |
AutoReverse="True" |
|
18 |
Storyboard.TargetName="LayoutRoot" |
|
19 |
Storyboard.TargetProperty="Opacity" /> |
|
20 |
</Storyboard> |
|
21 |
</Grid.Resources> |
|
22 |
|
|
23 |
<!--d:LayoutOverrides="Width, Height"--> |
|
24 |
<!--<Grid RenderTransformOrigin="0.5,0.5"> |
|
25 |
<Grid.RowDefinitions> |
|
26 |
<RowDefinition Height="*"/> |
|
27 |
<RowDefinition Height="Auto"/> |
|
28 |
</Grid.RowDefinitions> |
|
29 |
<Grid.RenderTransform> |
|
30 |
<RotateTransform Angle="{Binding Angle}"/> |
|
31 |
</Grid.RenderTransform> |
|
32 |
<Border Margin="10,5" HorizontalAlignment="Stretch" BorderBrush="{DynamicResource KCOMColor_ReadOnlyBorderBrush}" BorderThickness="1,1,1.5,1.5"> |
|
33 |
<Image Stretch="Uniform" Source="{Binding ImageUri}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/> |
|
34 |
</Border> |
|
35 |
|
|
36 |
<Border HorizontalAlignment="Stretch" Background="Transparent" BorderBrush="Black" BorderThickness="0.2" VerticalAlignment="Bottom" Grid.Row="1"> |
|
37 |
<Grid> |
|
38 |
<Rectangle Fill="{DynamicResource KCOMColor_ActiveBrush}"/> |
|
39 |
<TextBlock Text="{Binding PageNumber, FallbackValue=PageNo}" FontStyle="Italic" FontSize="14" HorizontalAlignment="Center"/> |
|
40 |
</Grid> |
|
41 |
</Border> |
|
42 |
</Grid>--> |
|
43 |
<!--강인구 수정--> |
|
12 | 44 |
<Grid> |
13 | 45 |
<Grid.RowDefinitions> |
14 | 46 |
<RowDefinition Height="*"/> |
15 | 47 |
<RowDefinition Height="Auto"/> |
16 | 48 |
</Grid.RowDefinitions> |
17 |
<Grid.ColumnDefinitions> |
|
18 |
|
|
19 |
</Grid.ColumnDefinitions> |
|
49 |
|
|
20 | 50 |
<Grid Grid.Row="0" RenderTransformOrigin="0.5,0.5"> |
21 | 51 |
<Grid.RenderTransform> |
22 | 52 |
<RotateTransform Angle="{Binding Angle, Mode=TwoWay}"/> |
23 | 53 |
</Grid.RenderTransform> |
24 |
<Border Margin="20,7,20,5" HorizontalAlignment="Stretch" BorderBrush="{DynamicResource KCOMColor_ReadOnlyBorderBrush}" BorderThickness="1,1,1.5,1.5">
|
|
54 |
<Border Margin="20,15" HorizontalAlignment="Stretch" BorderBrush="{DynamicResource KCOMColor_ReadOnlyBorderBrush}" BorderThickness="1,1,1.5,1.5">
|
|
25 | 55 |
<!--<Border Margin="10,5" HorizontalAlignment="Stretch" BorderBrush="{DynamicResource KCOMColor_ReadOnlyBorderBrush}" BorderThickness="0">--> |
26 | 56 |
<!--<Image Stretch="Uniform" Source="{Binding ImageUri}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>--> |
27 | 57 |
<Grid RenderTransformOrigin="0.5,0.5"> |
28 | 58 |
|
29 | 59 |
<!--<Image Stretch="Uniform" Source="{Binding ImageUri}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="10"/>--> |
30 |
<Image Stretch="Uniform" Source="{Binding ImageUri,IsAsync=True}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
|
|
60 |
<Image Stretch="Uniform" Source="{Binding ImageUri}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/> |
|
31 | 61 |
</Grid> |
32 | 62 |
</Border> |
33 | 63 |
</Grid> |
34 |
<Border HorizontalAlignment="Stretch" Background="Transparent" BorderBrush="Black" BorderThickness="0.2" VerticalAlignment="Bottom" Grid.Row="1" Margin="0,0,0,2"> |
|
64 |
|
|
65 |
<Border HorizontalAlignment="Stretch" Background="Transparent" BorderBrush="Black" BorderThickness="0.2" VerticalAlignment="Bottom" Grid.Row="1"> |
|
35 | 66 |
<Grid> |
36 | 67 |
<TextBlock Text="{Binding PageNumber, FallbackValue=PageNo}" FontStyle="Italic" FontSize="14" HorizontalAlignment="Center"/> |
37 | 68 |
</Grid> |
내보내기 Unified diff