diff --git a/PacticeSolution/ImageLoader/MainWindow.xaml.cs b/PacticeSolution/ImageLoader/MainWindow.xaml.cs index 5108acc..56f1bae 100644 --- a/PacticeSolution/ImageLoader/MainWindow.xaml.cs +++ b/PacticeSolution/ImageLoader/MainWindow.xaml.cs @@ -78,7 +78,7 @@ namespace ImageLoader //if (parent != null) // parent.Children.Clear(); - Image newImage = CreateBitmap(image.Source.ToString(), 1000); + Image newImage = CreateBitmap(image.Source.ToString(), (int)cvsImage.ActualWidth); newImage.Stretch = Stretch.UniformToFill; cvsImage.Children.Clear(); cvsImage.Children.Add(newImage); diff --git a/PacticeSolution/PacticeSolution.sln b/PacticeSolution/PacticeSolution.sln index a9164f5..7755cac 100644 --- a/PacticeSolution/PacticeSolution.sln +++ b/PacticeSolution/PacticeSolution.sln @@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVMDataGridBinding", "MVVM EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageLoader", "ImageLoader\ImageLoader.csproj", "{F65ED213-2F48-4370-B327-FC1F4AFF1E66}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlUISample", "XamlUISample\XamlUISample.csproj", "{CBB0126E-291E-47F0-82D4-B7D78439BC4C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,6 +89,10 @@ Global {F65ED213-2F48-4370-B327-FC1F4AFF1E66}.Debug|Any CPU.Build.0 = Debug|Any CPU {F65ED213-2F48-4370-B327-FC1F4AFF1E66}.Release|Any CPU.ActiveCfg = Release|Any CPU {F65ED213-2F48-4370-B327-FC1F4AFF1E66}.Release|Any CPU.Build.0 = Release|Any CPU + {CBB0126E-291E-47F0-82D4-B7D78439BC4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CBB0126E-291E-47F0-82D4-B7D78439BC4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CBB0126E-291E-47F0-82D4-B7D78439BC4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CBB0126E-291E-47F0-82D4-B7D78439BC4C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PacticeSolution/XamlUISample/App.xaml b/PacticeSolution/XamlUISample/App.xaml new file mode 100644 index 0000000..e96f86a --- /dev/null +++ b/PacticeSolution/XamlUISample/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/PacticeSolution/XamlUISample/App.xaml.cs b/PacticeSolution/XamlUISample/App.xaml.cs new file mode 100644 index 0000000..111c263 --- /dev/null +++ b/PacticeSolution/XamlUISample/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace XamlUISample +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/PacticeSolution/XamlUISample/AssemblyInfo.cs b/PacticeSolution/XamlUISample/AssemblyInfo.cs new file mode 100644 index 0000000..8b5504e --- /dev/null +++ b/PacticeSolution/XamlUISample/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/PacticeSolution/XamlUISample/MainWindow.xaml b/PacticeSolution/XamlUISample/MainWindow.xaml new file mode 100644 index 0000000..13683cd --- /dev/null +++ b/PacticeSolution/XamlUISample/MainWindow.xaml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +