|
@@ -13,7 +13,7 @@
|
|
xmlns:cmd="http://www.galasoft.ch/mvvmlight"
|
|
xmlns:cmd="http://www.galasoft.ch/mvvmlight"
|
|
xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
|
|
xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
|
|
xmlns:colorpicker="clr-namespace:ColorPicker;assembly=ColorPicker" xmlns:usercontrols="clr-namespace:PixiEditor.Views.UserControls" xmlns:behaviours="clr-namespace:PixiEditor.Helpers.Behaviours"
|
|
xmlns:colorpicker="clr-namespace:ColorPicker;assembly=ColorPicker" xmlns:usercontrols="clr-namespace:PixiEditor.Views.UserControls" xmlns:behaviours="clr-namespace:PixiEditor.Helpers.Behaviours"
|
|
- xmlns:avalonDockTheme="clr-namespace:PixiEditor.Styles.AvalonDock" xmlns:layerUserControls="clr-namespace:PixiEditor.Views.UserControls.Layers" xmlns:sys="clr-namespace:System;assembly=System.Runtime" d:DataContext="{d:DesignInstance Type=vm:ViewModelMain}"
|
|
|
|
|
|
+ xmlns:avalonDockTheme="clr-namespace:PixiEditor.Styles.AvalonDock" xmlns:layerUserControls="clr-namespace:PixiEditor.Views.UserControls.Layers" xmlns:sys="clr-namespace:System;assembly=System.Runtime" xmlns:lospec="clr-namespace:PixiEditor.Views.UserControls.Lospec" d:DataContext="{d:DesignInstance Type=vm:ViewModelMain}"
|
|
mc:Ignorable="d" WindowStyle="None" Initialized="MainWindow_Initialized"
|
|
mc:Ignorable="d" WindowStyle="None" Initialized="MainWindow_Initialized"
|
|
Title="PixiEditor" Name="mainWindow" Height="1000" Width="1600" Background="{StaticResource MainColor}"
|
|
Title="PixiEditor" Name="mainWindow" Height="1000" Width="1600" Background="{StaticResource MainColor}"
|
|
WindowStartupLocation="CenterScreen" WindowState="Maximized">
|
|
WindowStartupLocation="CenterScreen" WindowState="Maximized">
|
|
@@ -343,7 +343,7 @@
|
|
<avalondock:LayoutAnchorable ContentId="palette" Title="Palette" CanHide="False"
|
|
<avalondock:LayoutAnchorable ContentId="palette" Title="Palette" CanHide="False"
|
|
CanClose="False" CanAutoHide="False"
|
|
CanClose="False" CanAutoHide="False"
|
|
CanDockAsTabbedDocument="False" CanFloat="True">
|
|
CanDockAsTabbedDocument="False" CanFloat="True">
|
|
- <usercontrols:Palette Colors="{Binding BitmapManager.ActiveDocument.Palette}"
|
|
|
|
|
|
+ <usercontrols:PaletteViewer Colors="{Binding BitmapManager.ActiveDocument.Palette}"
|
|
SelectColorCommand="{Binding ColorsSubViewModel.SelectColorCommand}"/>
|
|
SelectColorCommand="{Binding ColorsSubViewModel.SelectColorCommand}"/>
|
|
</avalondock:LayoutAnchorable>
|
|
</avalondock:LayoutAnchorable>
|
|
<avalondock:LayoutAnchorable ContentId="swatches" Title="Swatches" CanHide="False"
|
|
<avalondock:LayoutAnchorable ContentId="swatches" Title="Swatches" CanHide="False"
|
|
@@ -353,6 +353,11 @@
|
|
SelectSwatchCommand="{Binding ColorsSubViewModel.SelectColorCommand}"
|
|
SelectSwatchCommand="{Binding ColorsSubViewModel.SelectColorCommand}"
|
|
Swatches="{Binding BitmapManager.ActiveDocument.Swatches}"/>
|
|
Swatches="{Binding BitmapManager.ActiveDocument.Swatches}"/>
|
|
</avalondock:LayoutAnchorable>
|
|
</avalondock:LayoutAnchorable>
|
|
|
|
+ <avalondock:LayoutAnchorable ContentId="paletteBrowser" Title="Palette Browser" CanHide="False"
|
|
|
|
+ CanClose="False" CanAutoHide="False"
|
|
|
|
+ CanDockAsTabbedDocument="False" CanFloat="True">
|
|
|
|
+ <lospec:LospecPalettesBrowser/>
|
|
|
|
+ </avalondock:LayoutAnchorable>
|
|
|
|
|
|
</LayoutAnchorablePane>
|
|
</LayoutAnchorablePane>
|
|
<LayoutAnchorablePane>
|
|
<LayoutAnchorablePane>
|