프로젝트

일반

사용자정보

개정판 4fcb686a

ID4fcb686a2d4740f5eee8d44f69429ab17bd7489f
상위 a7bee7cf
하위 5ba8f2d5

김태성이(가) 2년 이상 전에 추가함

issue #000 font가 적용 되지 않아 box size가 작게 출력되는 문제

Change-Id: Ie07531db96d56e8d5c2bbdbf0786d053ad39747c

차이점 보기:

KCOM/Resources/ClearTextBoxStyle.xaml
1
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2
                    xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
3
             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
4
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
1
<ResourceDictionary
2
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4
    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
5
    xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation">
5 6
    <ResourceDictionary.MergedDictionaries>
6
        <ResourceDictionary Source="/Telerik.Windows.Controls;component/Themes/FontResources.xaml"/>
7
        <ResourceDictionary Source="/Telerik.Windows.Controls;component/Themes/FontResources.xaml" />
7 8
    </ResourceDictionary.MergedDictionaries>
8
    <!--Control colors.-->
9
    <!--  Control colors.  -->
9 10
    <Color x:Key="WindowColor">#FFE8EDF9</Color>
10 11
    <Color x:Key="ContentAreaColorLight">#FFC5CBF9</Color>
11 12
    <Color x:Key="ContentAreaColorDark">#FF7381F9</Color>
......
28 29
    <Color x:Key="GlyphColor">#FF444444</Color>
29 30
    <Color x:Key="GlyphMouseOver">sc#1, 0.004391443, 0.002428215, 0.242281124</Color>
30 31

  
31
    <!--Border colors-->
32
    <!--  Border colors  -->
32 33
    <Color x:Key="BorderLightColor">#FFCCCCCC</Color>
33 34
    <Color x:Key="BorderMediumColor">#FF888888</Color>
34 35
    <Color x:Key="BorderDarkColor">#FF444444</Color>
......
41 42

  
42 43
    <Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
43 44

  
44
    <!--Control-specific resources.-->
45
    <!--  Control-specific resources.  -->
45 46
    <Color x:Key="HeaderTopColor">#FFC5CBF9</Color>
46 47
    <Color x:Key="DatagridCurrentCellBorderColor">Black</Color>
47 48
    <Color x:Key="SliderTrackDarkColor">#FFC5CBF9</Color>
48 49

  
49 50
    <Color x:Key="NavButtonFrameColor">#FF3843C4</Color>
50 51

  
51
    <LinearGradientBrush x:Key="MenuPopupBrush"
52
                     EndPoint="0.5,1"
53
                     StartPoint="0.5,0">
54
        <GradientStop Color="{DynamicResource ControlLightColor}"
55
                Offset="0" />
56
        <GradientStop Color="{DynamicResource ControlMediumColor}"
57
                Offset="0.5" />
58
        <GradientStop Color="{DynamicResource ControlLightColor}"
59
                Offset="1" />
52
    <LinearGradientBrush x:Key="MenuPopupBrush" StartPoint="0.5,0" EndPoint="0.5,1">
53
        <GradientStop Offset="0" Color="{DynamicResource ControlLightColor}" />
54
        <GradientStop Offset="0.5" Color="{DynamicResource ControlMediumColor}" />
55
        <GradientStop Offset="1" Color="{DynamicResource ControlLightColor}" />
60 56
    </LinearGradientBrush>
61 57

  
62
    <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill"
63
                     StartPoint="0,0"
64
                     EndPoint="1,0">
58
    <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
65 59
        <LinearGradientBrush.GradientStops>
66 60
            <GradientStopCollection>
67
                <GradientStop Color="#000000FF"
68
                    Offset="0" />
69
                <GradientStop Color="#600000FF"
70
                    Offset="0.4" />
71
                <GradientStop Color="#600000FF"
72
                    Offset="0.6" />
73
                <GradientStop Color="#000000FF"
74
                    Offset="1" />
61
                <GradientStop Offset="0" Color="#000000FF" />
62
                <GradientStop Offset="0.4" Color="#600000FF" />
63
                <GradientStop Offset="0.6" Color="#600000FF" />
64
                <GradientStop Offset="1" Color="#000000FF" />
75 65
            </GradientStopCollection>
76 66
        </LinearGradientBrush.GradientStops>
77 67
    </LinearGradientBrush>
78 68
    <Style x:Key="ClearTextBoxStyle" TargetType="{x:Type TextBox}">
79
        <Setter Property="SnapsToDevicePixels"
80
          Value="True" />
81
        <Setter Property="OverridesDefaultStyle"
82
          Value="True" />
83
        <Setter Property="KeyboardNavigation.TabNavigation"
84
          Value="None" />
85
        <Setter Property="Text" Value="{x:Null}"/>
86
        <Setter Property="FocusVisualStyle"
87
          Value="{x:Null}" />
88
        <Setter Property="MinWidth"
89
          Value="0" />
90
        <Setter Property="MinHeight"
91
          Value="20" />
92
        <Setter Property="AllowDrop"
93
          Value="true" />
69
        <Setter Property="SnapsToDevicePixels" Value="True" />
70
        <Setter Property="OverridesDefaultStyle" Value="True" />
71
        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
72
        <Setter Property="Text" Value="{x:Null}" />
73
        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
74
        <Setter Property="MinWidth" Value="0" />
75
        <Setter Property="MinHeight" Value="20" />
76
        <Setter Property="AllowDrop" Value="true" />
94 77
        <Setter Property="Template">
95 78
            <Setter.Value>
96 79
                <ControlTemplate TargetType="{x:Type TextBox}">
97
                            <Border Name="Border"
98
                CornerRadius="0"
99
                Padding="0">
80
                    <Border
81
                        Name="Border"
82
                        Padding="0"
83
                        CornerRadius="0">
100 84
                        <Border.Background>
101 85
                            <SolidColorBrush Color="{DynamicResource ControlLightColor}" />
102 86
                        </Border.Background>
103 87
                        <Border.BorderBrush>
104 88
                            <SolidColorBrush Color="{DynamicResource BorderMediumColor}" />
105 89
                        </Border.BorderBrush>
90
                        <Border
91
                            Background="Transparent"
92
                            BorderBrush="#FFDDE2E5"
93
                            BorderThickness="1">
94
                            <Grid>
95
                                <Grid.ColumnDefinitions>
96
                                    <ColumnDefinition />
97
                                    <ColumnDefinition Width="Auto" />
98
                                </Grid.ColumnDefinitions>
99
                                <ScrollViewer
100
                                    x:Name="PART_ContentHost"
101
                                    Margin="0"
102
                                    BorderThickness="0" />
103
                                <!--<telerik:RadPathButton BorderThickness="0" Background="Transparent" Grid.Column="1" x:Name="ClearButton"
104
                                                       Content="{StaticResource GlyphCloseCircle}"
105
                                                       FontFamily="{StaticResource TelerikWebUI}">
106
                                </telerik:RadPathButton>-->
107
                                <Button
108
                                    x:Name="ClearButton"
109
                                    Grid.Column="1"
110
                                    Background="Transparent"
111
                                    BorderThickness="0"
112
                                    Content="{StaticResource GlyphCloseCircle}"
113
                                    FontFamily="{StaticResource TelerikWebUI}"
114
                                    IsEnabled="{TemplateBinding IsEnabled}" />
115
                            </Grid>
116
                        </Border>
106 117
                        <VisualStateManager.VisualStateGroups>
107 118
                            <VisualStateGroup x:Name="CommonStates">
108 119
                                <VisualState x:Name="Normal" />
109 120
                                <VisualState x:Name="Disabled">
110 121
                                    <Storyboard>
111
                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
112
                                                Storyboard.TargetProperty="(Panel.Background).
113
                    (SolidColorBrush.Color)">
114
                                            <EasingColorKeyFrame KeyTime="0"
115
                                         Value="{StaticResource DisabledControlLightColor}" />
122
                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).                     (SolidColorBrush.Color)">
123
                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledControlLightColor}" />
116 124
                                        </ColorAnimationUsingKeyFrames>
117 125
                                    </Storyboard>
118 126
                                </VisualState>
119 127
                                <VisualState x:Name="ReadOnly">
120 128
                                    <Storyboard>
121
                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
122
                                                Storyboard.TargetProperty="(Panel.Background).
123
                    (SolidColorBrush.Color)">
124
                                            <EasingColorKeyFrame KeyTime="0"
125
                                         Value="{StaticResource DisabledControlDarkColor}" />
129
                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).                     (SolidColorBrush.Color)">
130
                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledControlDarkColor}" />
126 131
                                        </ColorAnimationUsingKeyFrames>
127 132
                                    </Storyboard>
128 133
                                </VisualState>
129 134
                                <VisualState x:Name="MouseOver" />
130 135
                            </VisualStateGroup>
131 136
                        </VisualStateManager.VisualStateGroups>
132
                        <Border BorderBrush="#FFDDE2E5" Background="Transparent" BorderThickness="1">
133
                            <Grid>
134
                            <Grid.ColumnDefinitions>
135
                                <ColumnDefinition/>
136
                                <ColumnDefinition Width="Auto"/>
137
                            </Grid.ColumnDefinitions>
138
                                <ScrollViewer Margin="0" BorderThickness="0" x:Name="PART_ContentHost" />
139
                                <!--<telerik:RadPathButton BorderThickness="0" Background="Transparent" Grid.Column="1" x:Name="ClearButton"
140
                                                       Content="{StaticResource GlyphCloseCircle}"
141
                                                       FontFamily="{StaticResource TelerikWebUI}">
142
                                </telerik:RadPathButton>-->
143
                                <Button BorderThickness="0" IsEnabled="{TemplateBinding IsEnabled}" Background="Transparent" Grid.Column="1" x:Name="ClearButton"
144
                                                       Content="{StaticResource GlyphCloseCircle}"
145
                                                       FontFamily="{StaticResource TelerikWebUI}">
146
                                </Button>
147
                            </Grid>
148
                        </Border>
149 137
                    </Border>
150 138
                    <ControlTemplate.Triggers>
151 139
                        <Trigger SourceName="ClearButton" Property="IsPressed" Value="True">
152
                            <Setter Property="Text" Value="{x:Null}"/>
140
                            <Setter Property="Text" Value="{x:Null}" />
153 141
                        </Trigger>
154 142
                        <Trigger Property="Text" Value="{x:Null}">
155
                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
143
                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
156 144
                        </Trigger>
157 145
                        <Trigger Property="Text" Value="">
158
                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed"/>
146
                            <Setter TargetName="ClearButton" Property="Visibility" Value="Collapsed" />
159 147
                        </Trigger>
160 148
                    </ControlTemplate.Triggers>
161 149
                </ControlTemplate>

내보내기 Unified diff

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