개정판 a6f7f9b6
issue #1136: control 생성자에서 generic.xaml 제거 및 App.xaml 에 generic 추가
Change-Id: Ife79570df09c37a10104924afbd0caebc03f1244
| MarkupToPDF/Controls/Line/LineControl.cs | ||
|---|---|---|
| 30 | 30 |
{
|
| 31 | 31 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(LineControl), new FrameworkPropertyMetadata(typeof(LineControl))); |
| 32 | 32 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 33 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 33 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 34 | 34 |
|
| 35 |
dictionary.Source = new Uri("/MarkupToPDF;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 36 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 35 |
//dictionary.Source = new Uri("/MarkupToPDF;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 36 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 37 | 37 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
| 38 |
}
|
|
| 38 |
} |
|
| 39 | 39 |
|
| 40 | 40 |
public double DimSize |
| 41 | 41 |
{
|
| ... | ... | |
| 52 | 52 |
|
| 53 | 53 |
public LineControl() |
| 54 | 54 |
{
|
| 55 |
this.DefaultStyleKey = typeof(LineControl); |
|
| 55 |
//this.DefaultStyleKey = typeof(LineControl);
|
|
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 | 58 |
public void Dispose() |
| 59 | 59 |
{
|
| 60 |
GC.Collect(); |
|
| 61 |
GC.SuppressFinalize(this); |
|
| 60 |
//GC.Collect(); |
|
| 61 |
//GC.SuppressFinalize(this); |
|
| 62 |
this.Base_LinePath = null; |
|
| 62 | 63 |
} |
| 63 | 64 |
protected void OnPropertyChanged(string propName) |
| 64 | 65 |
{
|
내보내기 Unified diff
