From caa4da6dc6ff31fdfc2bb4226721ffab7df20660 Mon Sep 17 00:00:00 2001
From: kevinepope <kevin.pope@gmail.com>
Date: Sat, 1 Mar 2014 17:52:33 -0800
Subject: [PATCH] More widescreen fixes.

---
 MainSlidePanel.cs           | 31 +++++++++++++++++++------------
 MatterControlApplication.cs |  2 +-
 WidescreenPanel.cs          | 17 +++++++++++------
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/MainSlidePanel.cs b/MainSlidePanel.cs
index 8763fb9ce..57423f6bb 100644
--- a/MainSlidePanel.cs
+++ b/MainSlidePanel.cs
@@ -62,16 +62,22 @@ namespace MatterHackers.MatterControl
         TabControl advancedControls;
         private delegate void ReloadPanel();
         event EventHandler unregisterEvents;
-        public RootedObjectEventHandler ReloadPanelTrigger;
-        public RootedObjectEventHandler SetUpdateNotificationTrigger;
+        public RootedObjectEventHandler ReloadPanelTrigger = new RootedObjectEventHandler();
+        public RootedObjectEventHandler SetUpdateNotificationTrigger = new RootedObjectEventHandler();
         
 
         public MainSlidePanel()
         {
-            this.AddChild(new WidescreenPanel());
-            this.AnchorAll();            
+            
         }
 
+        public void AddElements()
+        {
+            //this.AddChild(new MainSlide());
+            this.AddChild(new WidescreenPanel());
+            this.AnchorAll();
+            SetUpdateNotification(this, null);
+        }
 
         public static MainSlidePanel Instance
         {
@@ -80,6 +86,7 @@ namespace MatterHackers.MatterControl
                 if (globalInstance == null)
                 {
                     globalInstance = new MainSlidePanel();
+                    globalInstance.AddElements();
                 }
                 return globalInstance;
             }
@@ -118,8 +125,7 @@ namespace MatterHackers.MatterControl
 
     public class MainSlide : SlidePanel
     {
-        SimpleTextTabWidget aboutTabView;
-        static MainSlidePanel globalInstance;
+        SimpleTextTabWidget aboutTabView;        
         TabControl advancedControlsTabControl;
         TabControl mainControlsTabControl;
         SliceSettingsWidget sliceSettingsWidget;
@@ -129,6 +135,7 @@ namespace MatterHackers.MatterControl
         public TabPage AboutTabPage;
         TextImageButtonFactory advancedControlsButtonFactory = new TextImageButtonFactory();
         RGBA_Bytes unselectedTextColor = ActiveTheme.Instance.TabLabelUnselected;
+        static MainSlide globalInstance;
 
         GuiWidget LeftPanel
         {
@@ -143,7 +150,7 @@ namespace MatterHackers.MatterControl
         public MainSlide()
             : base(2)
         {
-            this.AnchorAll();
+            AddElements();
         }
 
         public void AddElements()
@@ -211,7 +218,7 @@ namespace MatterHackers.MatterControl
                 // and add it
                 this.LeftPanel.AddChild(mainControlsTabControl);
 
-                SetUpdateNotification(this, null);
+                
             }
 
             // do the back panel
@@ -255,13 +262,13 @@ namespace MatterHackers.MatterControl
             HelpTextWidget.Instance.HideHoverText();
         }
 
-        public static MainSlidePanel Instance
+        public static MainSlide Instance
         {
             get
             {
                 if (globalInstance == null)
                 {
-                    globalInstance = new MainSlidePanel();
+                    globalInstance = new MainSlide();
                 }
                 return globalInstance;
             }
@@ -367,7 +374,7 @@ namespace MatterHackers.MatterControl
             ActiveTheme.Instance.ThemeChanged.RegisterEvent(onThemeChanged, ref unregisterEvents);
             PrintQueue.PrintQueueControl.Instance.ItemAdded.RegisterEvent(NumQueueItemsChanged, ref unregisterEvents);
             PrintQueue.PrintQueueControl.Instance.ItemRemoved.RegisterEvent(NumQueueItemsChanged, ref unregisterEvents);
-            MainSlidePanel.Instance.SetUpdateNotificationTrigger.RegisterEvent(SetUpdateNotification, ref unregisterEvents);
+            MainSlidePanel.Instance.SetUpdateNotificationTrigger.RegisterEvent(OnSetUpdateNotification, ref unregisterEvents);
             MainSlidePanel.Instance.ReloadPanelTrigger.RegisterEvent(ReloadBackPanel, ref unregisterEvents);
         }
 
@@ -389,7 +396,7 @@ namespace MatterHackers.MatterControl
         }
 
         GuiWidget addedUpdateMark = null;
-        public void SetUpdateNotification(object sender, EventArgs widgetEvent)
+        public void OnSetUpdateNotification(object sender, EventArgs widgetEvent)
         {
             if (this.UpdateIsAvailable() || UpdateControl.NeedToCheckForUpdateFirstTimeEver)
             {
diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs
index 72681676c..1cfe0f9c8 100644
--- a/MatterControlApplication.cs
+++ b/MatterControlApplication.cs
@@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl
             this.Padding = new BorderDouble(0); //To be re-enabled once native borders are turned off
 
             //allControls.AddChild(WidescreenPanel.Instance);
-            allControls.AddChild(new ActionBarPlus());
+            //allControls.AddChild(new ActionBarPlus());
             allControls.AddChild(MainSlidePanel.Instance);
 
 #if false // this is to test freeing gcodefile memory
diff --git a/WidescreenPanel.cs b/WidescreenPanel.cs
index 72fbf4497..abb5bf153 100644
--- a/WidescreenPanel.cs
+++ b/WidescreenPanel.cs
@@ -256,22 +256,27 @@ namespace MatterHackers.MatterControl
             if (this.Width < ColumnThreeMinWidth)
             {                
                 ColumnThree.Visible = false;
-                part3DView.Visible = false;
-                partGcodeView.Visible = false;
+                ColumnTwo.Visible = false;
+
+                ColumnOne.AnchorAll();
                 ColumnOne.Visible = true;
+
             }
             else if (this.Width < ColumnTwoMinWidth)
             {
                 ColumnThree.Visible = true;
-                part3DView.Visible = false;
-                partGcodeView.Visible = false;
+                ColumnTwo.Visible = false;
+
+                ColumnOne.AnchorAll();
                 ColumnOne.Visible = true;
             }
             else
             {
                 ColumnThree.Visible = true;
-                part3DView.Visible = true;
-                partGcodeView.Visible = true;
+                ColumnTwo.Visible = true;
+
+                ColumnOne.HAnchor = Agg.UI.HAnchor.None;
+                ColumnOne.Width = 480;
                 ColumnOne.Visible = true;
             }
         }