Moved VmPanel back next to the editor.

Author: CocoBox84

src/EditorPart.axaml

@@ -56,7 +56,7 @@
 			</Grid>
 		</Border>
 		<!-- MAIN CONTENT -->
-		<Grid Grid.Row="1" ColumnDefinitions="260,5,*,">
+		<Grid Grid.Row="1" ColumnDefinitions="260,5,*">
 			<!-- BACKGROUND -->
 			<Grid.Background>
 				<ImageBrush Source="avares://PaintPower/src/Assets/Background.png" Stretch="None" TileMode="Tile" AlignmentX="Left" AlignmentY="Top" DestinationRect="0,0,10,10" />
@@ -74,15 +74,19 @@
 			</Grid>
 			<!-- SPLITTER between LEFT and CENTER -->
 			<GridSplitter Grid.Column="1" Width="5" Background="#505050" ResizeDirection="Columns" ResizeBehavior="PreviousAndNext" />
-			<Grid Grid.Row="2" RowDefinitions="30,*" Grid.Column="2">
+			<Grid RowDefinitions="30,*" Grid.Column="2">
 				<!-- Status Bar -->
 				<Border Grid.Row="0" Background="#c4c4c4" Margin="3">
 					<StackPanel Orientation="Horizontal" Margin="2" Background="#e0e0e0">
 						<TextBlock x:Name="StatusBarText" Text="Ready" Grid.Column="0" Margin="3" />
 					</StackPanel>
 				</Border>
 				<!-- OUTER CENTER: Sprite Editor Host -->
-				<ContentControl x:Name="CenterHost" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+				<Grid Grid.Row="1" ColumnDefinitions="*,5,*">
+					<ContentControl x:Name="CenterHost" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+					<GridSplitter Grid.Column="1" Width="5" Background="#505050" ResizeDirection="Columns" ResizeBehavior="PreviousAndNext" />
+					<vm:VmPanel Grid.Column="2" />
+				</Grid>
 			</Grid>
 		</Grid>
 	</Grid>

src/Editors/ScriptEditor.axaml

@@ -5,7 +5,7 @@
 
 	<Grid>
 		<Grid.Background>
-			<ImageBrush Source="avares://PaintPower/Assets/Background.png"
+			<ImageBrush Source="avares://PaintPower/src/Assets/Background.png"
 						Stretch="None"
 						TileMode="Tile"
 						DestinationRect="0,0,10,10" />

src/PaintPower_Engine.cs

@@ -699,7 +699,7 @@ public void HandleKeyDown(KeyEventArgs e)
         { Close(); KeyPress.RegisterKeyUp(e.Key); }
 
         if (SKeyPress.combo(e, "ctrl", "w"))
-        { CloseCurrentEditor(); KeyPress.RegisterKeyUp(e.Key); };
+        { CloseEditor(); KeyPress.RegisterKeyUp(e.Key); };
 
     }
 

src/VmPanel/VmPanel.axaml

@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="PaintPower.VMPanel.VmPanel" xmlns:vm="clr-namespace:PaintPower.VMPanel">
 	<Grid>
 		<Grid.Background>
-			<ImageBrush Source="avares://PaintPower/Assets/Background Dark.png" Stretch="None" TileMode="Tile" DestinationRect="0,0,10,10" />
+			<ImageBrush Source="avares://PaintPower/src/Assets/Background Dark.png" Stretch="None" TileMode="Tile" DestinationRect="0,0,10,10" />
 		</Grid.Background>
 		<Rectangle Fill="#80000000" />
 		<Border Padding="10">