projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Xaml] Support import other xaml as the source of resource dictionary
[platform/core/csapi/tizenfx.git]
/
src
/
Tizen.NUI
/
src
/
public
/
XamlBinding
/
ResourceDictionary.cs
diff --git
a/src/Tizen.NUI/src/public/XamlBinding/ResourceDictionary.cs
b/src/Tizen.NUI/src/public/XamlBinding/ResourceDictionary.cs
index
1051090
..
50fc3ce
100755
(executable)
--- a/
src/Tizen.NUI/src/public/XamlBinding/ResourceDictionary.cs
+++ b/
src/Tizen.NUI/src/public/XamlBinding/ResourceDictionary.cs
@@
-25,6
+25,8
@@
using System.Globalization;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
+
+using Tizen.NUI.Binding.Internals;
using Tizen.NUI.Xaml;
namespace Tizen.NUI.Binding
using Tizen.NUI.Xaml;
namespace Tizen.NUI.Binding
@@
-77,19
+79,25
@@
namespace Tizen.NUI.Binding
}
/// <summary>
}
/// <summary>
- /// Gets or sets the
URI of the merged
resource dictionary.
+ /// Gets or sets the resource dictionary.
/// </summary>
/// </summary>
- ///
This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API
.
+ ///
Internal using, will never open
.
[EditorBrowsable(EditorBrowsableState.Never)]
[TypeConverter(typeof(RDSourceTypeConverter))]
[EditorBrowsable(EditorBrowsableState.Never)]
[TypeConverter(typeof(RDSourceTypeConverter))]
- public
Uri
Source
+ public
ResourceDictionary
Source
{
{
- get { return source; }
+ get
+ {
+ return this;
+ }
set
{
set
{
- if (source == value)
- return;
- throw new InvalidOperationException("Source can only be set from XAML."); //through the RDSourceTypeConverter
+ OnValuesChanged(value.ToArray());
+
+ foreach (var pair in value)
+ {
+ Add(pair.Key, pair.Value);
+ }
}
}
}
}