Release 1.7.5

Closes #120

Configuration/UserConfig.cs

@@ -14,7 +14,7 @@ namespace TweetDck.Configuration{
     sealed class UserConfig{
         private static readonly IFormatter Formatter = new BinaryFormatter();
 
-        private const int CurrentFileVersion = 7;
+        private const int CurrentFileVersion = 9;
 
         // START OF CONFIGURATION
 
@@ -34,62 +34,57 @@ namespace TweetDck.Configuration{
 
         public bool EnableSpellCheck { get; set; }
         public bool ExpandLinksOnHover { get; set; }
+        public bool SwitchAccountSelectors { get; set; }
         public bool EnableTrayHighlight { get; set; }
 
         public bool EnableUpdateCheck { get; set; }
         public string DismissedUpdate { get; set; }
 
-        public PluginConfig Plugins { get; private set; }
+        [Obsolete] public PluginConfig Plugins { get; set; } // TODO remove eventually
         public WindowState PluginsWindow { get; set; }
 
         public string CustomCefArgs { get; set; }
         public string CustomBrowserCSS { get; set; }
         public string CustomNotificationCSS { get; set; }
 
-        public bool IsCustomNotificationPositionSet{
-            get{
-                return CustomNotificationPosition != ControlExtensions.InvisibleLocation;
-            }
+        public bool IsCustomNotificationPositionSet => CustomNotificationPosition != ControlExtensions.InvisibleLocation;
+
+        public string NotificationSoundPath{
+            get => string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
+            set => notificationSoundPath = value;
         }
 
         public bool MuteNotifications{
-            get{
-                return muteNotifications;
-            }
+            get => muteNotifications;
 
             set{
-                if (muteNotifications == value)return;
-
+                if (muteNotifications != value){
                     muteNotifications = value;
-
-                if (MuteToggled != null){
-                    MuteToggled(this, new EventArgs());
+                    MuteToggled?.Invoke(this, new EventArgs());
                 }
             }
         }
 
-        public string NotificationSoundPath{
-            get{
-                return string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
-            }
+        public int ZoomLevel{
+            get => zoomLevel;
 
             set{
-                notificationSoundPath = value;
+                if (zoomLevel != value){
+                    zoomLevel = value;
+                    ZoomLevelChanged?.Invoke(this, new EventArgs());
                 }
             }
+        }
+
+        public double ZoomMultiplier => zoomLevel/100.0;
 
         public TrayIcon.Behavior TrayBehavior{
-            get{
-                return trayBehavior;
-            }
+            get => trayBehavior;
 
             set{
-                if (trayBehavior == value)return;
-
+                if (trayBehavior != value){
                     trayBehavior = value;
-
-                if (TrayBehaviorChanged != null){
-                    TrayBehaviorChanged(this, new EventArgs());
+                    TrayBehaviorChanged?.Invoke(this, new EventArgs());
                 }
             }
         }
@@ -99,6 +94,9 @@ namespace TweetDck.Configuration{
         [field:NonSerialized]
         public event EventHandler MuteToggled;
         
+        [field:NonSerialized]
+        public event EventHandler ZoomLevelChanged;
+        
         [field:NonSerialized]
         public event EventHandler TrayBehaviorChanged;
 
@@ -107,6 +105,7 @@ namespace TweetDck.Configuration{
 
         private int fileVersion;
         private bool muteNotifications;
+        private int zoomLevel;
         private string notificationSoundPath;
         private TrayIcon.Behavior trayBehavior;
 
@@ -114,6 +113,7 @@ namespace TweetDck.Configuration{
             this.file = file;
 
             BrowserWindow = new WindowState();
+            ZoomLevel = 100;
             DisplayNotificationTimer = true;
             NotificationNonIntrusiveMode = true;
             NotificationPosition = TweetNotification.Position.TopRight;
@@ -122,12 +122,9 @@ namespace TweetDck.Configuration{
             NotificationDurationValue = 25;
             EnableUpdateCheck = true;
             ExpandLinksOnHover = true;
+            SwitchAccountSelectors = true;
             EnableTrayHighlight = true;
-            Plugins = new PluginConfig();
             PluginsWindow = new WindowState();
-
-            Plugins.DisableOfficialFromConfig("clear-columns");
-            Plugins.DisableOfficialFromConfig("reply-account");
         }
 
         private void UpgradeFile(){
@@ -149,7 +146,6 @@ namespace TweetDck.Configuration{
 
             if (fileVersion == 2){
                 BrowserWindow = new WindowState();
-                Plugins = new PluginConfig();
                 PluginsWindow = new WindowState();
                 ++fileVersion;
             }
@@ -161,8 +157,6 @@ namespace TweetDck.Configuration{
             }
 
             if (fileVersion == 4){
-                Plugins.DisableOfficialFromConfig("clear-columns");
-                Plugins.DisableOfficialFromConfig("reply-account");
                 ++fileVersion;
             }
 
@@ -175,6 +169,16 @@ namespace TweetDck.Configuration{
                 ++fileVersion;
             }
 
+            if (fileVersion == 7){
+                ZoomLevel = 100;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 8){
+                SwitchAccountSelectors = true;
+                ++fileVersion;
+            }
+
             // update the version
             fileVersion = CurrentFileVersion;
             Save();
@@ -216,10 +220,7 @@ namespace TweetDck.Configuration{
                         }
                     }
 
-                    if (config != null){
-                        config.UpgradeFile();
-                    }
-
+                    config?.UpgradeFile();
                     break;
                 }catch(FileNotFoundException){
                 }catch(DirectoryNotFoundException){

Core/Bridge/PropertyBridge.cs

@@ -9,7 +9,8 @@ namespace TweetDck.Core.Bridge{
             MuteNotifications = 2,
             HasCustomNotificationSound = 4,
             SkipOnLinkClick = 8,
-            AllBrowser = ExpandLinksOnHover | MuteNotifications | HasCustomNotificationSound,
+            SwitchAccountSelectors = 16,
+            AllBrowser = ExpandLinksOnHover | SwitchAccountSelectors | MuteNotifications | HasCustomNotificationSound,
             AllNotification = ExpandLinksOnHover | SkipOnLinkClick
         }
 
@@ -21,6 +22,10 @@ namespace TweetDck.Core.Bridge{
                 build.Append("c.expandLinksOnHover=").Append(Program.UserConfig.ExpandLinksOnHover ? "true;" : "false;");
             }
 
+            if (properties.HasFlag(Properties.SwitchAccountSelectors)){
+                build.Append("c.switchAccountSelectors=").Append(Program.UserConfig.SwitchAccountSelectors ? "true;" : "false;");
+            }
+
             if (properties.HasFlag(Properties.MuteNotifications)){
                 build.Append("c.muteNotifications=").Append(Program.UserConfig.MuteNotifications ? "true;" : "false;");
             }

Core/Bridge/TweetDeckBridge.cs

@@ -83,6 +83,10 @@ namespace TweetDck.Core.Bridge{
             form.InvokeAsyncSafe(WindowsUtils.ClipboardStripHtmlStyles);
         }
 
+        public int GetIdleSeconds(){
+            return NativeMethods.GetIdleSeconds();
+        }
+
         public void OpenBrowser(string url){
             BrowserUtils.OpenExternalBrowser(url);
         }

Core/Controls/ControlExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 using TweetDck.Core.Utils;
 
@@ -20,6 +21,10 @@ namespace TweetDck.Core.Controls{
             control.BeginInvoke(func);
         }
 
+        public static bool IsFullyOutsideView(this Form form){
+            return !Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(form.Bounds));
+        }
+
         public static void MoveToCenter(this Form targetForm, Form parentForm){
             targetForm.Location = new Point(parentForm.Location.X+parentForm.Width/2-targetForm.Width/2, parentForm.Location.Y+parentForm.Height/2-targetForm.Height/2);
         }

Core/Controls/FlatButton.cs

@@ -3,11 +3,7 @@ using System.Windows.Forms;
 
 namespace TweetDck.Core.Controls{
     class FlatButton : Button{
-        protected override bool ShowFocusCues{
-            get{
-                return false;
-            }
-        }
+        protected override bool ShowFocusCues => false;
 
         public FlatButton(){
             GotFocus += FlatButton_GotFocus;

Core/Controls/TabPanel.cs

@@ -6,21 +6,11 @@ using System.Windows.Forms;
 
 namespace TweetDck.Core.Controls{
     sealed partial class TabPanel : UserControl{
-        public IEnumerable<TabButton> Buttons{
-            get{
-                return panelButtons.Controls.Cast<TabButton>();
-            }
-        }
+        public Panel Content => panelContent;
+        public IEnumerable<TabButton> Buttons => panelButtons.Controls.Cast<TabButton>();
 
         public TabButton ActiveButton { get; private set; }
 
-        // ReSharper disable once ConvertToAutoPropertyWithPrivateSetter
-        public Panel Content{
-            get{
-                return panelContent;
-            }
-        }
-
         private int btnWidth;
 
         public TabPanel(){

Core/FormBrowser.cs

@@ -1,33 +1,29 @@
-using System;
-using System.Windows.Forms;
-using CefSharp;
+using CefSharp;
 using CefSharp.WinForms;
-using TweetDck.Configuration;
-using TweetDck.Core.Handling;
-using TweetDck.Core.Other;
-using TweetDck.Resources;
-using TweetDck.Core.Controls;
+using System;
+using System.Diagnostics;
 using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+using TweetDck.Configuration;
+using TweetDck.Core.Bridge;
+using TweetDck.Core.Controls;
+using TweetDck.Core.Handling;
+using TweetDck.Core.Notification;
+using TweetDck.Core.Notification.Screenshot;
+using TweetDck.Core.Notification.Sound;
+using TweetDck.Core.Other;
 using TweetDck.Core.Utils;
-using TweetDck.Updates;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
-using TweetDck.Core.Bridge;
-using TweetDck.Core.Notification;
-using TweetDck.Core.Notification.Screenshot;
+using TweetDck.Resources;
+using TweetDck.Updates;
 using TweetDck.Updates.Events;
-using System.Diagnostics;
-using System.Linq;
-using TweetDck.Core.Notification.Sound;
 
 namespace TweetDck.Core{
     sealed partial class FormBrowser : Form{
-        private static UserConfig Config{
-            get{
-                return Program.UserConfig;
-            }
-        }
+        private static UserConfig Config => Program.UserConfig;
 
         public string UpdateInstallerPath { get; private set; }
 
@@ -93,13 +89,8 @@ namespace TweetDck.Core{
                 browser.Dispose();
                 contextMenu.Dispose();
 
-                if (notificationScreenshotManager != null){
-                    notificationScreenshotManager.Dispose();
-                }
-
-                if (soundNotification != null){
-                    soundNotification.Dispose();
-                }
+                notificationScreenshotManager?.Dispose();
+                soundNotification?.Dispose();
             };
 
             this.trayIcon.ClickRestore += trayIcon_ClickRestore;
@@ -109,6 +100,7 @@ namespace TweetDck.Core{
             UpdateTrayIcon();
 
             Config.MuteToggled += Config_MuteToggled;
+            Config.ZoomLevelChanged += Config_ZoomLevelChanged;
 
             this.updates = new UpdateHandler(browser, this, updaterSettings);
             this.updates.UpdateAccepted += updates_UpdateAccepted;
@@ -171,10 +163,16 @@ namespace TweetDck.Core{
         }
 
         private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            if (e.Frame.IsMain && BrowserUtils.IsTwitterWebsite(e.Frame)){
+            if (e.Frame.IsMain){
+                if (Config.ZoomLevel != 100){
+                    BrowserUtils.SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+                }
+
+                if (BrowserUtils.IsTwitterWebsite(e.Frame)){
                     ScriptLoader.ExecuteFile(e.Frame, "twitter.js");
                 }
             }
+        }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
@@ -253,6 +251,10 @@ namespace TweetDck.Core{
             UpdateProperties(PropertyBridge.Properties.MuteNotifications);
         }
 
+        private void Config_ZoomLevelChanged(object sender, EventArgs e){
+            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+        }
+
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
             UpdateTrayIcon();
         }
@@ -274,10 +276,15 @@ namespace TweetDck.Core{
 
         private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
             browser.ExecuteScriptAsync("window.TDPF_setPluginState", e.Plugin, e.IsEnabled);
-            Config.Save();
         }
 
         private void updates_UpdateAccepted(object sender, UpdateAcceptedEventArgs e){
+            foreach(Form form in Application.OpenForms.Cast<Form>().Reverse()){
+                if (form is FormSettings || form is FormPlugins || form is FormAbout){
+                    form.Close();
+                }
+            }
+
             Hide();
 
             FormUpdateDownload downloadForm = new FormUpdateDownload(e.UpdateInfo);
@@ -329,7 +336,7 @@ namespace TweetDck.Core{
                 return;
             }
 
-            if (isBrowserReady && m.Msg == 0x210 && (m.WParam.ToInt32() & 0xFFFF) == 0x020B){ // WM_PARENTNOTIFY, WM_XBUTTONDOWN
+            if (isBrowserReady && m.Msg == NativeMethods.WM_PARENTNOTIFY && (m.WParam.ToInt32() & 0xFFFF) == NativeMethods.WM_XBUTTONDOWN){
                 browser.ExecuteScriptAsync("TDGF_onMouseClickExtra", (m.WParam.ToInt32() >> 16) & 0xFFFF);
                 return;
             }
@@ -354,7 +361,7 @@ namespace TweetDck.Core{
         // javascript calls
 
         public void ReinjectCustomCSS(string css){
-            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css == null ? string.Empty : css.Replace(Environment.NewLine, " "));
+            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
         }
 
         public void UpdateProperties(PropertyBridge.Properties properties){
@@ -391,7 +398,7 @@ namespace TweetDck.Core{
                         trayIcon.HasNotifications = false;
                     }
 
-                    UpdateProperties(PropertyBridge.Properties.ExpandLinksOnHover | PropertyBridge.Properties.HasCustomNotificationSound);
+                    UpdateProperties(PropertyBridge.Properties.ExpandLinksOnHover | PropertyBridge.Properties.SwitchAccountSelectors | PropertyBridge.Properties.HasCustomNotificationSound);
                     form.Dispose();
                 };
 

Core/Handling/BrowserProcessHandler.cs

@@ -5,8 +5,7 @@ namespace TweetDck.Core.Handling{
     class BrowserProcessHandler : IBrowserProcessHandler{
         void IBrowserProcessHandler.OnContextInitialized(){
             using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
-                string err;
-                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out err);
+                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);
             }
         }
 

Core/Handling/ContextMenuBrowser.cs

@@ -1,5 +1,5 @@
-using System.Windows.Forms;
-using CefSharp;
+using CefSharp;
+using System.Windows.Forms;
 using TweetDck.Core.Bridge;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Utils;

Core/Handling/ResourceHandlerNotification.cs

@@ -9,10 +9,7 @@ namespace TweetDck.Core.Handling{
         private MemoryStream dataIn;
 
         public void SetHTML(string html){
-            if (dataIn != null){
-                dataIn.Dispose();
-            }
-
+            dataIn?.Dispose();
             dataIn = ResourceHandler.GetMemoryStream(html, Encoding.UTF8);
         }
 
@@ -35,7 +32,7 @@ namespace TweetDck.Core.Handling{
             response.StatusCode = 200;
             response.StatusText = "OK";
             response.ResponseHeaders = headers;
-            responseLength = dataIn != null ? dataIn.Length : -1;
+            responseLength = dataIn?.Length ?? -1;
         }
 
         bool IResourceHandler.ReadResponse(Stream dataOut, out int bytesRead, ICallback callback){

Core/Notification/FormNotificationBase.cs

@@ -1,8 +1,8 @@
-using System;
+using CefSharp;
+using CefSharp.WinForms;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using CefSharp;
-using CefSharp.WinForms;
 using TweetDck.Configuration;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Handling;
@@ -50,23 +50,22 @@ namespace TweetDck.Core.Notification{
             }
         }
 
-        public bool IsNotificationVisible{
-            get{
-                return Location != ControlExtensions.InvisibleLocation;
-            }
-        }
+        public bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
 
         public new Point Location{
-            get{
-                return base.Location;
-            }
+            get => base.Location;
 
             set{
                 Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
+                
+                if (WindowsUtils.ShouldAvoidToolWindow){
+                    FormBorderStyle = Visible ? FormBorderStyle.FixedSingle : FormBorderStyle.FixedToolWindow; // workaround for alt+tab
+                }
             }
         }
         
         public Func<bool> CanMoveWindow = () => true;
+        protected override bool ShowWithoutActivation => true;
 
         protected readonly Form owner;
         protected readonly ChromiumWebBrowser browser;
@@ -76,17 +75,7 @@ namespace TweetDck.Core.Notification{
         private string currentColumn;
         private int pauseCounter;
 
-        public bool IsPaused{
-            get{
-                return pauseCounter > 0;
-            }
-        }
-
-        protected override bool ShowWithoutActivation{
-            get{
-                return true;
-            }
-        }
+        public bool IsPaused => pauseCounter > 0;
 
         public bool FreezeTimer { get; set; }
         public bool ContextMenuOpen { get; set; }
@@ -143,8 +132,8 @@ namespace TweetDck.Core.Notification{
         }
 
         private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
-            if (e.IsBrowserInitialized && Initialized != null){
-                Initialized(this, new EventArgs());
+            if (e.IsBrowserInitialized){
+                Initialized?.Invoke(this, new EventArgs());
             }
         }
 
@@ -188,16 +177,7 @@ namespace TweetDck.Core.Notification{
         }
 
         protected virtual void SetNotificationSize(int width, int height){
-            browser.ClientSize = ClientSize = new Size(width, height);
-        }
-
-        protected void MoveToVisibleLocation(){
-            bool needsReactivating = Location == ControlExtensions.InvisibleLocation;
-            Location = PrimaryLocation;
-
-            if (needsReactivating){
-                NativeMethods.SetFormPos(this, NativeMethods.HWND_TOPMOST, NativeMethods.SWP_NOACTIVATE);
-            }
+            browser.ClientSize = ClientSize = new Size((int)Math.Round(width*Program.UserConfig.ZoomMultiplier), (int)Math.Round(height*Program.UserConfig.ZoomMultiplier));
         }
 
         protected virtual void OnNotificationReady(){
@@ -208,6 +188,15 @@ namespace TweetDck.Core.Notification{
             Text = string.IsNullOrEmpty(currentColumn) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+currentColumn;
         }
 
+        public void MoveToVisibleLocation(){
+            bool needsReactivating = Location == ControlExtensions.InvisibleLocation;
+            Location = PrimaryLocation;
+
+            if (needsReactivating){
+                NativeMethods.SetFormPos(this, NativeMethods.HWND_TOPMOST, NativeMethods.SWP_NOACTIVATE);
+            }
+        }
+
         public void DisplayTooltip(string text){
             if (string.IsNullOrEmpty(text)){
                 toolTip.Hide(this);

Core/Notification/FormNotificationMain.cs

@@ -1,7 +1,7 @@
-using System;
+using CefSharp;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using CefSharp;
 using TweetDck.Core.Bridge;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Utils;
@@ -26,14 +26,16 @@ namespace TweetDck.Core.Notification{
         private static int BaseClientWidth{
             get{
                 int level = TweetNotification.FontSizeLevel;
-                return level == 0 ? 284 : (int)Math.Round(284.0*(1.0+0.05*level));
+                int width = level == 0 ? 284 : (int)Math.Round(284.0*(1.0+0.05*level));
+                return (int)Math.Round(width*Program.UserConfig.ZoomMultiplier);
             }
         }
 
         private static int BaseClientHeight{
             get{
                 int level = TweetNotification.FontSizeLevel;
-                return level == 0 ? 118 : (int)Math.Round(118.0*(1.0+0.075*level));
+                int height = level == 0 ? 118 : (int)Math.Round(118.0*(1.0+0.075*level));
+                return (int)Math.Round(height*Program.UserConfig.ZoomMultiplier);
             }
         }
         
@@ -44,6 +46,7 @@ namespace TweetDck.Core.Notification{
         
         private readonly NativeMethods.HookProc mouseHookDelegate;
         private IntPtr mouseHook;
+        private bool blockXButtonUp;
 
         private bool? prevDisplayTimer;
         private int? prevFontSize;
@@ -77,7 +80,7 @@ namespace TweetDck.Core.Notification{
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
             mouseHookDelegate = MouseHookProc;
-            Disposed += (sender, args) => StopMouseHook();
+            Disposed += (sender, args) => StopMouseHook(true);
         }
 
         // mouse wheel hook
@@ -88,18 +91,45 @@ namespace TweetDck.Core.Notification{
             }
         }
 
-        private void StopMouseHook(){
-            if (mouseHook != IntPtr.Zero){
+        private void StopMouseHook(bool force){
+            if (mouseHook != IntPtr.Zero && (force || !blockXButtonUp)){
                 NativeMethods.UnhookWindowsHookEx(mouseHook);
                 mouseHook = IntPtr.Zero;
+                blockXButtonUp = false;
             }
         }
 
         private IntPtr MouseHookProc(int nCode, IntPtr wParam, IntPtr lParam){
-            if (nCode == 0 && wParam.ToInt32() == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position)) && !ContainsFocus && !owner.ContainsFocus){
-                browser.SendMouseWheelEvent(0, 0, 0, NativeMethods.GetHookWheelDelta(lParam), CefEventFlags.None);
+            if (nCode == 0){
+                int eventType = wParam.ToInt32();
+
+                if (eventType == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position)) && !ContainsFocus && !owner.ContainsFocus){
+                    browser.SendMouseWheelEvent(0, 0, 0, NativeMethods.GetMouseHookData(lParam), CefEventFlags.None);
                     return NativeMethods.HOOK_HANDLED;
                 }
+                else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
+                    int extraButton = NativeMethods.GetMouseHookData(lParam);
+
+                    if (extraButton == 2){ // forward button
+                        this.InvokeAsyncSafe(FinishCurrentNotification);
+                    }
+                    else if (extraButton == 1){ // back button
+                        this.InvokeAsyncSafe(Close);
+                    }
+                    
+                    blockXButtonUp = true;
+                    return NativeMethods.HOOK_HANDLED;
+                }
+                else if (eventType == NativeMethods.WM_XBUTTONUP && blockXButtonUp){
+                    blockXButtonUp = false;
+
+                    if (!Visible){
+                        StopMouseHook(false);
+                    }
+
+                    return NativeMethods.HOOK_HANDLED;
+                }
+            }
 
             return NativeMethods.CallNextHookEx(mouseHook, nCode, wParam, lParam);
         }
@@ -177,7 +207,7 @@ namespace TweetDck.Core.Notification{
             timerProgress.Stop();
             totalTime = 0;
 
-            StopMouseHook();
+            StopMouseHook(false);
         }
 
         public override void FinishCurrentNotification(){
@@ -188,7 +218,7 @@ namespace TweetDck.Core.Notification{
             if (!IsPaused){
                 pausedDuringNotification = IsNotificationVisible;
                 timerProgress.Stop();
-                StopMouseHook();
+                StopMouseHook(true);
             }
 
             base.PauseNotification();

Core/Notification/FormNotificationTweet.Designer.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace TweetDck.Core.Notification {
     partial class FormNotificationTweet {
         /// <summary>

Core/Notification/FormNotificationTweet.cs

@@ -10,11 +10,7 @@ namespace TweetDck.Core.Notification{
         private const int NonIntrusiveIdleLimit = 30;
         private const int TrimMinimum = 32;
 
-        private bool IsCursorOverNotificationArea{
-            get{
-                return new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
-            }
-        }
+        private bool IsCursorOverNotificationArea => new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
 
         private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
         private bool needsTrim;

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Windows.Forms;
-using TweetDck.Core.Bridge;
-using TweetDck.Resources;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Windows.Forms;
+using TweetDck.Core.Bridge;
 using TweetDck.Core.Utils;
+using TweetDck.Resources;
 
 namespace TweetDck.Core.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -16,7 +16,7 @@ namespace TweetDck.Core.Notification.Screenshot{
         public TweetScreenshotManager(Form owner){
             this.owner = owner;
 
-            this.timeout = new Timer{ Interval = 5000 };
+            this.timeout = new Timer{ Interval = 8000 };
             this.timeout.Tick += timeout_Tick;
 
             this.disposer = new Timer{ Interval = 1 };
@@ -61,6 +61,7 @@ namespace TweetDck.Core.Notification.Screenshot{
             screenshot.Location = ControlExtensions.InvisibleLocation;
             disposer.Start();
             #else
+            screenshot.MoveToVisibleLocation();
             screenshot.FormClosed += (sender, args) => disposer.Start();
             #endif
         }
@@ -68,10 +69,7 @@ namespace TweetDck.Core.Notification.Screenshot{
         public void Dispose(){
             timeout.Dispose();
             disposer.Dispose();
-
-            if (screenshot != null){
-                screenshot.Dispose();
-            }
+            screenshot?.Dispose();
         }
     }
 }

Core/Notification/Sound/PlaybackErrorEventArgs.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace TweetDck.Core.Notification.Sound{
     sealed class PlaybackErrorEventArgs : EventArgs{
-        public string Message { get; private set; }
+        public string Message { get; }
         public bool Ignore { get; set; }
 
         public PlaybackErrorEventArgs(string message){

Core/Notification/Sound/SoundPlayerImplFallback.cs

@@ -4,11 +4,7 @@ using System.Media;
 
 namespace TweetDck.Core.Notification.Sound{
     sealed class SoundPlayerImplFallback : ISoundNotificationPlayer{
-        string ISoundNotificationPlayer.SupportedFormats{
-            get{
-                return "*.wav";
-            }
-        }
+        string ISoundNotificationPlayer.SupportedFormats => "*.wav";
 
         public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
 

Core/Notification/Sound/SoundPlayerImplWMP.cs

@@ -5,11 +5,7 @@ using WMPLib;
 
 namespace TweetDck.Core.Notification.Sound{
     sealed class SoundPlayerImplWMP : ISoundNotificationPlayer{
-        string ISoundNotificationPlayer.SupportedFormats{
-            get{
-                return "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au";
-            }
-        }
+        string ISoundNotificationPlayer.SupportedFormats => "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au";
 
         public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
 
@@ -36,6 +32,7 @@ namespace TweetDck.Core.Notification.Sound{
         void ISoundNotificationPlayer.Play(string file){
             wasTryingToPlay = true;
 
+            try{
                 if (player.URL != file){
                     player.close();
                     player.URL = file;
@@ -46,10 +43,17 @@ namespace TweetDck.Core.Notification.Sound{
                 }
             
                 player.controls.play();
+            }catch(Exception e){
+                OnNotificationSoundError("An error occurred in Windows Media Player: "+e.Message);
+            }
         }
 
         void ISoundNotificationPlayer.Stop(){
+            try{
                 player.controls.stop();
+            }catch{
+                // ignore
+            }
         }
 
         void IDisposable.Dispose(){

Core/Notification/TweetNotification.cs

@@ -8,7 +8,7 @@ namespace TweetDck.Core.Notification{
         private static string HeadTag { get; set; }
 
         private const string DefaultFontSizeClass = "medium";
-        private const string DefaultHeadTag = @"<meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'>";
+        private const string DefaultHeadTag = @"<meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
         private const string CustomCSS = @"body:before{content:none}body{overflow-y:auto}.scroll-styled-v::-webkit-scrollbar{width:7px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}.scroll-styled-v::-webkit-scrollbar-track{border-left:0}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}";
 
         public static int FontSizeLevel{
@@ -51,23 +51,9 @@ namespace TweetDck.Core.Notification{
             TopLeft, TopRight, BottomLeft, BottomRight, Custom
         }
 
-        public string Column{
-            get{
-                return column;
-            }
-        }
-
-        public string TweetUrl{
-            get{
-                return tweetUrl;
-            }
-        }
-
-        public string QuoteUrl{
-            get{
-                return quoteUrl;
-            }
-        }
+        public string Column => column;
+        public string TweetUrl => tweetUrl;
+        public string QuoteUrl => quoteUrl;
 
         private readonly string column;
         private readonly string html;

Core/Other/FormAbout.Designer.cs

@@ -1,5 +1,3 @@
-using TweetDck.Core.Controls;
-
 namespace TweetDck.Core.Other {
     sealed partial class FormAbout {
         /// <summary>

Core/Other/FormMessage.cs

@@ -6,20 +6,11 @@ namespace TweetDck.Core.Other{
     sealed partial class FormMessage : Form{
         public Button ClickedButton { get; private set; }
 
-        public int ActionPanelY{
-            get{
-                return panelActions.Location.Y;
-            }
-        }
+        public int ActionPanelY => panelActions.Location.Y;
 
         private int ClientWidth{
-            get{
-                return ClientSize.Width;
-            }
-
-            set{
-                ClientSize = new Size(value, ClientSize.Height);
-            }
+            get => ClientSize.Width;
+            set => ClientSize = new Size(value, ClientSize.Height);
         }
 
         private readonly Icon icon;

Core/Other/FormSettings.cs

@@ -31,9 +31,7 @@ namespace TweetDck.Core.Other{
         }
 
         private void SelectTab<T>(Func<T> constructor) where T : BaseTabSettings{
-            BaseTabSettings control;
-
-            if (tabs.TryGetValue(typeof(T), out control)){
+            if (tabs.TryGetValue(typeof(T), out BaseTabSettings control)){
                 tabPanel.ReplaceContent(control);
             }
             else{

Core/Other/Settings/BaseTabSettings.cs

@@ -3,11 +3,7 @@ using TweetDck.Configuration;
 
 namespace TweetDck.Core.Other.Settings{
     class BaseTabSettings : UserControl{
-        protected static UserConfig Config{
-            get{
-                return Program.UserConfig;
-            }
-        }
+        protected static UserConfig Config => Program.UserConfig;
 
         public BaseTabSettings(){
             Padding = new Padding(6);

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -5,17 +5,8 @@ using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCSS : Form{
-        public string BrowserCSS{
-            get{
-                return textBoxBrowserCSS.Text;
-            }
-        }
-        
-        public string NotificationCSS{
-            get{
-                return textBoxNotificationCSS.Text;
-            }
-        }
+        public string BrowserCSS => textBoxBrowserCSS.Text;
+        public string NotificationCSS => textBoxNotificationCSS.Text;
 
         private readonly Action<string> reinjectBrowserCSS;
 

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -5,11 +5,7 @@ using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCefArgs : Form{
-        public string CefArgs{
-            get{
-                return textBoxArgs.Text;
-            }
-        }
+        public string CefArgs => textBoxArgs.Text;
 
         public DialogSettingsCefArgs(){
             InitializeComponent();

Core/Other/Settings/Dialogs/DialogSettingsExport.cs

@@ -13,9 +13,7 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
         }
 
         public ExportFileFlags Flags{
-            get{
-                return selectedFlags;
-            }
+            get => selectedFlags;
 
             set{
                 // this will call events and SetFlag, which also updates the UI

Core/Other/Settings/Export/CombinedFileStream.cs

@@ -92,7 +92,7 @@ namespace TweetDck.Core.Other.Settings.Export{
         }
 
         public class Entry{
-            public string Identifier { get; private set; }
+            public string Identifier { get; }
 
             public string KeyName{
                 get{

Core/Other/Settings/Export/ExportManager.cs

@@ -31,6 +31,8 @@ namespace TweetDck.Core.Other.Settings.Export{
                     }
 
                     if (flags.HasFlag(ExportFileFlags.PluginData)){
+                        stream.WriteFile("plugin.config", Program.PluginConfigFilePath);
+
                         foreach(Plugin plugin in plugins.Plugins){
                             foreach(PathInfo path in EnumerateFilesRelative(plugin.GetPluginFolder(PluginFolder.Data))){
                                 try{
@@ -69,6 +71,7 @@ namespace TweetDck.Core.Other.Settings.Export{
                                 flags |= ExportFileFlags.Config;
                                 break;
 
+                            case "plugin.config":
                             case "plugin.data":
                                 flags |= ExportFileFlags.PluginData;
                                 break;
@@ -103,6 +106,13 @@ namespace TweetDck.Core.Other.Settings.Export{
 
                                 break;
 
+                            case "plugin.config":
+                                if (flags.HasFlag(ExportFileFlags.PluginData)){
+                                    entry.WriteToFile(Program.PluginConfigFilePath);
+                                }
+
+                                break;
+
                             case "plugin.data":
                                 if (flags.HasFlag(ExportFileFlags.PluginData)){
                                     string[] value = entry.KeyValue;

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -180,7 +180,7 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void btnReset_Click(object sender, EventArgs e){
-            if (MessageBox.Show("This will reset all of your settings, including disabled plugins. Do you want to proceed?", "Reset "+Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+            if (MessageBox.Show("This will reset all of your program settings. Plugins will not be affected. Do you want to proceed?", "Reset "+Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
                 Program.ResetConfig();
                 ((FormSettings)ParentForm).ReloadUI();
             }

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -31,12 +31,18 @@
             this.checkSpellCheck = new System.Windows.Forms.CheckBox();
             this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
             this.btnCheckUpdates = new System.Windows.Forms.Button();
+            this.labelZoomValue = new System.Windows.Forms.Label();
+            this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
             this.groupTray = new System.Windows.Forms.GroupBox();
             this.labelTrayIcon = new System.Windows.Forms.Label();
             this.groupInterface = new System.Windows.Forms.GroupBox();
+            this.trackBarZoom = new System.Windows.Forms.TrackBar();
+            this.labelZoom = new System.Windows.Forms.Label();
             this.groupUpdates = new System.Windows.Forms.GroupBox();
+            this.zoomUpdateTimer = new System.Windows.Forms.Timer(this.components);
             this.groupTray.SuspendLayout();
             this.groupInterface.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
             this.groupUpdates.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -79,11 +85,11 @@
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Location = new System.Drawing.Point(9, 44);
+            this.checkSpellCheck.Location = new System.Drawing.Point(9, 67);
             this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSpellCheck.Name = "checkSpellCheck";
             this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
-            this.checkSpellCheck.TabIndex = 1;
+            this.checkSpellCheck.TabIndex = 2;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
             this.checkSpellCheck.UseVisualStyleBackColor = true;
@@ -111,12 +117,38 @@
             this.toolTip.SetToolTip(this.btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
+            // labelZoomValue
+            // 
+            this.labelZoomValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelZoomValue.Location = new System.Drawing.Point(139, 116);
+            this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelZoomValue.Name = "labelZoomValue";
+            this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
+            this.labelZoomValue.TabIndex = 5;
+            this.labelZoomValue.Text = "100%";
+            this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.toolTip.SetToolTip(this.labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
+            // 
+            // checkSwitchAccountSelectors
+            // 
+            this.checkSwitchAccountSelectors.AutoSize = true;
+            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(9, 44);
+            this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
+            this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
+            this.checkSwitchAccountSelectors.TabIndex = 1;
+            this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
+            this.toolTip.SetToolTip(this.checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect mult" +
+        "iple accounts, instead of TweetDeck\'s default behavior.");
+            this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
+            // 
             // groupTray
             // 
             this.groupTray.Controls.Add(this.checkTrayHighlight);
             this.groupTray.Controls.Add(this.labelTrayIcon);
             this.groupTray.Controls.Add(this.comboBoxTrayType);
-            this.groupTray.Location = new System.Drawing.Point(9, 82);
+            this.groupTray.Location = new System.Drawing.Point(9, 168);
             this.groupTray.Name = "groupTray";
             this.groupTray.Size = new System.Drawing.Size(183, 93);
             this.groupTray.TabIndex = 1;
@@ -135,15 +167,47 @@
             // 
             // groupInterface
             // 
+            this.groupInterface.Controls.Add(this.checkSwitchAccountSelectors);
+            this.groupInterface.Controls.Add(this.labelZoomValue);
+            this.groupInterface.Controls.Add(this.trackBarZoom);
+            this.groupInterface.Controls.Add(this.labelZoom);
             this.groupInterface.Controls.Add(this.checkSpellCheck);
             this.groupInterface.Controls.Add(this.checkExpandLinks);
             this.groupInterface.Location = new System.Drawing.Point(9, 9);
             this.groupInterface.Name = "groupInterface";
-            this.groupInterface.Size = new System.Drawing.Size(183, 67);
+            this.groupInterface.Size = new System.Drawing.Size(183, 153);
             this.groupInterface.TabIndex = 0;
             this.groupInterface.TabStop = false;
             this.groupInterface.Text = "User Interface";
             // 
+            // trackBarZoom
+            // 
+            this.trackBarZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.trackBarZoom.AutoSize = false;
+            this.trackBarZoom.LargeChange = 25;
+            this.trackBarZoom.Location = new System.Drawing.Point(6, 115);
+            this.trackBarZoom.Maximum = 200;
+            this.trackBarZoom.Minimum = 50;
+            this.trackBarZoom.Name = "trackBarZoom";
+            this.trackBarZoom.Size = new System.Drawing.Size(141, 30);
+            this.trackBarZoom.SmallChange = 5;
+            this.trackBarZoom.TabIndex = 4;
+            this.trackBarZoom.TickFrequency = 25;
+            this.trackBarZoom.Value = 100;
+            // 
+            // labelZoom
+            // 
+            this.labelZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelZoom.AutoSize = true;
+            this.labelZoom.Location = new System.Drawing.Point(5, 99);
+            this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelZoom.Name = "labelZoom";
+            this.labelZoom.Size = new System.Drawing.Size(34, 13);
+            this.labelZoom.TabIndex = 3;
+            this.labelZoom.Text = "Zoom";
+            // 
             // groupUpdates
             // 
             this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
@@ -155,6 +219,11 @@
             this.groupUpdates.TabStop = false;
             this.groupUpdates.Text = "Updates";
             // 
+            // zoomUpdateTimer
+            // 
+            this.zoomUpdateTimer.Interval = 250;
+            this.zoomUpdateTimer.Tick += new System.EventHandler(this.zoomUpdateTimer_Tick);
+            // 
             // TabSettingsGeneral
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -168,6 +237,7 @@
             this.groupTray.PerformLayout();
             this.groupInterface.ResumeLayout(false);
             this.groupInterface.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.groupUpdates.ResumeLayout(false);
             this.groupUpdates.PerformLayout();
             this.ResumeLayout(false);
@@ -187,5 +257,10 @@
         private System.Windows.Forms.GroupBox groupUpdates;
         private System.Windows.Forms.CheckBox checkUpdateNotifications;
         private System.Windows.Forms.Button btnCheckUpdates;
+        private System.Windows.Forms.Label labelZoom;
+        private System.Windows.Forms.Label labelZoomValue;
+        private System.Windows.Forms.TrackBar trackBarZoom;
+        private System.Windows.Forms.Timer zoomUpdateTimer;
+        private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using TweetDck.Core.Controls;
 using TweetDck.Updates;
 using TweetDck.Updates.Events;
 
@@ -22,7 +23,12 @@ namespace TweetDck.Core.Other.Settings{
             comboBoxTrayType.Items.Add("Combined");
             comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count-1);
             
+            toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
+            trackBarZoom.SetValueSafe(Config.ZoomLevel);
+            labelZoomValue.Text = trackBarZoom.Value+"%";
+
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
+            checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
             checkSpellCheck.Checked = Config.EnableSpellCheck;
             checkTrayHighlight.Checked = Config.EnableTrayHighlight;
 
@@ -31,7 +37,9 @@ namespace TweetDck.Core.Other.Settings{
 
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
+            checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
             checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
+            trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
             comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
             checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
@@ -40,15 +48,34 @@ namespace TweetDck.Core.Other.Settings{
             btnCheckUpdates.Click += btnCheckUpdates_Click;
         }
 
+        public override void OnClosing(){
+            Config.ZoomLevel = trackBarZoom.Value;
+        }
+
         private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
+        private void checkSwitchAccountSelectors_CheckedChanged(object sender, EventArgs e){
+            Config.SwitchAccountSelectors = checkSwitchAccountSelectors.Checked;
+        }
+
         private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
             Config.EnableSpellCheck = checkSpellCheck.Checked;
             PromptRestart();
         }
 
+        private void trackBarZoom_ValueChanged(object sender, EventArgs e){
+            if (trackBarZoom.Value % trackBarZoom.SmallChange != 0){
+                trackBarZoom.Value = trackBarZoom.SmallChange*(int)Math.Floor(((double)trackBarZoom.Value/trackBarZoom.SmallChange)+0.5);
+            }
+            else{
+                zoomUpdateTimer.Stop();
+                zoomUpdateTimer.Start();
+                labelZoomValue.Text = trackBarZoom.Value+"%";
+            }
+        }
+
         private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
             Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
         }
@@ -82,5 +109,10 @@ namespace TweetDck.Core.Other.Settings{
                 }
             }
         }
+
+        private void zoomUpdateTimer_Tick(object sender, EventArgs e){
+            Config.ZoomLevel = trackBarZoom.Value;
+            zoomUpdateTimer.Stop();
+        }
     }
 }

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -48,9 +48,9 @@
             this.labelIdlePause = new System.Windows.Forms.Label();
             this.comboBoxIdlePause = new System.Windows.Forms.ComboBox();
             this.checkNonIntrusive = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
             this.checkTimerCountDown = new System.Windows.Forms.CheckBox();
+            this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.groupNotificationLocation.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).BeginInit();
             this.groupNotificationDuration.SuspendLayout();
@@ -105,7 +105,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(8, 160);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(6, 160);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
             this.comboBoxDisplay.Size = new System.Drawing.Size(171, 21);
             this.comboBoxDisplay.TabIndex = 6;
@@ -185,12 +185,13 @@
             // 
             this.trackBarEdgeDistance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.trackBarEdgeDistance.AutoSize = false;
             this.trackBarEdgeDistance.LargeChange = 8;
             this.trackBarEdgeDistance.Location = new System.Drawing.Point(8, 212);
             this.trackBarEdgeDistance.Maximum = 40;
             this.trackBarEdgeDistance.Minimum = 8;
             this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
-            this.trackBarEdgeDistance.Size = new System.Drawing.Size(141, 45);
+            this.trackBarEdgeDistance.Size = new System.Drawing.Size(141, 30);
             this.trackBarEdgeDistance.SmallChange = 2;
             this.trackBarEdgeDistance.TabIndex = 8;
             this.trackBarEdgeDistance.TickFrequency = 4;
@@ -288,11 +289,12 @@
             // 
             this.trackBarDuration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.trackBarDuration.AutoSize = false;
             this.trackBarDuration.Location = new System.Drawing.Point(6, 19);
             this.trackBarDuration.Maximum = 60;
             this.trackBarDuration.Minimum = 10;
             this.trackBarDuration.Name = "trackBarDuration";
-            this.trackBarDuration.Size = new System.Drawing.Size(128, 45);
+            this.trackBarDuration.Size = new System.Drawing.Size(128, 30);
             this.trackBarDuration.TabIndex = 0;
             this.trackBarDuration.TickFrequency = 5;
             this.trackBarDuration.Value = 25;
@@ -342,7 +344,7 @@
             // 
             this.labelIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(3, 141);
+            this.labelIdlePause.Location = new System.Drawing.Point(5, 141);
             this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelIdlePause.Name = "labelIdlePause";
             this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
@@ -374,17 +376,6 @@
         "delayed until the cursor moves away to prevent accidental clicks.");
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
             // 
-            // checkNotificationTimer
-            // 
-            this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(9, 44);
-            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkNotificationTimer.Name = "checkNotificationTimer";
-            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
-            this.checkNotificationTimer.TabIndex = 1;
-            this.checkNotificationTimer.Text = "Display Notification Timer";
-            this.checkNotificationTimer.UseVisualStyleBackColor = true;
-            // 
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
@@ -397,6 +388,17 @@
             this.toolTip.SetToolTip(this.checkTimerCountDown, "The notification timer counts down instead of up.");
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
             // 
+            // checkNotificationTimer
+            // 
+            this.checkNotificationTimer.AutoSize = true;
+            this.checkNotificationTimer.Location = new System.Drawing.Point(9, 44);
+            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkNotificationTimer.Name = "checkNotificationTimer";
+            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
+            this.checkNotificationTimer.TabIndex = 1;
+            this.checkNotificationTimer.Text = "Display Notification Timer";
+            this.checkNotificationTimer.UseVisualStyleBackColor = true;
+            // 
             // TabSettingsNotifications
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -411,7 +413,6 @@
             this.groupNotificationLocation.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
             this.groupNotificationDuration.ResumeLayout(false);
-            this.groupNotificationDuration.PerformLayout();
             this.tableLayoutDurationButtons.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).EndInit();
             this.groupUserInterface.ResumeLayout(false);

Core/Other/Settings/TabSettingsNotifications.cs

@@ -17,7 +17,7 @@ namespace TweetDck.Core.Other.Settings{
             this.notification.CanMoveWindow = () => radioLocCustom.Checked;
 
             this.notification.Move += (sender, args) => {
-                if (radioLocCustom.Checked){
+                if (radioLocCustom.Checked && this.notification.Location != ControlExtensions.InvisibleLocation){
                     Config.CustomNotificationPosition = this.notification.Location;
                 }
             };
@@ -37,6 +37,9 @@ namespace TweetDck.Core.Other.Settings{
                 case TweetNotification.Position.Custom: radioLocCustom.Checked = true; break;
             }
 
+            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
+            
+            toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
             trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
 
@@ -73,7 +76,7 @@ namespace TweetDck.Core.Other.Settings{
             radioLocTR.CheckedChanged += radioLoc_CheckedChanged;
             radioLocBL.CheckedChanged += radioLoc_CheckedChanged;
             radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
-            radioLocCustom.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocCustom.Click += radioLocCustom_Click;
 
             trackBarDuration.ValueChanged += trackBarDuration_ValueChanged;
             btnDurationShort.Click += btnDurationShort_Click;
@@ -111,16 +114,30 @@ namespace TweetDck.Core.Other.Settings{
             else if (radioLocTR.Checked)Config.NotificationPosition = TweetNotification.Position.TopRight;
             else if (radioLocBL.Checked)Config.NotificationPosition = TweetNotification.Position.BottomLeft;
             else if (radioLocBR.Checked)Config.NotificationPosition = TweetNotification.Position.BottomRight;
-            else if (radioLocCustom.Checked){
+
+            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = true;
+            notification.ShowNotificationForSettings(false);
+        }
+
+        private void radioLocCustom_Click(object sender, EventArgs e){
             if (!Config.IsCustomNotificationPositionSet){
                 Config.CustomNotificationPosition = notification.Location;
             }
 
             Config.NotificationPosition = TweetNotification.Position.Custom;
-            }
 
-            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
+            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = false;
             notification.ShowNotificationForSettings(false);
+
+            if (notification.IsFullyOutsideView() && MessageBox.Show("The notification seems to be outside of view, would you like to reset its position?", "Notification is outside view", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                Config.NotificationPosition = TweetNotification.Position.TopRight;
+                notification.MoveToVisibleLocation();
+
+                Config.CustomNotificationPosition = notification.Location;
+
+                Config.NotificationPosition = TweetNotification.Position.Custom;
+                notification.MoveToVisibleLocation();
+            }
         }
 
         private void trackBarDuration_ValueChanged(object sender, EventArgs e){

Core/TrayIcon.cs

@@ -12,9 +12,7 @@ namespace TweetDck.Core{
         public event EventHandler ClickClose;
 
         public bool Visible{
-            get{
-                return notifyIcon.Visible;
-            }
+            get => notifyIcon.Visible;
 
             set{
                 if (value){
@@ -72,9 +70,7 @@ namespace TweetDck.Core{
         }
 
         private void menuItemRestore_Click(object sender, EventArgs e){
-            if (ClickRestore != null){
-                ClickRestore(this, e);
-            }
+            ClickRestore?.Invoke(this, e);
         }
 
         private void menuItemMuteNotifications_Click(object sender, EventArgs e){
@@ -83,9 +79,7 @@ namespace TweetDck.Core{
         }
 
         private void menuItemClose_Click(object sender, EventArgs e){
-            if (ClickClose != null){
-                ClickClose(this, e);
-            }
+            ClickClose?.Invoke(this, e);
         }
     }
 

Core/Utils/BrowserUtils.cs

@@ -1,12 +1,12 @@
-using System;
+using CefSharp;
+using System;
 using System.Diagnostics;
+using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Net;
-using System.Windows.Forms;
-using CefSharp;
 using System.Text.RegularExpressions;
-using System.Drawing;
+using System.Windows.Forms;
 
 namespace TweetDck.Core.Utils{
     static class BrowserUtils{
@@ -23,11 +23,7 @@ namespace TweetDck.Core.Utils{
             }
         }
 
-        public static string HeaderUserAgent{
-            get{
-               return Program.BrandName+" "+Application.ProductVersion; 
-            }
-        }
+        public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
 
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
         public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
@@ -37,9 +33,7 @@ namespace TweetDck.Core.Utils{
         };
 
         public static bool IsValidUrl(string url){
-            Uri uri;
-            
-            if (Uri.TryCreate(url, UriKind.Absolute, out uri)){
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
                 string scheme = uri.Scheme;
                 return scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto;
             }
@@ -88,6 +82,10 @@ namespace TweetDck.Core.Utils{
             client.DownloadFileAsync(new Uri(url), target);
         }
 
+        public static void SetZoomLevel(IBrowser browser, int percentage){
+            browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
+        }
+
         public static bool IsTweetDeckWebsite(IFrame frame){
             return frame.Url.Contains("//tweetdeck.twitter.com/");
         }

Core/Utils/CommandLineArgs.cs

@@ -35,11 +35,7 @@ namespace TweetDck.Core.Utils{
         private readonly HashSet<string> flags = new HashSet<string>();
         private readonly Dictionary<string, string> values = new Dictionary<string, string>();
 
-        public int Count{
-            get{
-                return flags.Count+values.Count;
-            }
-        }
+        public int Count => flags.Count+values.Count;
 
         public void AddFlag(string flag){
             flags.Add(flag.ToLowerInvariant());
@@ -62,8 +58,7 @@ namespace TweetDck.Core.Utils{
         }
 
         public string GetValue(string key, string defaultValue){
-            string val;
-            return values.TryGetValue(key.ToLowerInvariant(), out val) ? val : defaultValue;
+            return values.TryGetValue(key.ToLowerInvariant(), out string val) ? val : defaultValue;
         }
 
         public void RemoveValue(string key){

Core/Utils/CommandLineArgsParser.cs

@@ -4,11 +4,7 @@ namespace TweetDck.Core.Utils{
     static class CommandLineArgsParser{
         private static Regex splitRegex;
 
-        private static Regex SplitRegex{
-            get{
-                return splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled));
-            }
-        }
+        private static Regex SplitRegex => splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled));
 
         public static CommandLineArgs ReadCefArguments(string argumentString){
             CommandLineArgs args = new CommandLineArgs();

Core/Utils/HardwareAcceleration.cs

@@ -9,17 +9,8 @@ namespace TweetDck.Core.Utils{
         private static readonly string DisabledLibEGL = LibEGL+".bak";
         private static readonly string DisabledLibGLES = LibGLES+".bak";
 
-        public static bool IsEnabled{
-            get{
-                return File.Exists(LibEGL) && File.Exists(LibGLES);
-            }
-        }
-
-        public static bool CanEnable{
-            get{
-                return File.Exists(DisabledLibEGL) && File.Exists(DisabledLibGLES);
-            }
-        }
+        public static bool IsEnabled => File.Exists(LibEGL) && File.Exists(LibGLES);
+        public static bool CanEnable => File.Exists(DisabledLibEGL) && File.Exists(DisabledLibGLES);
 
         public static bool Enable(){
             if (IsEnabled)return false;

Core/Utils/NativeMethods.cs

@@ -19,6 +19,9 @@ namespace TweetDck.Core.Utils{
 
         public const int WM_MOUSE_LL = 14;
         public const int WM_MOUSEWHEEL = 0x020A;
+        public const int WM_XBUTTONDOWN = 0x020B;
+        public const int WM_XBUTTONUP = 0x020C;
+        public const int WM_PARENTNOTIFY = 0x0210;
         
         [StructLayout(LayoutKind.Sequential)]
         private struct LASTINPUTINFO{
@@ -84,7 +87,7 @@ namespace TweetDck.Core.Utils{
             SetWindowPos(form.Handle.ToInt32(), hWndOrder, form.Left, form.Top, form.Width, form.Height, flags);
         }
 
-        public static int GetHookWheelDelta(IntPtr ptr){
+        public static int GetMouseHookData(IntPtr ptr){
             return Marshal.PtrToStructure<MSLLHOOKSTRUCT>(ptr).mouseData >> 16;
         }
 

Core/Utils/TwoKeyDictionary.cs

@@ -21,9 +21,7 @@ namespace TweetDck.Core.Utils{
             }
 
             set{
-                Dictionary<K2, V> innerDict;
-
-                if (!dict.TryGetValue(outerKey, out innerDict)){
+                if (!dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
                     dict.Add(outerKey, innerDict = new Dictionary<K2, V>(innerCapacity));
                 }
 
@@ -44,9 +42,7 @@ namespace TweetDck.Core.Utils{
         // Members
 
         public void Add(K1 outerKey, K2 innerKey, V value){ // throws on duplicate
-            Dictionary<K2, V> innerDict;
-
-            if (!dict.TryGetValue(outerKey, out innerDict)){
+            if (!dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
                 dict.Add(outerKey, innerDict = new Dictionary<K2, V>(innerCapacity));
             }
 
@@ -54,7 +50,7 @@ namespace TweetDck.Core.Utils{
         }
         
         public void Clear(){
-            this.dict.Clear();
+            dict.Clear();
         }
 
         public void Clear(K1 outerKey){ // throws on missing key, but keeps the key unlike Remove(K1)
@@ -83,10 +79,8 @@ namespace TweetDck.Core.Utils{
         }
         
         public bool Remove(K1 outerKey, K2 innerKey){
-            Dictionary<K2, V> innerDict;
-
-            if (dict.TryGetValue(outerKey, out innerDict) && innerDict.Remove(innerKey)){
-                if (innerDict.Count == 0){
+            if (dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict) && innerDict.Remove(innerKey)){
+                if (innerDict.Count == 0) {
                     dict.Remove(outerKey);
                 }
 
@@ -96,9 +90,7 @@ namespace TweetDck.Core.Utils{
         }
 
         public bool TryGetValue(K1 outerKey, K2 innerKey, out V value){
-            Dictionary<K2, V> innerDict;
-            
-            if (dict.TryGetValue(outerKey, out innerDict)){
+            if (dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
                 return innerDict.TryGetValue(innerKey, out value);
             }
             else{

Core/Utils/WindowState.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
+using TweetDck.Core.Controls;
 
 namespace TweetDck.Core.Utils{
     [Serializable]
@@ -20,7 +20,7 @@ namespace TweetDck.Core.Utils{
                 form.WindowState = isMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
             }
 
-            if ((rect == Rectangle.Empty && firstTimeFullscreen) || !Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(form.Bounds))){
+            if ((rect == Rectangle.Empty && firstTimeFullscreen) || form.IsFullyOutsideView()){
                 form.DesktopBounds = Screen.PrimaryScreen.WorkingArea;
                 form.WindowState = FormWindowState.Maximized;
                 Save(form);

Core/Utils/WindowsUtils.cs

@@ -8,6 +8,13 @@ using System.Windows.Forms;
 
 namespace TweetDck.Core.Utils{
     static class WindowsUtils{
+        public static bool ShouldAvoidToolWindow { get; }
+
+        static WindowsUtils(){
+            Version ver = Environment.OSVersion.Version;
+            ShouldAvoidToolWindow = ver.Major == 6 && ver.Minor == 2; // windows 8/10
+        }
+
         public static bool CheckFolderWritePermission(string path){
             string testFile = Path.Combine(path, ".test");
 

Plugins/Controls/PluginControl.cs

@@ -61,7 +61,7 @@ namespace TweetDck.Plugins.Controls{
         }
 
         private void UpdatePluginState(){
-            bool isEnabled = plugin.CanRun && pluginManager.Config.IsEnabled(plugin);
+            bool isEnabled = pluginManager.Config.IsEnabled(plugin) && plugin.CanRun;
             Color textColor = isEnabled ? Color.Black : Color.FromArgb(90, 90, 90);
             
             labelVersion.ForeColor = textColor;

Plugins/Events/PluginChangedStateEventArgs.cs

@@ -2,8 +2,8 @@
 
 namespace TweetDck.Plugins.Events{
     class PluginChangedStateEventArgs : EventArgs{
-        public Plugin Plugin { get; private set; }
-        public bool IsEnabled { get; private set; }
+        public Plugin Plugin { get; }
+        public bool IsEnabled { get; }
 
         public PluginChangedStateEventArgs(Plugin plugin, bool isEnabled){
             this.Plugin = plugin;

Plugins/Events/PluginErrorEventArgs.cs

@@ -3,11 +3,7 @@ using System.Collections.Generic;
 
 namespace TweetDck.Plugins.Events{
     class PluginErrorEventArgs : EventArgs{
-        public bool HasErrors{
-            get{
-                return Errors.Count > 0;
-            }
-        }
+        public bool HasErrors => Errors.Count > 0;
 
         public IList<string> Errors;
 

Plugins/Plugin.cs

@@ -7,51 +7,41 @@ using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Plugins{
     class Plugin{
-        public string Identifier { get { return identifier; } }
-        public string Name { get { return metadata["NAME"]; } }
-        public string Description { get { return metadata["DESCRIPTION"]; } }
-        public string Author { get { return metadata["AUTHOR"]; } }
-        public string Version { get { return metadata["VERSION"]; } }
-        public string Website { get { return metadata["WEBSITE"]; } }
-        public string ConfigFile { get { return metadata["CONFIGFILE"]; } }
-        public string ConfigDefault { get { return metadata["CONFIGDEFAULT"]; } }
-        public string RequiredVersion { get { return metadata["REQUIRES"]; } }
-        public PluginGroup Group { get; private set; }
+        public string Identifier { get; }
+        public PluginGroup Group { get; }
         public PluginEnvironment Environments { get; private set; }
 
+        public string Name => metadata["NAME"];
+        public string Description => metadata["DESCRIPTION"];
+        public string Author => metadata["AUTHOR"];
+        public string Version => metadata["VERSION"];
+        public string Website => metadata["WEBSITE"];
+        public string ConfigFile => metadata["CONFIGFILE"];
+        public string ConfigDefault => metadata["CONFIGDEFAULT"];
+        public string RequiredVersion => metadata["REQUIRES"];
+
         public bool CanRun{
-            get{
-                return canRun ?? (canRun = CheckRequiredVersion(RequiredVersion)).Value;
-            }
+            get => canRun ?? (canRun = CheckRequiredVersion(RequiredVersion)).Value;
         }
 
         public bool HasConfig{
-            get{
-                return ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
-            }
+            get => ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
         }
 
         public string ConfigPath{
-            get{
-                return HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
-            }
+            get => HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
         }
 
         public bool HasDefaultConfig{
-            get{
-                return ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
-            }
+            get => ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
         }
 
         public string DefaultConfigPath{
-            get{
-                return HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
-            }
+            get => HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
         }
 
         private readonly string pathRoot;
         private readonly string pathData;
-        private readonly string identifier;
         private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(4){
             { "NAME", "" },
             { "DESCRIPTION", "" },
@@ -72,7 +62,7 @@ namespace TweetDck.Plugins{
             this.pathRoot = path;
             this.pathData = Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name);
 
-            this.identifier = group.GetIdentifierPrefix()+name;
+            this.Identifier = group.GetIdentifierPrefix()+name;
             this.Group = group;
             this.Environments = PluginEnvironment.None;
         }
@@ -103,7 +93,7 @@ namespace TweetDck.Plugins{
                     Directory.CreateDirectory(dataFolder);
                     File.Copy(defaultConfigPath, configPath, false);
                 }catch(Exception e){
-                    Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+identifier+"' plugin.", true, e);
+                    Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+Identifier+"' plugin.", true, e);
                 }
             }
         }
@@ -154,12 +144,12 @@ namespace TweetDck.Plugins{
         }
 
         public override int GetHashCode(){
-            return identifier.GetHashCode();
+            return Identifier.GetHashCode();
         }
 
         public override bool Equals(object obj){
             Plugin plugin = obj as Plugin;
-            return plugin != null && plugin.identifier.Equals(identifier);
+            return plugin != null && plugin.Identifier.Equals(Identifier);
         }
 
         public static Plugin CreateFromFolder(string path, PluginGroup group, out string error){
@@ -236,9 +226,7 @@ namespace TweetDck.Plugins{
                 return false;
             }
 
-            Version ver;
-
-            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out ver))){
+            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out Version _))){
                 error = "Plugin contains invalid version: "+plugin.RequiredVersion;
                 return false;
             }

Plugins/PluginBridge.cs

@@ -16,11 +16,7 @@ namespace TweetDck.Plugins{
         private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
         private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int,string,InjectedHTML>(4, 1);
 
-        public IEnumerable<InjectedHTML> NotificationInjections{
-            get{
-                return notificationInjections.InnerValues;
-            }
-        }
+        public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
 
         public PluginBridge(PluginManager manager){
             this.manager = manager;
@@ -64,9 +60,7 @@ namespace TweetDck.Plugins{
         private string ReadFileUnsafe(int token, string cacheKey, string fullPath, bool readCached){
             cacheKey = SanitizeCacheKey(cacheKey);
             
-            string cachedContents;
-            
-            if (readCached && fileCache.TryGetValue(token, cacheKey, out cachedContents)){
+            if (readCached && fileCache.TryGetValue(token, cacheKey, out string cachedContents)){
                 return cachedContents;
             }
 

Plugins/PluginConfig.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Text;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Plugins{
@@ -8,34 +10,66 @@ namespace TweetDck.Plugins{
         [field:NonSerialized]
         public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
 
-        public IEnumerable<string> DisabledPlugins{
-            get{
-                return Disabled;
-            }
-        }
+        public IEnumerable<string> DisabledPlugins => Disabled;
+        public bool AnyDisabled => Disabled.Count > 0;
 
-        public bool AnyDisabled{
-            get{
-                return Disabled.Count > 0;
-            }
-        }
+        private readonly HashSet<string> Disabled = new HashSet<string>{
+            "official/clear-columns",
+            "official/reply-account"
+        };
 
-        private readonly HashSet<string> Disabled = new HashSet<string>();
+        public void ImportLegacy(PluginConfig config){
+            Disabled.Clear();
+            
+            foreach(string plugin in config.Disabled){
+                Disabled.Add(plugin);
+            }
+        }
 
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && Disabled.Remove(plugin.Identifier)) || (!enabled && Disabled.Add(plugin.Identifier))){
-                if (InternalPluginChangedState != null){
-                    InternalPluginChangedState(this, new PluginChangedStateEventArgs(plugin, enabled));
-                }
+                InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
             }
         }
 
         public bool IsEnabled(Plugin plugin){
-            return !Disabled.Contains(plugin.Identifier) && plugin.CanRun;
+            return !Disabled.Contains(plugin.Identifier);
         }
 
-        public void DisableOfficialFromConfig(string pluginName){
-            Disabled.Add("official/"+pluginName);
+        public void Load(string file){
+            try{
+                using(FileStream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using(StreamReader reader = new StreamReader(stream, Encoding.UTF8)){
+                    string line = reader.ReadLine();
+
+                    if (line == "#Disabled"){
+                        Disabled.Clear();
+
+                        while((line = reader.ReadLine()) != null){
+                            Disabled.Add(line);
+                        }
+                    }
+                }
+            }catch(FileNotFoundException){
+            }catch(DirectoryNotFoundException){
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e);
+            }
+        }
+
+        public void Save(string file){
+            try{
+                using(FileStream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))
+                using(StreamWriter writer = new StreamWriter(stream, Encoding.UTF8)){
+                    writer.WriteLine("#Disabled");
+
+                    foreach(string disabled in Disabled){
+                        writer.WriteLine(disabled);
+                    }
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e);
+            }
         }
     }
 }

Plugins/PluginManager.cs

@@ -1,8 +1,8 @@
-using System;
+using CefSharp;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using CefSharp;
 using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 using TweetDck.Resources;
@@ -15,50 +15,62 @@ namespace TweetDck.Plugins{
 
         private const int InvalidToken = 0;
 
-        public string PathOfficialPlugins { get { return Path.Combine(rootPath, "official"); } }
-        public string PathCustomPlugins { get { return Path.Combine(rootPath, "user"); } }
+        public string PathOfficialPlugins => Path.Combine(rootPath, "official");
+        public string PathCustomPlugins => Path.Combine(rootPath, "user");
 
-        public IEnumerable<Plugin> Plugins { get { return plugins; } }
-        public PluginConfig Config { get; private set; }
-        public PluginBridge Bridge { get; private set; }
+        public IEnumerable<Plugin> Plugins => plugins;
+        public PluginConfig Config { get; }
+        public PluginBridge Bridge { get; }
         
         public event EventHandler<PluginErrorEventArgs> Reloaded;
         public event EventHandler<PluginErrorEventArgs> Executed;
         public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         private readonly string rootPath;
+        private readonly string configPath;
+
         private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
         private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
         private readonly Random rand = new Random();
 
         private List<string> loadErrors;
 
-        public PluginManager(string path, PluginConfig config){
-            this.rootPath = path;
-            this.SetConfig(config);
+        public PluginManager(string rootPath, string configPath){
+            this.rootPath = rootPath;
+            this.configPath = configPath;
+
+            this.Config = new PluginConfig();
             this.Bridge = new PluginBridge(this);
 
+            LoadConfig();
+            
+            Config.InternalPluginChangedState += Config_InternalPluginChangedState;
             Program.UserConfigReplaced += Program_UserConfigReplaced;
         }
 
+        private void LoadConfig(){
+            #pragma warning disable 612
+            if (Program.UserConfig.Plugins != null){
+                Config.ImportLegacy(Program.UserConfig.Plugins);
+                Config.Save(configPath);
+
+                Program.UserConfig.Plugins = null;
+                Program.UserConfig.Save();
+            }
+            #pragma warning restore 612
+            else{
+                Config.Load(configPath);
+            }
+        }
+
         private void Program_UserConfigReplaced(object sender, EventArgs e){
-            SetConfig(Program.UserConfig.Plugins);
+            LoadConfig();
             Reload();
         }
 
         private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
-            if (PluginChangedState != null){
-                PluginChangedState(this, e);
-            }
-        }
-
-        private void SetConfig(PluginConfig config){
-            if (this.Config != null){
-                this.Config.InternalPluginChangedState -= Config_InternalPluginChangedState;
-            }
-
-            this.Config = config;
-            this.Config.InternalPluginChangedState += Config_InternalPluginChangedState;
+            PluginChangedState?.Invoke(this, e);
+            Config.Save(configPath);
         }
 
         public bool IsPluginInstalled(string identifier){
@@ -88,8 +100,7 @@ namespace TweetDck.Plugins{
         }
 
         public Plugin GetPluginFromToken(int token){
-            Plugin plugin;
-            return tokens.TryGetValue(token, out plugin) ? plugin : null;
+            return tokens.TryGetValue(token, out Plugin plugin) ? plugin : null;
         }
 
         public void Reload(){
@@ -106,9 +117,7 @@ namespace TweetDck.Plugins{
                 plugins.Add(plugin);
             }
 
-            if (Reloaded != null){
-                Reloaded(this, new PluginErrorEventArgs(loadErrors));
-            }
+            Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
         }
 
         public void ExecutePlugins(IFrame frame, PluginEnvironment environment, bool includeDisabled){
@@ -120,7 +129,7 @@ namespace TweetDck.Plugins{
 
             foreach(Plugin plugin in Plugins){
                 string path = plugin.GetScriptPath(environment);
-                if (string.IsNullOrEmpty(path) || !plugin.CanRun || (!includeDisabled && !Config.IsEnabled(plugin)))continue;
+                if (string.IsNullOrEmpty(path) || (!includeDisabled && !Config.IsEnabled(plugin)) || !plugin.CanRun)continue;
 
                 string script;
 
@@ -144,9 +153,7 @@ namespace TweetDck.Plugins{
                 ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, token, environment), "plugin:"+plugin);
             }
 
-            if (Executed != null){
-                Executed(this, new PluginErrorEventArgs(failedPlugins));
-            }
+            Executed?.Invoke(this, new PluginErrorEventArgs(failedPlugins));
         }
 
         private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
@@ -155,8 +162,7 @@ namespace TweetDck.Plugins{
             }
 
             foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
-                string error;
-                Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out error);
+                Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out string error);
 
                 if (plugin == null){
                     loadErrors.Add(group.GetIdentifierPrefix()+Path.GetFileName(fullDir)+": "+error);

Program.cs

@@ -1,18 +1,18 @@
-using System;
+using CefSharp;
+using System;
 using System.Diagnostics;
 using System.IO;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDck.Configuration;
-using TweetDck.Core;
-using TweetDck.Core.Utils;
 using System.Linq;
 using System.Threading;
-using TweetDck.Plugins;
-using TweetDck.Plugins.Events;
-using TweetDck.Core.Other.Settings.Export;
+using System.Windows.Forms;
+using TweetDck.Configuration;
+using TweetDck.Core;
 using TweetDck.Core.Handling;
 using TweetDck.Core.Other;
+using TweetDck.Core.Other.Settings.Export;
+using TweetDck.Core.Utils;
+using TweetDck.Plugins;
+using TweetDck.Plugins.Events;
 using TweetDck.Updates;
 
 namespace TweetDck{
@@ -20,8 +20,8 @@ namespace TweetDck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.7.2";
-        public const string VersionFull = "1.7.2.0";
+        public const string VersionTag = "1.7.5";
+        public const string VersionFull = "1.7.5.0";
 
         public static readonly Version Version = new Version(VersionTag);
         public static readonly bool IsPortable = File.Exists("makeportable");
@@ -29,8 +29,9 @@ namespace TweetDck{
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
 
-        public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
         public static readonly string ConfigFilePath = Path.Combine(StoragePath, "TD_UserConfig.cfg");
+        public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
+        public static readonly string PluginConfigFilePath = Path.Combine(StoragePath, "TD_PluginConfig.cfg");
         private static readonly string ErrorLogFilePath = Path.Combine(StoragePath, "TD_Log.txt");
         private static readonly string ConsoleLogFilePath = Path.Combine(StoragePath, "TD_Console.txt");
         
@@ -155,7 +156,7 @@ namespace TweetDck{
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
 
-            PluginManager plugins = new PluginManager(PluginPath, UserConfig.Plugins);
+            PluginManager plugins = new PluginManager(PluginPath, PluginConfigFilePath);
             plugins.Reloaded += plugins_Reloaded;
             plugins.Executed += plugins_Executed;
             plugins.Reload();
@@ -213,10 +214,7 @@ namespace TweetDck{
 
         public static void ReloadConfig(){
             UserConfig = UserConfig.Load(ConfigFilePath);
-
-            if (UserConfigReplaced != null){
-                UserConfigReplaced(UserConfig, new EventArgs());
-            }
+            UserConfigReplaced?.Invoke(UserConfig, new EventArgs());
         }
 
         public static void ResetConfig(){

Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Resources;
+using System.Runtime.InteropServices;
 using TweetDck;
 
 // General Information about an assembly is controlled through the following 

Properties/Resources.Designer.cs

@@ -9,7 +9,6 @@
 //------------------------------------------------------------------------------
 
 namespace TweetDck.Properties {
-    using System;
 
 
     /// <summary>

README.md

@@ -1,8 +1,8 @@
 # Build Instructions
 
-The program was build using Visual Studio 2013. After opening the solution, make sure you have **CefSharp.WinForms** and **Microsoft.VC120.CRT.JetBrains** included - if not, download them using NuGet.
+The program was built using Visual Studio 2017. After opening the solution, make sure you have **CefSharp.WinForms** and **Microsoft.VC120.CRT.JetBrains** included - if not, download them using NuGet.
 ```
-PM> Install-Package CefSharp.WinForms -Version 57.0.0-pre01
+PM> Install-Package CefSharp.WinForms -Version 57.0.0
 PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```
 

Resources/Plugins/edit-design/browser.js

@@ -16,6 +16,7 @@ enabled(){
     hideTweetActions: true,
     moveTweetActionsToRight: true,
     revertReplies: false,
+    themeColorTweaks: true,
     roundedScrollBars: false,
     smallComposeTextSize: false,
     optimizeAnimations: true,
@@ -54,6 +55,7 @@ enabled(){
   $TDP.checkFileExists(this.$token, configFile).then(exists => {
     if (!exists){
       loadConfigObject(null);
+      $TDP.writeFile(this.$token, configFile, JSON.stringify(this.defaultConfig));
     }
     else{
       $TDP.readFile(this.$token, configFile, true).then(contents => {
@@ -199,6 +201,7 @@ enabled(){
       setTimeout(function(){
         TD.settings.setTheme($(this).attr("data-td-theme"));
         $(document).trigger("uiToggleTheme");
+        me.reinjectAll();
       }, 1);
     });
   }).methods({
@@ -227,6 +230,70 @@ enabled(){
     this.$pluginSettings.requiresPageReload = enable;
   };
   
+  // animation optimization
+  this.optimizations = null;
+  this.optimizationTimer = null;
+  
+  let clearOptimizationTimer = () => {
+    if (this.optimizationTimer){
+      window.clearTimeout(this.optimizationTimer);
+      this.optimizationTimer = null;
+    }
+  };
+  
+  let runOptimizationTimer = timeout => {
+    if (!this.optimizationTimer){
+      this.optimizationTimer = window.setTimeout(optimizationTimerFunc, timeout);
+    }
+  };
+  
+  let optimizationTimerFunc = () => {
+    this.optimizationTimer = null;
+    
+    if (this.config.optimizeAnimations){
+      $TD.getIdleSeconds().then(s => {
+        if (s >= 16){
+          disableOptimizations();
+          runOptimizationTimer(2500);
+        }
+        else{
+          injectOptimizations();
+        }
+      });
+    }
+  };
+  
+  let injectOptimizations = force => {
+    if (!this.optimizations && (force || document.hasFocus())){
+      this.optimizations = window.TDPF_createCustomStyle(this);
+      this.optimizations.insert(".app-content { will-change: transform }");
+      this.optimizations.insert(".column-holder { will-change: transform }");
+    }
+    
+    clearOptimizationTimer();
+    runOptimizationTimer(10000);
+  };
+  
+  let disableOptimizations = () => {
+    if (this.optimizations){
+      this.optimizations.remove();
+      this.optimizations = null;
+    }
+  };
+  
+  this.onWindowFocusEvent = () => {
+    if (this.config.optimizeAnimations){
+      injectOptimizations(true);
+    }
+  };
+  
+  this.onWindowBlurEvent = () => {
+    if (this.config.optimizeAnimations){
+      disableOptimizations();
+      clearOptimizationTimer();
+    }
+  };
+  
   // css and layout injection
   this.resetDesign = () => {
     if (this.css){
@@ -239,12 +306,36 @@ enabled(){
   this.reinjectAll = () => {
     this.resetDesign();
     
+    clearOptimizationTimer();
+    
+    if (this.config.optimizeAnimations){
+      injectOptimizations();
+    }
+    else{
+      disableOptimizations();
+    }
+    
     this.css.insert("#general_settings .cf { display: none !important }");
     this.css.insert("#general_settings .divider-bar::after { display: inline-block; padding-top: 10px; line-height: 17px; content: 'Use the new | Edit layout & design | option in the Settings to modify TweetDeck theme, column width, font size, and other features.' }");
     
     this.css.insert(".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }");
     this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
     
+    if (this.config.themeColorTweaks){
+      switch(TD.settings.getTheme()){
+        case "dark":
+          this.css.insert(".app-content, .app-columns-container { background-color: #444448 }");
+          this.css.insert(".column-drag-handle { opacity: 0.5 }");
+          this.css.insert(".column-drag-handle:hover { opacity: 1 }");
+          break;
+
+        case "light":
+          this.css.insert(".scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb { background-color: #d2d6da }");
+          this.css.insert(".app-columns-container.scroll-styled-h::-webkit-scrollbar-thumb:not(:hover) { background-color: #a5aeb5 }");
+          break;
+      }
+    }
+    
     if (this.config.hideTweetActions){
       this.css.insert(".tweet-action { opacity: 0; }");
       this.css.insert(".is-favorite .tweet-action, .is-retweet .tweet-action { opacity: 0.5; visibility: visible !important }");
@@ -268,11 +359,12 @@ enabled(){
       this.css.insert(".antiscroll-scrollbar { border-radius: 0 }");
       this.css.insert(".antiscroll-scrollbar-vertical { margin-top: 0 }");
       this.css.insert(".antiscroll-scrollbar-horizontal { margin-left: 0 }");
+      this.css.insert(".app-columns-container::-webkit-scrollbar { height: 9px !important }");
     }
     
-    if (this.config.optimizeAnimations){
-      this.css.insert(".app-content { will-change: transform }");
-      this.css.insert(".column-holder { will-change: transform }");
+    if (this.config.revertReplies){
+      this.css.insert(".activity-header + .tweet .tweet-context { margin-left: -35px }");
+      this.css.insert(".activity-header + .tweet .tweet-context .obj-left { margin-right: 5px }");
     }
     
     if (this.config.columnWidth[0] === '/'){
@@ -311,6 +403,7 @@ enabled(){
       "<style type='text/css'>",
       ".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }",
       ".avatar { border-radius: "+this.config.avatarRadius+"% !important }",
+      (this.config.revertReplies ? ".activity-header + .tweet .tweet-context { margin-left: -35px } .activity-header + .tweet .tweet-context .obj-left { margin-right: 5px }" : ""),
       "</style>"
     ].join(""));
   };
@@ -338,6 +431,10 @@ ready(){
   
   this.onAppReady();
   
+  // optimization events
+  $(window).on("focus", this.onWindowFocusEvent);
+  $(window).on("blur", this.onWindowBlurEvent);
+  
   // layout events
   $(document).on("uiShowActionsMenu", this.uiShowActionsMenuEvent);
   
@@ -351,7 +448,17 @@ disabled(){
     this.css.remove();
   }
   
+  if (this.optimizations){
+    this.optimizations.remove();
+  }
+  
+  if (this.optimizationTimer){
+    window.clearTimeout(this.optimizationTimer);
+  }
+  
   $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
+  $(window).off("focus", this.onWindowFocusEvent);
+  $(window).off("blur", this.onWindowBlurEvent);
   
   $("[data-action='settings-menu']").off("click", this.onSettingsMenuClickedEvent);
   $("#td-design-plugin-modal").remove();

Resources/Plugins/edit-design/modal.html

@@ -61,6 +61,16 @@
             <option value="16px">Largest (16px)</option>
             <option value="custom">Custom</option>
           </select>
+          
+          <!-- ADVANCED -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Advanced</b>
+          </label>
+          <label class="checkbox">
+            <input data-td-key="optimizeAnimations" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Use more memory for smoother animations
+          </label>
         </div>
         
         <div class="l-column mdl-column">
@@ -88,6 +98,10 @@
           <label class="txt-uppercase touch-larger-label">
             <b>Design</b>
           </label>
+          <label class="checkbox">
+            <input data-td-key="themeColorTweaks" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Theme color tweaks
+          </label>
           <label class="checkbox">
             <input data-td-key="roundedScrollBars" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Rounded scroll bars
@@ -96,16 +110,6 @@
             <input data-td-key="smallComposeTextSize" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Small compose tweet font size
           </label>
-          
-          <!-- ADVANCED -->
-          
-          <label class="txt-uppercase touch-larger-label">
-            <b>Advanced</b>
-          </label>
-          <label class="checkbox">
-            <input data-td-key="optimizeAnimations" class="js-theme-checkbox touch-larger-label" type="checkbox">
-            Optimize animations (uses more memory for smoother animations)
-          </label>
         </div>
         
         <div class="l-column mdl-column">
@@ -153,7 +157,7 @@
   
   .td-modal-panel {
     width: 693px;
-    height: 374px;
+    height: 380px;
   }
   
   .td-modal-inner-cols {

Resources/ScriptLoader.cs

@@ -1,9 +1,9 @@
-using System;
+using CefSharp;
+using CefSharp.WinForms;
+using System;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
-using CefSharp;
-using CefSharp.WinForms;
 
 namespace TweetDck.Resources{
     static class ScriptLoader{

Resources/Scripts/code.js

@@ -80,7 +80,39 @@
   //
   // Function: Event callback for a new tweet.
   //
-  var onNewTweet = function(column, tweet){
+  var onNewTweet = (function(){
+    let recentTweets = new Set();
+    let recentTweetTimer = null;
+    
+    let startRecentTweetTimer = () => {
+      if (recentTweetTimer){
+        window.clearTimeout(recentTweetTimer);
+      }
+      
+      recentTweetTimer = window.setTimeout(() => {
+        recentTweetTimer = null;
+        recentTweets.clear();
+      }, 10000);
+    };
+    
+    let checkRecentTweet = id => {
+      if (recentTweets.size > 50){
+        recentTweets.clear();
+      }
+      else if (recentTweets.has(id)){
+        return true;
+      }
+      
+      recentTweets.add(id);
+      startRecentTweetTimer();
+      return false;
+    };
+    
+    return function(column, tweet){
+      if (checkRecentTweet(tweet.id)){
+        return;
+      }
+      
       if (column.model.getHasNotification()){
         let html = $(tweet.render({
           withFooter: false,
@@ -100,6 +132,11 @@
           this.outerHTML = this.innerHTML;
         });
 
+        if (tweet.getChirpType().includes("list_member")){
+          html.find(".activity-header").first().css("margin-top", "2px");
+          html.find(".avatar").first().css("margin-bottom", "0");
+        }
+
         let source = tweet.getRelatedTweet();
         let duration = source ? source.text.length+(source.quotedTweet ? source.quotedTweet.text.length : 0) : tweet.text.length;
         let tweetUrl = source ? source.getChirpURL() : "";
@@ -112,6 +149,7 @@
         $TD.onTweetSound();
       }
     };
+  })();
   
   //
   // Function: Retrieves the tags to be put into <head> for notification HTML code.
@@ -124,9 +162,11 @@
     });
     
     tags.push("<style type='text/css'>");
-    tags.push("body { background-color: "+getClassStyleProperty("column", "background-color")+" }"); // set background color
+    tags.push("body { background: "+getClassStyleProperty("column", "background-color")+" }"); // set background color
     tags.push("a[data-full-url] { word-break: break-all }"); // break long urls
     tags.push(".txt-base-smallest .badge-verified:before { height: 13px !important }"); // fix cut off badge icon
+    tags.push(".activity-header { align-items: center !important; margin-bottom: 4px }"); // tweak alignment of avatar and text in notifications
+    tags.push(".activity-header .tweet-timestamp { line-height: unset }"); // fix timestamp position in notifications
     tags.push("</style>");
     
     return tags.join("");
@@ -350,7 +390,7 @@
     
     window.TDGF_triggerScreenshot = function(){
       if (selectedTweet){
-        var tweetWidth = selectedTweet.width();
+        var tweetWidth = Math.floor(selectedTweet.width());
         var parent = selectedTweet.parent();
         
         var isDetail = parent.hasClass("js-tweet-detail");
@@ -394,7 +434,7 @@
           width: tweetWidth+"px"
         }).appendTo(document.body);
         
-        var realHeight = testTweet.height();
+        var realHeight = Math.floor(testTweet.height());
         testTweet.remove();
         
         $TD.screenshotTweet(selectedTweet.html(), tweetWidth, realHeight);
@@ -513,17 +553,18 @@
   // Block: Swap shift key functionality for selecting accounts.
   //
   onAppReady.push(function(){
-    $(".js-drawer[data-drawer='compose']").delegate(".js-account-list > .js-account-item", "click", function(e){
+    var toggleEventShiftKey = function(e){
+      if ($TDX.switchAccountSelectors){
         e.shiftKey = !e.shiftKey;
-    });
+      }
+    };
+    
+    $(".js-drawer[data-drawer='compose']").delegate(".js-account-list > .js-account-item", "click", toggleEventShiftKey);
 
     TD.components.AccountSelector.prototype.refreshPostingAccounts = appendToFunction(TD.components.AccountSelector.prototype.refreshPostingAccounts, function(){
       if (!this.$node.attr("td-account-selector-hook")){
         this.$node.attr("td-account-selector-hook", "1");
-
-        this.$node.delegate(".js-account-item", "click", function(e){
-          e.shiftKey = !e.shiftKey;
-        });
+        this.$node.delegate(".js-account-item", "click", toggleEventShiftKey);
       }
     });
   });
@@ -544,8 +585,17 @@
     
     styleOfficial.sheet.insertRule("a[data-full-url] { word-break: break-all; }", 0); // break long urls
     styleOfficial.sheet.insertRule(".column-nav-link .attribution { position: absolute; }", 0); // fix cut off account names
-    styleOfficial.sheet.insertRule(".txt-base-smallest .badge-verified:before { height: 13px !important; }", 0); // fix cut off badge icon
+    styleOfficial.sheet.insertRule(".txt-base-smallest .sprite-verified-mini { width: 13px !important; height: 13px !important; background-position: -223px -99px !important; }", 0); // fix cut off badge icon when zoomed in
     styleOfficial.sheet.insertRule(".keyboard-shortcut-list { vertical-align: top; }", 0); // fix keyboard navigation alignment
+    styleOfficial.sheet.insertRule(".sprite-logo { background-position: -5px -46px !important; }", 0); // fix TweetDeck logo on certain zoom levels
+    styleOfficial.sheet.insertRule(".app-navigator .tooltip { display: none !important; }", 0); // hide broken tooltips in the menu
+    styleOfficial.sheet.insertRule(".account-inline .username { vertical-align: 10%; }", 0); // move usernames a bit higher
+    
+    styleOfficial.sheet.insertRule(".activity-header { align-items: center !important; margin-bottom: 4px; }", 0); // tweak alignment of avatar and text in notifications
+    styleOfficial.sheet.insertRule(".activity-header .tweet-timestamp { line-height: unset }", 0); // fix timestamp position in notifications
+    
+    styleOfficial.sheet.insertRule(".app-columns-container::-webkit-scrollbar-track { border-left: 0; }", 0); // remove weird border in the column container scrollbar
+    styleOfficial.sheet.insertRule(".app-columns-container { bottom: 0 !important; }", 0); // move column container scrollbar to bottom to fit updated style
     
     styleOfficial.sheet.insertRule(".is-video a:not([href*='youtu']), .is-gif .js-media-gif-container { cursor: alias; }", 0); // change cursor on unsupported videos
     styleOfficial.sheet.insertRule(".is-video a:not([href*='youtu']) .icon-bg-dot, .is-gif .icon-bg-dot { color: #bd3d37; }", 0); // change play icon color on unsupported videos
@@ -611,6 +661,17 @@
     }, 100);
   });
   
+  //
+  // Block: Fix DM notifications not showing if the conversation is open.
+  //
+  (function(prevFunc){
+    TD.services.TwitterConversation.prototype.getUnreadChirps = function(e){
+      return (e && e.sortIndex && !e.id && !this.notificationsDisabled)
+        ? this.messages.filter(t => t.chirpType === TD.services.ChirpBase.MESSAGE && !t.isOwnChirp() && !t.read && !t.belongsBelow(e)) // changed from belongsAbove
+        : prevFunc.apply(this, arguments);
+    };
+  })(TD.services.TwitterConversation.prototype.getUnreadChirps);
+  
   //
   // Block: Disable TweetDeck metrics.
   //

TweetDck.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,8 @@
     <AssemblyName>TweetDuck</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>9e936308</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
@@ -42,6 +43,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
@@ -373,21 +375,21 @@ if $(ConfigurationName) == Debug (
   xcopy "$(ProjectDir)Resources\Plugins\.debug\*" "$(TargetDir)plugins\user\.debug\" /E /Y
 )</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets')" />
+  <Import Project="packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets'))" />
   </Target>
-  <Import Project="packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets')" />
-  <Import Project="packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets')" />
+  <Import Project="packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets')" />
+  <Import Project="packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Updates/Events/UpdateCheckEventArgs.cs

@@ -2,9 +2,9 @@ using System;
 
 namespace TweetDck.Updates.Events{
     class UpdateCheckEventArgs : EventArgs{
-        public int EventId { get; private set; }
-        public bool UpdateAvailable { get; private set; }
-        public string LatestVersion { get; private set; }
+        public int EventId { get; }
+        public bool UpdateAvailable { get; }
+        public string LatestVersion { get; }
 
         public UpdateCheckEventArgs(int eventId, bool updateAvailable, string latestVersion){
             EventId = eventId;

Updates/FormUpdateDownload.cs

@@ -10,11 +10,7 @@ namespace TweetDck.Updates{
     sealed partial class FormUpdateDownload : Form{
         private const double BytesToKB = 1024.0;
 
-        public string InstallerPath{
-            get{
-                return Path.Combine(Path.GetTempPath(), updateInfo.FileName);
-            }
-        }
+        public string InstallerPath => Path.Combine(Path.GetTempPath(), updateInfo.FileName);
 
         public enum Status{
             Waiting, Failed, Cancelled, Manual, Succeeded

Updates/UpdateHandler.cs

@@ -1,6 +1,6 @@
-using System;
-using CefSharp;
+using CefSharp;
 using CefSharp.WinForms;
+using System;
 using TweetDck.Core;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Utils;
@@ -9,11 +9,7 @@ using TweetDck.Updates.Events;
 
 namespace TweetDck.Updates{
     sealed class UpdateHandler{
-        private static bool IsSystemSupported{
-            get{
-                return true; // Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7
-            }
-        }
+        private static bool IsSystemSupported => true; // Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7
 
         private readonly ChromiumWebBrowser browser;
         private readonly FormBrowser form;
@@ -61,10 +57,7 @@ namespace TweetDck.Updates{
 
         public void DismissUpdate(string tag){
             settings.DismissedUpdate = tag;
-
-            if (UpdateDismissed != null){
-                UpdateDismissed(this, new UpdateDismissedEventArgs(tag));
-            }
+            UpdateDismissed?.Invoke(this, new UpdateDismissedEventArgs(tag));
         }
 
         private void TriggerUpdateAcceptedEvent(UpdateAcceptedEventArgs args){
@@ -76,10 +69,7 @@ namespace TweetDck.Updates{
         private void TriggerUpdateDismissedEvent(UpdateDismissedEventArgs args){
             form.InvokeAsyncSafe(() => {
                 settings.DismissedUpdate = args.VersionTag;
-                
-                if (UpdateDismissed != null){
-                    UpdateDismissed(this, args);
-                }
+                UpdateDismissed?.Invoke(this, args);
             });
         }
 

Updates/UpdateInfo.cs

@@ -5,11 +5,7 @@ namespace TweetDck.Updates{
         public readonly string VersionTag;
         public readonly string DownloadUrl;
 
-        public string FileName{
-            get{
-                return BrowserUtils.GetFileNameFromUrl(DownloadUrl) ?? Program.BrandName+".Update.exe";
-            }
-        }
+        public string FileName => BrowserUtils.GetFileNameFromUrl(DownloadUrl) ?? Program.BrandName+".Update.exe";
 
         public UpdateInfo(string versionTag, string downloadUrl){
             this.VersionTag = versionTag;

packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packages xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <package id="cef.redist.x64" version="3.2987.1597" targetFramework="net452" xmlns="" />
-  <package id="cef.redist.x86" version="3.2987.1597" targetFramework="net452" xmlns="" />
-  <package id="CefSharp.Common" version="57.0.0-pre01" targetFramework="net452" xmlns="" />
-  <package id="CefSharp.WinForms" version="57.0.0-pre01" targetFramework="net452" xmlns="" />
+<packages>
+  <package id="cef.redist.x64" version="3.2987.1601" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x86" version="3.2987.1601" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.Common" version="57.0.0" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.WinForms" version="57.0.0" targetFramework="net452" xmlns="" />
   <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net452" xmlns="" />
 </packages>

tests/Core/Utils/TestInjectedHTML.cs

@@ -7,11 +7,7 @@ using TweetDck.Core.Utils;
 namespace UnitTests.Core.Utils{
     [TestClass]
     public class TestInjectedHTML{
-        private static IEnumerable<InjectedHTML.Position> Positions{
-            get{
-                return Enum.GetValues(typeof(InjectedHTML.Position)).Cast<InjectedHTML.Position>();
-            }
-        }
+        private static IEnumerable<InjectedHTML.Position> Positions => Enum.GetValues(typeof(InjectedHTML.Position)).Cast<InjectedHTML.Position>();
 
         [TestMethod]
         public void TestFailedMatches(){