프로젝트

일반

사용자정보

개정판 d18ea2bd

IDd18ea2bd5a22f2671d8dd8b683008c30c6affcc2
상위 10beebc8
하위 f5c6a3d5

김태성이(가) 약 5년 전에 추가함

ThumbnailItem 중복 호출 방지
ColorList convert로 변경

Change-Id: Idc6bb06d6d84c78875400fc99cf218cd1368c253

차이점 보기:

KCOM/Controls/Sample.xaml
8 8
             mc:Ignorable="d"  Background="#f5f5f5" xmlns:converter="clr-namespace:KCOM.Common.Converter"
9 9
             d:DesignHeight="600" d:DesignWidth="200">
10 10
    <UserControl.Resources>
11
        <Style x:Key="PathButtonStyle" TargetType="Path">
11
        <converter:ColorListToBrushConverter x:Key="ColorListToBrushConverter"/>
12
        <Style x:Key="PathButtonStyle" TargetType="{x:Type Path}">
12 13
            <Setter Property="Width" Value="12"/>
13 14
            <Setter Property="Height" Value="12"/>
14 15
            <Setter Property="Fill" Value="White" />
......
29 30
                <Setter.Value>
30 31
                    <ControlTemplate TargetType="{x:Type telerik:RadListBoxItem}">
31 32
                        <Border x:Name="myBorder" VerticalAlignment="Center"
32
                                Padding="0" Margin="1"
33
                                Padding="0" Margin="0"
33 34
                                SnapsToDevicePixels="False">
34 35
                            <Border.Style>
35
                                <Style TargetType="Border">
36
                                <Style TargetType="{x:Type Border}">
36 37
                                    <Setter Property="BorderThickness" Value="3 3 3 3"/>
37 38
                                    <Setter Property="BorderBrush" Value="Transparent"/>
38 39
                                </Style>
39 40
                            </Border.Style>
40
                            <ContentPresenter Margin="5"/>
41
                            <ContentPresenter Margin="2"/>
41 42
                        </Border>
42 43
                        <ControlTemplate.Triggers>
43 44
                            <Trigger Property="IsSelected" Value="true">
......
48 49
                </Setter.Value>
49 50
            </Setter>
50 51
        </Style>
51
        <ControlTemplate x:Key="RadExpanderControlTemplate1" TargetType="telerik:RadExpander">
52
        <ControlTemplate x:Key="RadExpanderControlTemplate1" TargetType="{x:Type telerik:RadExpander}">
52 53
            <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
53 54
                <VisualStateManager.VisualStateGroups>
54 55
                    <VisualStateGroup x:Name="CommonStateGroup">
......
133 134
                            <Storyboard>
134 135
                                <DoubleAnimation Duration="0:0:0.2"
135 136
                                                 Storyboard.TargetName="arrow"
136
                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).Angle"
137
                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).Angle"
137 138
                                                 To="180" />
138
                                <ColorAnimation d:IsOptimized="True"
139
                                <ColorAnimation
139 140
                                                Duration="0"
140 141
                                                Storyboard.TargetName="OuterCircle"
141 142
                                                Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)"
......
146 147
                            <Storyboard>
147 148
                                <DoubleAnimation Duration="0:0:0.2"
148 149
                                                 Storyboard.TargetName="arrow"
149
                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).Angle"
150
                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).Angle"
150 151
                                                 To="0" />
151 152
                            </Storyboard>
152 153
                        </VisualState>
......
239 240
                                </ObjectAnimationUsingKeyFrames>
240 241
                                <DoubleAnimation Duration="0:0:0"
241 242
                                                 Storyboard.TargetName="arrowPanel"
242
                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).Angle"
243
                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).Angle"
243 244
                                                 To="90" />
244 245
                            </Storyboard>
245 246
                        </VisualState>
......
268 269
                                </ObjectAnimationUsingKeyFrames>
269 270
                                <DoubleAnimation Duration="0:0:0"
270 271
                                                 Storyboard.TargetName="arrowPanel"
271
                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).Angle"
272
                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).Angle"
272 273
                                                 To="-90" />
273 274
                            </Storyboard>
274 275
                        </VisualState>
......
297 298
                                </ObjectAnimationUsingKeyFrames>
298 299
                                <DoubleAnimation Duration="0:0:0"
299 300
                                                 Storyboard.TargetName="arrowPanel"
300
                                                 Storyboard.TargetProperty="(FrameworkElement.RenderTransform).Angle"
301
                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).Angle"
301 302
                                                 To="180" />
302 303
                            </Storyboard>
303 304
                        </VisualState>
......
353 354
                                                 FontStyle="{TemplateBinding FontStyle}"
354 355
                                                 FontWeight="{TemplateBinding FontWeight}"
355 356
                                                 Foreground="{TemplateBinding Foreground}"
356
                                                 IsChecked="{Binding IsExpanded,
357
                                                                     Mode=TwoWay,
358
                                                                     RelativeSource={RelativeSource TemplatedParent}}"
357
                                                 IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
359 358
                                                 IsTabStop="{TemplateBinding IsTabStop}"
360 359
                                                 Padding="{TemplateBinding Padding}"
361 360
                                                 TabIndex="{TemplateBinding TabIndex}"
......
458 457
                                                           Margin="2" Foreground="White" Content="Show All Pages" x:Name="btnPanorama" Click="btnPanorama_Click" Background="#FF0054B9" HorizontalAlignment="Right"/>
459 458
                    <Border BorderThickness="1" Margin="1" Grid.Row="1" BorderBrush="#FFC9C9C9" Background="White">
460 459
                        <StackPanel>
461
                            <RadioButton Content="All Pages" IsChecked="True" telerik:StyleManager.Theme="Office2013" FontSize="10" Margin="5,3" Click="ShowPageChange" x:Name="rdoAllPages"/>
462
                            <RadioButton Content="Favorited Pages"  FontSize="10" Margin="5,3" x:Name="rdoFavoritePages" Click="ShowPageChange" />
463
                            <Grid Margin="4.5,0">
464
                                <telerik:RadExpander Name="expCommentPages"
465
                                                 Padding="2" 
466
                                                 telerik:StyleManager.Theme="Office2016"
467
                                                 Template="{StaticResource RadExpanderControlTemplate1}">
468
                                    <telerik:RadExpander.Header>
469
                                        <TextBlock Text="Commented Pages" FontSize="10"  Margin="3,0"/>
470
                                    </telerik:RadExpander.Header>
471
                                    <telerik:RadExpander.Content>
472
                                        <ListBox x:Name="lstSelectComment"
473
                                             BorderBrush="{DynamicResource KCOMColor_ActiveBrush}"
474
                                             BorderThickness="2"
475
                                             ItemTemplate="{StaticResource CommentSelectTemplate}"
476
                                             telerik:StyleManager.Theme="Office2016" />
477
                                    </telerik:RadExpander.Content>
478
                                </telerik:RadExpander>
460
                            <RadioButton GroupName="grpPages" Content="All Pages" IsChecked="True" telerik:StyleManager.Theme="Office2013" FontSize="10" Margin="5,3" Checked="ShowPageChange" x:Name="rdoAllPages"/>
461
                            <RadioButton GroupName="grpPages" Content="Favorited Pages" FontSize="10" Margin="5,3" x:Name="rdoFavoritePages" Checked="ShowPageChange" />
462
                            <RadioButton GroupName="grpPages" Content="Commented Pages" FontSize="10" Margin="5,3" x:Name="rdoCommentPages" Checked="ShowPageChange" />
463
                            <Grid Margin="4.5,0" Visibility="{Binding IsChecked, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=rdoCommentPages}">
464
                                <ListBox x:Name="lstSelectComment"
465
                                            BorderBrush="{DynamicResource KCOMColor_ActiveBrush}"
466
                                            BorderThickness="2"
467
                                            ItemTemplate="{StaticResource CommentSelectTemplate}"
468
                                            telerik:StyleManager.Theme="Office2016" />
479 469
                                <!--  <telerik:RadComboBox ClearSelectionButtonVisibility="Visible" ClearSelectionButtonContent="Select All" FontSize="10" Margin="14,0,0,0" x:Name="cboSelectComment" telerik:StyleManager.Theme="Windows8" BorderBrush="#FFA09E9E" ItemTemplate="{StaticResource CommentSelectTemplate}" SelectAllTextEvent="SelectionChanged"/>  -->
480 470
                            </Grid>
481 471
                        </StackPanel>
......
510 500
                                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
511 501
                                        ScrollViewer.VerticalScrollBarVisibility="Auto"                                        
512 502
                                        ScrollViewer.CanContentScroll="True"
513
                                        telerik:StyleManager.Theme="Office2016" >
514
                        <telerik:RadListBox.ItemsPanel>
503
                                        telerik:StyleManager.Theme="Office2016" 
504
                                        ItemsSource="{Binding FilteredThumbnail.View, ElementName=userControl}" >
505
                        <!--<telerik:RadListBox.ItemsPanel>
515 506
                            <ItemsPanelTemplate>
516 507
                                <VirtualizingStackPanel/>
517 508
                            </ItemsPanelTemplate>
518
                        </telerik:RadListBox.ItemsPanel>
509
                        </telerik:RadListBox.ItemsPanel>-->
519 510
                        <telerik:RadListBox.ItemTemplate>
520 511
                            <DataTemplate>
521 512
                                <Grid x:Name="LayoutRoot">
......
536 527
                                        </Grid>
537 528
                                        <TextBlock Grid.Row="1" Text="{Binding PageNumber, FallbackValue=PageNo}" FontStyle="Italic" FontSize="14" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>
538 529
                                    </Grid>
539
                                    <Border Width="30" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,5">
540
                                        <controls:MarkupColorList  ColorList="{Binding DisplayColorItems,Mode=TwoWay}"  Opacity="90"/>
530
                                    <Border Width="30" Height="20" VerticalAlignment="Top" Opacity="90" HorizontalAlignment="Right" Margin="10,5"
531
                                            Background="{Binding DisplayColorItems, Converter={StaticResource ColorListToBrushConverter}}">
532
                                        <!--<controls:MarkupColorList  ColorList="{Binding DisplayColorItems}"  Opacity="90"/>-->
541 533
                                    </Border>
542 534
                                </Grid>
543 535
                            </DataTemplate>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)