diff --git a/Business/App.cs b/Business/App.cs index 073c9be..d8c2a9b 100644 --- a/Business/App.cs +++ b/Business/App.cs @@ -39,6 +39,7 @@ namespace SystemTrayMenu taskbarForm.Activated += TasbkarItemActivated; taskbarForm.Resize += TaskbarForm_Resize; taskbarForm.FormClosed += TaskbarForm_FormClosed; + taskbarForm.Deactivate += TaskbarForm_Deactivate; DllImports.NativeMethods.User32ShowInactiveTopmost(taskbarForm); } @@ -49,16 +50,20 @@ namespace SystemTrayMenu private void TaskbarForm_Resize(object sender, EventArgs e) { - if (taskbarForm.WindowState == FormWindowState.Minimized) - { - taskbarForm.WindowState = FormWindowState.Normal; - } + taskbarForm.WindowState = FormWindowState.Normal; } internal void TasbkarItemActivated(object sender, EventArgs e) { + taskbarForm.WindowState = FormWindowState.Normal; + taskbarForm.Activate(); + taskbarForm.Focus(); menus.SwitchOpenCloseByTaskbarItem(); } + private void TaskbarForm_Deactivate(object sender, EventArgs e) + { + taskbarForm.WindowState = FormWindowState.Normal; + } public void Dispose() { diff --git a/UserInterface/TaskbarForm.cs b/UserInterface/TaskbarForm.cs index 39c7c06..ade04d1 100644 --- a/UserInterface/TaskbarForm.cs +++ b/UserInterface/TaskbarForm.cs @@ -20,10 +20,7 @@ namespace SystemTrayMenu.UserInterface { Screen screen = Screen.PrimaryScreen; Location = new Point(screen.Bounds.Right - Size.Width, - //we could show behind taskbar? - //screen.Bounds.Bottom- Size.Height); - //but at the moment we dont want to see this - screen.Bounds.Bottom + 80); // - Size.Height); + screen.Bounds.Bottom + 80); //Hide below taskbar } } }