Merge branch 'master' of https://github.com/jogibear9988/SVGImage

Author: jogibear9988

Samples/ClipArtViewer/MainWindow.xaml

@@ -109,9 +109,10 @@
                 <Grid Margin="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="330"/>
+                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <ListBox Name="m_filelist" Grid.Row="1" ItemsSource="{Binding Path=Items}" Margin="3" Padding="3">
+                    <ListBox Name="m_filelist" Grid.Row="1" ItemsSource="{Binding Path=Items}" Margin="3, 3, 9, 3" Padding="3">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Margin="5">
@@ -127,8 +128,10 @@
                             </ContextMenu>
                         </ListBox.ContextMenu>
                     </ListBox>
-
-                    <TabControl Grid.Column="1" Grid.Row="1" Margin="3" x:Name="tabControl" 
+                    
+                    <GridSplitter Grid.Column="0" Name="gridSplitter1" Width="8" Background="LightGray" />
+                    
+                    <TabControl Grid.Column="2" Grid.Row="1" Margin="3" x:Name="tabControl" 
                                 SelectionChanged="OnTabControlSelectionChanged" Style="{DynamicResource TabControl.Style.TopTabStripPlacement}">
                         <TabItem Header="Size Type" Height="36" Width="120" x:Name="tabSizeType" Style="{DynamicResource TabItem.Style.TopTabStripPlacement}">
                             <local:SizeTypeForm x:Name="m_sizeTypeForm" ImageSource="{Binding ElementName=m_filelist, Path=SelectedItem.SVGImage}"/>

Source/SVGImage/SVG/SVGRender.cs

@@ -364,10 +364,27 @@ internal DrawingGroup LoadGroup(IList<Shape> elements, Rect? viewBox, bool isSwi
                 if (shape is RectangleShape)
                 {
                     RectangleShape r = shape as RectangleShape;
-                    RectangleGeometry rect = new RectangleGeometry(new Rect(r.X < 0 ? 0 : r.X, r.Y < 0 ? 0 : r.Y, r.X < 0 ? r.Width + r.X : r.Width, r.Y < 0 ? r.Height + r.Y : r.Height));
-                    rect.RadiusX = r.RX;
-                    rect.RadiusY = r.RY;
-                    if (rect.RadiusX == 0 && rect.RadiusY > 0) rect.RadiusX = rect.RadiusY;
+                    //RectangleGeometry rect = new RectangleGeometry(new Rect(r.X < 0 ? 0 : r.X, r.Y < 0 ? 0 : r.Y, r.X < 0 ? r.Width + r.X : r.Width, r.Y < 0 ? r.Height + r.Y : r.Height));
+                    double dx     = r.X;
+                    double dy     = r.Y;
+                    double width  = r.Width;
+                    double height = r.Height;
+                    double rx     = r.RX;
+                    double ry     = r.RY;
+                    if (width <= 0 || height <= 0)
+                    {
+                        continue;
+                    }
+                    if (rx <= 0 && ry > 0)
+                    {
+                        rx = ry;
+                    }
+                    else if (rx > 0 && ry <= 0)
+                    {
+                        ry = rx;
+                    }
+
+                    RectangleGeometry rect = new RectangleGeometry(new Rect(dx, dy, width, height), rx, ry);
                     var di = this.NewDrawingItem(shape, rect);
                     AddDrawingToGroup(grp, shape, di);
                     continue;