From: Greg Burri <greg.burri@gmail.com>
Date: Thu, 3 Mar 2016 12:11:28 +0000 (+0100)
Subject: Piaz files wasn't associated during setup.
X-Git-Tag: 1.0.11~12
X-Git-Url: http://git.euphorik.ch/?a=commitdiff_plain;h=2e3cd07dd099944059ef5e7a7f5ef57ffe3d677b;p=master-thesis.git

Piaz files wasn't associated during setup.
---

diff --git a/Parasitemia/ParasitemiaUI/About.fs b/Parasitemia/ParasitemiaUI/About.fs
index 18f266f..908ccd5 100644
--- a/Parasitemia/ParasitemiaUI/About.fs
+++ b/Parasitemia/ParasitemiaUI/About.fs
@@ -11,8 +11,9 @@ open System.Diagnostics
 let showWindow (parent: Window) =
     let win = Views.AboutWindow()
     win.Root.Owner <- parent
-    win.Root.Left <- parent.Left + parent.ActualWidth / 2. - win.Root.Width / 2.
-    win.Root.Top <- parent.Top + parent.ActualHeight / 2. - win.Root.Height / 2.
+
+    win.Root.Left <- (if parent.WindowState = WindowState.Maximized then 0. else parent.Left) + parent.ActualWidth / 2. - win.Root.Width / 2.
+    win.Root.Top <- (if parent.WindowState = WindowState.Maximized then 0. else parent.Top) + parent.ActualHeight / 2. - win.Root.Height / 2.
 
     let version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version
     let txtVersion = sprintf " %d.%d.%d" version.Major version.Minor version.Revision
diff --git a/Parasitemia/ParasitemiaUI/Analysis.fs b/Parasitemia/ParasitemiaUI/Analysis.fs
index 9c7ddf0..2506015 100644
--- a/Parasitemia/ParasitemiaUI/Analysis.fs
+++ b/Parasitemia/ParasitemiaUI/Analysis.fs
@@ -21,8 +21,8 @@ open Types
 let showWindow (parent: Window) (state: State.State) : bool =
     let win = Views.AnalysisWindow()
     win.Root.Owner <- parent
-    win.Root.Left <- parent.Left + parent.ActualWidth / 2. - win.Root.Width / 2.
-    win.Root.Top <- parent.Top + parent.ActualHeight / 2. - win.Root.Height / 2.
+    win.Root.Left <- (if parent.WindowState = WindowState.Maximized then 0. else parent.Left) + parent.ActualWidth / 2. - win.Root.Width / 2.
+    win.Root.Top <- (if parent.WindowState = WindowState.Maximized then 0. else parent.Top) + parent.ActualHeight / 2. - win.Root.Height / 2.
 
     let logListener =
         { new Logger.IListener with
diff --git a/Parasitemia/Setup/setup.iss b/Parasitemia/Setup/setup.iss
index 51c8b64..e752860 100644
--- a/Parasitemia/Setup/setup.iss
+++ b/Parasitemia/Setup/setup.iss
@@ -46,7 +46,8 @@ Name: ParasitemiaFileAssociation; Description: "Use Parasitemia to open ""piaz""
 [Registry]
 Root: HKCR; Subkey: ".piaz"; ValueType: string; ValueName: ""; ValueData: "Parasitemia"; Flags: uninsdeletevalue; Tasks: ParasitemiaFileAssociation 
 Root: HKCR; Subkey: "Parasitemia"; ValueType: string; ValueName: ""; ValueData: "Parasitemia Prog"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "OptInvest\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\ParasitemiaUI.exe,0"
+Root: HKCR; Subkey: "Parasitemia\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\ParasitemiaUI.exe,0"        
+Root: HKCR; Subkey: "Parasitemia\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\ParasitemiaUI.exe"" ""%1"""
 
 [Run]
 Filename: "{app}/ParasitemiaUI.exe"; Flags: nowait postinstall runasoriginaluser; Description: "Launch Parasitemia"
\ No newline at end of file