Browse Source

Fixed ControlCatalog resources.

Steven Kirk 10 years ago
parent
commit
516a701e6b

+ 1 - 1
samples/ControlCatalog/App.paml

@@ -11,6 +11,6 @@
       <Setter Property="FontSize" Value="13"/>
     </Style>
 
-    <StyleInclude Source="resource://application/ControlCatalog/ControlCatalog.SideBar.paml"/>
+    <StyleInclude Source="resm:ControlCatalog.SideBar.paml"/>
   </Application.Styles>
 </Application>

+ 3 - 3
samples/ControlCatalog/Pages/CarouselPage.paml

@@ -11,9 +11,9 @@
         <Carousel.Transition>
           <PageSlide Duration="0.25"/>
         </Carousel.Transition>
-        <Image Source="resource://application/ControlCatalog.Assets.delicate-arch-896885_640.jpg"/>
-        <Image Source="resource://application/ControlCatalog.Assets.hirsch-899118_640.jpg"/>
-        <Image Source="resource://application/ControlCatalog.Assets.maple-leaf-888807_640.jpg"/>
+        <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"/>
+        <Image Source="resm:ControlCatalog.Assets.hirsch-899118_640.jpg"/>
+        <Image Source="resm:ControlCatalog.Assets.maple-leaf-888807_640.jpg"/>
       </Carousel>
       <Button Name="right" VerticalAlignment="Center" Padding="20">
         <Path Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" Fill="Black"/>

+ 1 - 3
src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs

@@ -30,11 +30,9 @@ namespace Perspex.Markup.Xaml.Converters
             {
                 case "file":
                     return new Bitmap((string)value);
-                case "resource":
+                default:
                     var assets = PerspexLocator.Current.GetService<IAssetLoader>();
                     return new Bitmap(assets.Open(uri));
-                default:
-                    throw new NotSupportedException($"Unsupported bitmap URI scheme: {uri.Scheme}.");
             }
         }