Fix some minor bug cause crash Excel

KitCognac · Aug 11, 2020 · e6ff236 · e6ff236
1 parent adc2dba
commit e6ff236
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/XLIG/Init.cs b/XLIG/Init.cs
@@ -22,16 +22,31 @@ public void AutoOpen()
             AddinContext.XlApp = (Excel.Application)ExcelDnaUtil.Application;
             // Hook Mouse on First Load
             MouseHook_Main.M_AppHook = Hook.AppEvents();
+            MouseHook_Main.Init_Unload(XLIG.Properties.Settings.Default.HScroll);
+            // Hook ws event to Ctrl+Tab switch back to old sheet
+            AddinContext.XlApp.SheetDeactivate += XlAppEvent_SheetDeactivate;
+            AddinContext.XlApp.WorkbookDeactivate += XlAppEvent_WorkbookDeactivate;
 
         }
         public void AutoClose()
         {
+            // Dispose Mouse Hook
+            MouseHook_Main.M_AppHook.Dispose();
             // It is recommended to unattacth this IntelliSense server
             IntelliSenseServer.Uninstall();
             // Kill Shadow Excel Instance
             AddinContext.XlApp.Quit();
-            // Dispose Mouse Hook
-            MouseHook_Main.M_AppHook.Dispose();
+            AddinContext.XlApp.SheetDeactivate -= XlAppEvent_SheetDeactivate;
+            AddinContext.XlApp.WorkbookDeactivate -= XlAppEvent_WorkbookDeactivate;
+        }
+        private void XlAppEvent_WorkbookDeactivate(Excel.Workbook Wb)
+        {
+            XLCommand.PreWbookName = Wb.Name;
+        }
+        private void XlAppEvent_SheetDeactivate(object Sh)
+        {
+            XLCommand.PreWsheetName = (Sh as Excel.Worksheet).Name;
+            XLCommand.PreWbookName = AddinContext.XlApp.ActiveWorkbook.Name;
         }
     }
 

diff --git a/XLIG/Ribbon.cs b/XLIG/Ribbon.cs
@@ -25,7 +25,6 @@ public void SayHello(IRibbonControl control1)
         // Toggle Horizontal Scroll Section
         public bool Toggle_HScroll_GetPressed(IRibbonControl control1)
         {
-            MouseHook_Main.Init_Unload(Settings.Default.HScroll);
             return Settings.Default.HScroll;
         }
         public void Toggle_HScroll_Control(IRibbonControl control1, bool pressed)

diff --git a/XLIG/XLCommands.cs b/XLIG/XLCommands.cs
@@ -10,6 +10,8 @@ public class XLCommand
         public static Excel.Workbook wb = null;
         public static Excel.Worksheet ws = null;
         public static Excel.Application XLApp = AddinContext.XlApp;
+        public static string PreWbookName = null;
+        public static string PreWsheetName = null;
         [ExcelCommand(Description = "Open Sheets List", ShortCut = "^q")]
         public static void OpenSheetsList()
         {
@@ -74,5 +76,32 @@ public static void DecreaseColWidth()
                 }
             }
         }
+        [ExcelCommand(Description = "Back Previous Sheet", ShortCut = "^{tab}")]
+        public static void Back_Prev_Sheet()
+        {
+            if (PreWsheetName == null && PreWbookName == null)
+            {
+                return;
+            }
+            try
+            {
+                if (PreWbookName == null)
+                {
+                    (XLApp.Sheets[PreWsheetName] as Excel.Worksheet).Select();
+                }
+                else
+                {
+                    if (XLApp.ActiveWorkbook.Name == PreWbookName)
+                    {
+                        (XLApp.Sheets[PreWsheetName] as Excel.Worksheet).Select();
+                    }
+                    else
+                    {
+                        XLApp.Workbooks[PreWbookName].Activate();
+                    }
+                }
+            }
+            catch { /* Sheet Deleted or workbook closed could cause errors. Throw catch here for that. */ }
+        }
     }
 }