Browse Source

Assigned owner to popups

flabbet 4 years ago
parent
commit
87087ea089

+ 1 - 0
PixiEditor/Views/Dialogs/ConfirmationPopup.xaml.cs

@@ -20,6 +20,7 @@ namespace PixiEditor.Views
         public ConfirmationPopup()
         public ConfirmationPopup()
         {
         {
             InitializeComponent();
             InitializeComponent();
+            Owner = Application.Current.MainWindow;
             CancelCommand = new RelayCommand(Cancel);
             CancelCommand = new RelayCommand(Cancel);
             SetResultAndCloseCommand = new RelayCommand(SetResultAndClose);
             SetResultAndCloseCommand = new RelayCommand(SetResultAndClose);
             DataContext = this;
             DataContext = this;

+ 2 - 1
PixiEditor/Views/Dialogs/HelloTherePopup.xaml.cs

@@ -21,7 +21,7 @@ namespace PixiEditor.Views.Dialogs
             DependencyProperty.Register(nameof(RecentlyOpenedEmpty), typeof(bool), typeof(HelloTherePopup));
             DependencyProperty.Register(nameof(RecentlyOpenedEmpty), typeof(bool), typeof(HelloTherePopup));
 
 
         public static string VersionText => 
         public static string VersionText => 
-            $"v{AssemblyHelper.GetCurrentAssemblyVersion(x => $"{x.Major}.{x.Minor}" + (x.Revision != 0 ? $".{x.Revision}" : ""))}";
+            $"v{AssemblyHelper.GetCurrentAssemblyVersion(x => $"{x.Major}.{x.Minor}" + (x.Build != 0 ? $".{x.Build}" : ""))}";
 
 
         public FileViewModel FileViewModel { get => (FileViewModel)GetValue(FileViewModelProperty); set => SetValue(FileViewModelProperty, value); }
         public FileViewModel FileViewModel { get => (FileViewModel)GetValue(FileViewModelProperty); set => SetValue(FileViewModelProperty, value); }
 
 
@@ -40,6 +40,7 @@ namespace PixiEditor.Views.Dialogs
         public HelloTherePopup(FileViewModel fileViewModel)
         public HelloTherePopup(FileViewModel fileViewModel)
         {
         {
             DataContext = this;
             DataContext = this;
+            Owner = Application.Current.MainWindow;
             FileViewModel = fileViewModel;
             FileViewModel = fileViewModel;
 
 
             OpenFileCommand = new RelayCommand(OpenFile);
             OpenFileCommand = new RelayCommand(OpenFile);

+ 1 - 0
PixiEditor/Views/Dialogs/NewFilePopup.xaml.cs

@@ -18,6 +18,7 @@ namespace PixiEditor.Views
         public NewFilePopup()
         public NewFilePopup()
         {
         {
             InitializeComponent();
             InitializeComponent();
+            Owner = Application.Current.MainWindow;
         }
         }
 
 
         public int FileHeight
         public int FileHeight

+ 1 - 0
PixiEditor/Views/Dialogs/ResizeCanvasPopup.xaml.cs

@@ -25,6 +25,7 @@ namespace PixiEditor.Views
         public ResizeCanvasPopup()
         public ResizeCanvasPopup()
         {
         {
             InitializeComponent();
             InitializeComponent();
+            Owner = Application.Current.MainWindow;
         }
         }
 
 
 
 

+ 1 - 0
PixiEditor/Views/Dialogs/ResizeDocumentPopup.xaml.cs

@@ -17,6 +17,7 @@ namespace PixiEditor.Views
         public ResizeDocumentPopup()
         public ResizeDocumentPopup()
         {
         {
             InitializeComponent();
             InitializeComponent();
+            Owner = Application.Current.MainWindow;
             DataContext = this;
             DataContext = this;
         }
         }
 
 

+ 1 - 0
PixiEditor/Views/Dialogs/SaveFilePopup.xaml.cs

@@ -20,6 +20,7 @@ namespace PixiEditor.Views
         public SaveFilePopup()
         public SaveFilePopup()
         {
         {
             InitializeComponent();
             InitializeComponent();
+            Owner = Application.Current.MainWindow;
             DataContext = dataContext;
             DataContext = dataContext;
         }
         }