aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-07-02 08:49:10 -0400
committerMichael <[email protected]>2017-07-02 08:49:10 -0400
commit3e1af6e8cb1d707de0fe5634849178522d8fcf76 (patch)
tree37355ece811354597f5a63e21ccbe77a75793eea
parent9578be099814924870bcb25b1fe4f8a2d375f3b9 (diff)
downloadshiftos_thereturn-3e1af6e8cb1d707de0fe5634849178522d8fcf76.tar.gz
shiftos_thereturn-3e1af6e8cb1d707de0fe5634849178522d8fcf76.tar.bz2
shiftos_thereturn-3e1af6e8cb1d707de0fe5634849178522d8fcf76.zip
fix windowmanager layout kink
-rw-r--r--ShiftOS.WinForms/WindowBorder.cs5
-rw-r--r--ShiftOS.WinForms/WinformsWindowManager.cs8
2 files changed, 9 insertions, 4 deletions
diff --git a/ShiftOS.WinForms/WindowBorder.cs b/ShiftOS.WinForms/WindowBorder.cs
index e056350..efb3f98 100644
--- a/ShiftOS.WinForms/WindowBorder.cs
+++ b/ShiftOS.WinForms/WindowBorder.cs
@@ -231,10 +231,7 @@ namespace ShiftOS.WinForms
this.DoubleBuffered = true;
this.Left = (Screen.PrimaryScreen.Bounds.Width - this.Width) / 2;
this.Top = (Screen.PrimaryScreen.Bounds.Height - this.Height) / 2;
- ParentWindow.OnLoad();
- ParentWindow.OnSkinLoad();
- ParentWindow.OnUpgrade();
-
+
}
/// <summary>
diff --git a/ShiftOS.WinForms/WinformsWindowManager.cs b/ShiftOS.WinForms/WinformsWindowManager.cs
index 8bff387..a224f08 100644
--- a/ShiftOS.WinForms/WinformsWindowManager.cs
+++ b/ShiftOS.WinForms/WinformsWindowManager.cs
@@ -121,6 +121,10 @@ namespace ShiftOS.WinForms
wb.IsDialog = true;
Desktop.ShowWindow(wb);
+ form.OnLoad();
+ form.OnSkinLoad();
+ form.OnUpgrade();
+
}
public override void SetupWindow(IShiftOSWindow form)
@@ -208,6 +212,10 @@ namespace ShiftOS.WinForms
wb.FormClosed += onClose;
Desktop.ShowWindow(wb);
SetupWindows();
+ form.OnLoad();
+ form.OnSkinLoad();
+ form.OnUpgrade();
+
}
public void SetupWindows()