Moved HyperlinkText to SampleApps

This commit is contained in:
Clemens 2021-10-28 20:26:51 +02:00
parent 19d1b8f479
commit af238035cf
20 changed files with 35 additions and 70 deletions

View file

@ -1,4 +1,4 @@
<Application x:Class="WpfApplication.App"
<Application x:Class="SampleApplication.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml">

View file

@ -1,6 +1,6 @@
using System.Windows;
namespace WpfApplication
namespace SampleApplication
{
public partial class App : Application
{

View file

@ -1,9 +1,8 @@
<Window x:Class="WpfApplication.MainWindow"
<Window x:Class="SampleApplication.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF"
xmlns:vm="clr-namespace:ViewModel"
xmlns:local="clr-namespace:WpfApplication"
xmlns:local="clr-namespace:SampleApplication"
Title="XAML MapControl - WPF Sample Application" Height="600" Width="900"
Stylus.IsPressAndHoldEnabled="False">
<Window.Resources>
@ -113,7 +112,7 @@
</Window.Resources>
<Window.DataContext>
<vm:MapViewModel/>
<local:MapViewModel/>
</Window.DataContext>
<Grid>
@ -170,7 +169,7 @@
</map:Map>
<Border HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF">
<TextBlock Margin="4,2" FontSize="10" map:HyperlinkText.InlinesSource="{Binding MapLayer.Description, ElementName=map}"/>
<TextBlock Margin="4,2" FontSize="10" local:HyperlinkText.InlinesSource="{Binding MapLayer.Description, ElementName=map}"/>
</Border>
<Grid Grid.Row="1">

View file

@ -7,9 +7,8 @@ using System.Windows;
using System.Windows.Input;
using MapControl;
using MapControl.Caching;
using ViewModel;
namespace WpfApplication
namespace SampleApplication
{
public partial class MainWindow : Window
{
@ -19,7 +18,7 @@ namespace WpfApplication
{
ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
//TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
//TileImageLoader.Cache = new FileDbCache(TileImageLoader.DefaultCacheFolder);
//TileImageLoader.Cache = new SQLiteCache(TileImageLoader.DefaultCacheFolder);
//TileImageLoader.Cache = null;

View file

@ -2,7 +2,7 @@
using System.Windows.Controls;
using System.Windows.Media;
namespace WpfApplication
namespace SampleApplication
{
public class OutlinedText : FrameworkElement
{

View file

@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<TargetFrameworks>net5.0-windows;net48</TargetFrameworks>
<UseWPF>true</UseWPF>
<RootNamespace>WpfApplication</RootNamespace>
<RootNamespace>SampleApplication</RootNamespace>
<Product>XAML Map Control</Product>
<Version>6.1.0</Version>
<Description>XAML Map Control WPF Sample Application</Description>