wip

Closes #245

Configuration/Arguments.cs

@@ -7,6 +7,7 @@ namespace TweetDuck.Configuration{
         public const string ArgDataFolder = "-datafolder";
         public const string ArgLogging = "-log";
         public const string ArgIgnoreGDPR = "-nogdpr";
+        public const string ArgFreeze = "-freeze";
 
         // internal args
         public const string ArgRestart = "-restart";

Configuration/Instance/FileConfigInstance.cs

@@ -34,7 +34,7 @@ namespace TweetDuck.Configuration.Instance{
                     LoadInternal(attempt > 0);
 
                     if (firstException != null){ // silently log exception that caused a backup restore
-                        Program.Reporter.Log(firstException.ToString());
+                        Program.Reporter.LogImportant(firstException.ToString());
                     }
 
                     return;

Configuration/LockManager.cs

@@ -124,7 +124,7 @@ namespace TweetDuck.Configuration{
                 try{
                     File.Delete(file);
                 }catch(Exception e){
-                    Program.Reporter.Log(e.ToString());
+                    Program.Reporter.LogImportant(e.ToString());
                     return false;
                 }
             }

Core/FormBrowser.cs

@@ -15,6 +15,7 @@ using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Events;
+using TweetDuck.Resources;
 using TweetDuck.Updates;
 
 namespace TweetDuck.Core{
@@ -365,7 +366,11 @@ namespace TweetDuck.Core{
 
         public void ReloadToTweetDeck(){
             #if DEBUG
-            Resources.ScriptLoader.HotSwap();
+            ScriptLoader.HotSwap();
+            #else
+            if (ModifierKeys.HasFlag(Keys.Shift)){
+                ScriptLoader.ClearCache();
+            }
             #endif
 
             ignoreUpdateCheckError = false;
@@ -489,7 +494,7 @@ namespace TweetDuck.Core{
             FormManager.TryFind<FormSettings>()?.Close();
 
             using(DialogSettingsManage dialog = new DialogSettingsManage(plugins, true)){
-                if (dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){
+                if (!dialog.IsDisposed && dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){ // needs disposal check because the dialog may be closed in constructor
                     BrowserProcessHandler.UpdatePrefs();
                     FormManager.TryFind<FormPlugins>()?.Close();
                     plugins.Reload(); // also reloads the browser

Core/Handling/ContextMenuBase.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
@@ -123,33 +122,11 @@ namespace TweetDuck.Core.Handling{
                     break;
 
                 case MenuViewImage: {
-                    void ViewImage(string path){
-                        string ext = Path.GetExtension(path);
-
-                        if (TwitterUtils.ValidImageExtensions.Contains(ext)){
-                            WindowsUtils.OpenAssociatedProgram(path);
-                        }
-                        else{
-                            FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
-                        }
-                    }
-
                     string url = Context.MediaUrl;
-                    string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url) ?? Path.GetRandomFileName());
 
                     control.InvokeAsyncSafe(() => {
-                        if (File.Exists(file)){
-                            ViewImage(file);
-                        }
-                        else{
+                        TwitterUtils.ViewImage(url, ImageQuality);
                         analytics.AnalyticsFile.ViewedImages.Trigger();
-
-                            BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, () => {
-                                ViewImage(file);
-                            }, ex => {
-                                FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
-                            });
-                        }
                     });
                     
                     break;

Core/Handling/KeyboardHandlerBase.cs

@@ -0,0 +1,47 @@
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Other;
+using TweetDuck.Core.Utils;
+
+namespace TweetDuck.Core.Handling{
+    class KeyboardHandlerBase : IKeyboardHandler{
+        protected virtual bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I){
+                if (BrowserUtils.HasDevTools){
+                    browser.ShowDevTools();
+                }
+                else{
+                    browserControl.AsControl().InvokeSafe(() => {
+                        string extraMessage;
+                        
+                        if (Program.IsPortable){
+                            extraMessage = "Please download the portable installer, select the folder with your current installation of TweetDuck Portable, and tick 'Install dev tools' during the installation process.";
+                        }
+                        else{
+                            extraMessage = "Please download the installer, and tick 'Install dev tools' during the installation process. The installer will automatically find and update your current installation of TweetDuck.";
+                        }
+
+                        FormMessage.Information("Dev Tools", "You do not have dev tools installed. "+extraMessage, FormMessage.OK);
+                    });
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
+            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
+                return HandleRawKey(browserControl, browser, (Keys)windowsKeyCode, modifiers);
+            }
+
+            return false;
+        }
+
+        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
+            return false;
+        }
+    }
+}

Core/Handling/KeyboardHandlerBrowser.cs

@@ -2,19 +2,19 @@
 using CefSharp;
 
 namespace TweetDuck.Core.Handling{
-    sealed class KeyboardHandlerBrowser : IKeyboardHandler{
+    sealed class KeyboardHandlerBrowser : KeyboardHandlerBase{
         private readonly FormBrowser form;
 
         public KeyboardHandlerBrowser(FormBrowser form){
             this.form = form;
         }
 
-        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            return type == KeyType.RawKeyDown && form.ProcessBrowserKey((Keys)windowsKeyCode);
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
+                return true;
             }
 
-        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
-            return false;
+            return form.ProcessBrowserKey(key);
         }
     }
 }

Core/Handling/KeyboardHandlerNotification.cs

@@ -4,7 +4,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 
 namespace TweetDuck.Core.Handling {
-    sealed class KeyboardHandlerNotification : IKeyboardHandler{
+    sealed class KeyboardHandlerNotification : KeyboardHandlerBase{
         private readonly FormNotificationBase notification;
 
         public KeyboardHandlerNotification(FormNotificationBase notification){
@@ -15,9 +15,12 @@ namespace TweetDuck.Core.Handling {
             notification.InvokeAsyncSafe(notification.AnalyticsFile.NotificationKeyboardShortcuts.Trigger);
         }
 
-        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
-                switch((Keys)windowsKeyCode){
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
+                return true;
+            }
+
+            switch(key){
                 case Keys.Enter:
                     notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
                     TriggerKeyboardShortcutAnalytics();
@@ -32,14 +35,10 @@ namespace TweetDuck.Core.Handling {
                     notification.InvokeAsyncSafe(() => notification.FreezeTimer = !notification.FreezeTimer);
                     TriggerKeyboardShortcutAnalytics();
                     return true;
-                }
-            }
 
+                default:
                     return false;
             }
-
-        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
-            return false;
         }
     }
 }

Core/Handling/RequestHandlerBase.cs

@@ -1,4 +1,8 @@
-using System.Collections.Specialized;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text.RegularExpressions;
 using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
@@ -6,6 +10,36 @@ using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
+        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$", RegexOptions.Compiled);
+        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
+
+        public static void LoadResourceRewriteRules(string rules){
+            if (string.IsNullOrEmpty(rules)){
+                return;
+            }
+
+            TweetDeckHashes.Clear();
+
+            foreach(string rule in rules.Replace(" ", "").ToLower().Split(',')){
+                string[] split = rule.Split('=');
+
+                if (split.Length == 2){
+                    string key = split[0];
+                    string hash = split[1];
+
+                    if (hash.All(chr => char.IsDigit(chr) || (chr >= 'a' && chr <= 'f'))){
+                        TweetDeckHashes.Add(key, hash);
+                    }
+                    else{
+                        throw new ArgumentException("Invalid hash characters: "+rule);
+                    }
+                }
+                else{
+                    throw new ArgumentException("A rule must have exactly one '=' character: "+rule);
+                }
+            }
+        }
+
         private readonly bool autoReload;
 
         public RequestHandlerBase(bool autoReload){
@@ -26,6 +60,26 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
         }
 
+        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if ((request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet) && TweetDeckHashes.Count > 0){
+                string url = request.Url;
+                Match match = TweetDeckResourceUrl.Match(url);
+
+                if (match.Success && TweetDeckHashes.TryGetValue($"{match.Groups[1]}.{match.Groups[3]}", out string hash)){
+                    if (match.Groups[2].Value == hash){
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Accepting " + url);
+                    }
+                    else{
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Replacing " + url + " hash with " + hash);
+                        request.Url = TweetDeckResourceUrl.Replace(url, $"/dist/$1.{hash}.$3");
+                        return true;
+                    }
+                }
+            }
+
+            return base.OnResourceResponse(browserControl, browser, frame, request, response);
+        }
+        
         public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
             if (autoReload){
                 browser.Reload();

Core/Handling/RequestHandlerBrowser.cs

@@ -1,27 +1,36 @@
-// Uncomment to force TweetDeck to load a predefined version of the vendor/bundle scripts
-// #define FREEZE_TWEETDECK_SCRIPTS
-
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 using CefSharp;
 using TweetDuck.Core.Handling.Filters;
 using TweetDuck.Core.Utils;
 
-#if FREEZE_TWEETDECK_SCRIPTS
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-#endif
-
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
+        private const string UrlVendorResource = "/dist/vendor";
+        private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";
+
         public string BlockNextUserNavUrl { get; set; }
 
         public RequestHandlerBrowser() : base(true){}
 
         public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){
+            if (request.ResourceType == ResourceType.MainFrame){
+                if (request.Url.EndsWith("//twitter.com/")){
+                    request.Url = TwitterUtils.TweetDeckURL; // redirect plain twitter.com requests, fixes bugs with login 2FA
+                }
+            }
+            else if (request.ResourceType == ResourceType.Script){
+                string url = request.Url;
+
+                if (url.Contains("analytics.")){
                     callback.Dispose();
                     return CefReturnValue.Cancel;
                 }
+                else if (url.Contains(UrlVendorResource)){
+                    NameValueCollection headers = request.Headers;
+                    headers["Accept-Encoding"] = "identity";
+                    request.Headers = headers;
+                }
+            }
 
             return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
         }
@@ -36,59 +45,19 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
         }
 
-        #if FREEZE_TWEETDECK_SCRIPTS
-        private static readonly Regex TweetDeckScriptUrl = new Regex(@"/dist/(.*?)\.(.*?)\.js$", RegexOptions.Compiled);
-        
-        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(2){
-            { "vendor", "942c0a20e8" },
-            { "bundle", "1bd75b5854" }
-        };
-        #endif
-
         public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Image && request.Url.Contains("/backgrounds/spinner_blue")){
+            if (request.ResourceType == ResourceType.Image && request.Url.Contains(UrlLoadingSpinner)){
                 request.Url = TwitterUtils.LoadingSpinner.Url;
                 return true;
             }
-            #if FREEZE_TWEETDECK_SCRIPTS
-            else if (request.ResourceType == ResourceType.Script){
-                Match match = TweetDeckScriptUrl.Match(request.Url);
-
-                if (match.Success && TweetDeckHashes.TryGetValue(match.Groups[1].Value, out string hash)){
-                    if (match.Groups[2].Value == hash){
-                        System.Diagnostics.Debug.WriteLine($"accepting {request.Url}");
-                    }
-                    else{
-                        System.Diagnostics.Debug.WriteLine($"rewriting {request.Url} to {hash}");
-                        request.Url = TweetDeckScriptUrl.Replace(request.Url, "/dist/$1."+hash+".js");
-                        return true;
-                    }
-                }
-            }
-            #endif
 
             return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }
 
         public override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Script && request.Url.Contains("/dist/vendor")){
-                NameValueCollection headers = response.ResponseHeaders;
-
-                if (int.TryParse(headers["x-ton-expected-size"], out int totalBytes)){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains(UrlVendorResource) && int.TryParse(response.ResponseHeaders["Content-Length"], out int totalBytes)){
                 return new ResponseFilterVendor(totalBytes);
             }
-                #if DEBUG
-                else{
-                    System.Diagnostics.Debug.WriteLine($"Missing uncompressed size header in {request.Url}");
-
-                    foreach(string key in headers){
-                        System.Diagnostics.Debug.WriteLine($" {key}: {headers[key]}");
-                    }
-
-                    System.Diagnostics.Debugger.Break();
-                }
-                #endif
-            }
 
             return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
         }

Core/Handling/ResourceHandlerFactory.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Concurrent;
+using CefSharp;
+using TweetDuck.Data;
+
+namespace TweetDuck.Core.Handling{
+    sealed class ResourceHandlerFactory : IResourceHandlerFactory{
+        public bool HasHandlers => !handlers.IsEmpty;
+
+        private readonly ConcurrentDictionary<string, IResourceHandler> handlers = new ConcurrentDictionary<string, IResourceHandler>(StringComparer.OrdinalIgnoreCase);
+
+        public IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request){
+            try{
+                return handlers.TryGetValue(request.Url, out IResourceHandler handler) ? handler : null;
+            }finally{
+                request.Dispose();
+            }
+        }
+
+        // registration
+
+        public bool RegisterHandler(string url, IResourceHandler handler){
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
+                handlers.AddOrUpdate(uri.AbsoluteUri, handler, (key, prev) => handler);
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool RegisterHandler(ResourceLink link){
+            return RegisterHandler(link.Url, link.Handler);
+        }
+
+        public bool UnregisterHandler(string url){
+            return handlers.TryRemove(url, out IResourceHandler _);
+        }
+
+        public bool UnregisterHandler(ResourceLink link){
+            return UnregisterHandler(link.Url);
+        }
+    }
+}

Core/Management/BrowserCache.cs

@@ -54,6 +54,14 @@ namespace TweetDuck.Core.Management{
             RefreshTimer();
         }
 
+        public static void TryClearNow(){
+            try{
+                Directory.Delete(CacheFolder, true);
+            }catch{
+                // welp, too bad
+            }
+        }
+
         public static void Exit(){
             if (AutoClearTimer != null){
                 AutoClearTimer.Dispose();
@@ -61,11 +69,7 @@ namespace TweetDuck.Core.Management{
             }
 
             if (ClearOnExit){
-                try{
-                    Directory.Delete(CacheFolder, true);
-                }catch{
-                    // welp, too bad
-                }
+                TryClearNow();
             }
         }
     }

Core/Management/VideoPlayer.cs

@@ -40,7 +40,7 @@ namespace TweetDuck.Core.Management{
 
                 if ((process = Process.Start(new ProcessStartInfo{
                     FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
-                    Arguments = $"{owner.Handle} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
+                    Arguments = $"{owner.Handle} {(int)Math.Floor(100F*owner.GetDPIScale())} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 })) != null){
@@ -135,7 +135,7 @@ namespace TweetDuck.Core.Management{
 
         private void process_OutputDataReceived(object sender, DataReceivedEventArgs e){
             if (!string.IsNullOrEmpty(e.Data)){
-                Program.Reporter.Log("[VideoPlayer] "+e.Data);
+                Program.Reporter.LogVerbose("[VideoPlayer] "+e.Data);
             }
         }
 

Core/Notification/FormNotificationBase.cs

@@ -33,7 +33,7 @@ namespace TweetDuck.Core.Notification{
                     screen = Screen.AllScreens[Config.NotificationDisplay-1];
                 }
                 else{
-                    screen = Screen.FromControl(owner);
+                    screen = Screen.FromControl(owner); // TODO may be disposed?
                 }
             
                 int edgeDist = Config.NotificationEdgeDistance;
@@ -121,18 +121,20 @@ namespace TweetDuck.Core.Notification{
             this.owner = owner;
             this.owner.FormClosed += owner_FormClosed;
 
+            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            resourceHandlerFactory.RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
+            resourceHandlerFactory.RegisterHandler(TweetNotification.AppLogo);
+
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase(false)
+                RequestHandler = new RequestHandlerBase(false),
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             this.browser.Dock = DockStyle.None;
             this.browser.ClientSize = ClientSize;
-            
-            this.browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
-            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
             this.browser.SetupZoomEvents();
 
             Controls.Add(browser);

Core/Other/FormGuide.cs

@@ -64,11 +64,16 @@ namespace TweetDuck.Core.Other{
             Size = new Size(owner.Size.Width*3/4, owner.Size.Height*3/4);
             VisibleChanged += (sender, args) => this.MoveToCenter(owner);
 
+            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            resourceHandlerFactory.RegisterHandler(DummyPage);
+            
             this.browser = new ChromiumWebBrowser(url){
                 MenuHandler = new ContextMenuGuide(owner),
                 JsDialogHandler = new JavaScriptDialogHandler(),
+                KeyboardHandler = new KeyboardHandlerBase(),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase(true)
+                RequestHandler = new RequestHandlerBase(true),
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             browser.LoadingStateChanged += browser_LoadingStateChanged;
@@ -77,8 +82,6 @@ namespace TweetDuck.Core.Other{
             browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
-
-            browser.SetupResourceHandler(DummyPage);
             browser.SetupZoomEvents();
 
             Controls.Add(browser);

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -33,6 +33,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
         
         private readonly PluginManager plugins;
         private readonly Dictionary<CheckBox, ProfileManager.Items> checkBoxMap = new Dictionary<CheckBox, ProfileManager.Items>(4);
+        private readonly bool openImportImmediately;
 
         private State currentState;
         private ProfileManager importManager;
@@ -51,6 +52,8 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             this.checkBoxMap[cbSession] = ProfileManager.Items.Session;
             this.checkBoxMap[cbPluginData] = ProfileManager.Items.PluginData;
 
+            this.openImportImmediately = openImportImmediately;
+
             if (openImportImmediately){
                 radioImport.Checked = true;
                 btnContinue_Click(null, EventArgs.Empty);
@@ -88,6 +91,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                             Filter = "TweetDuck Profile (*.tdsettings)|*.tdsettings"
                         }){
                             if (dialog.ShowDialog() != DialogResult.OK){
+                                if (openImportImmediately){
+                                    Close();
+                                }
+
                                 return;
                             }
 

Core/TweetDeckBrowser.cs

@@ -19,6 +19,9 @@ namespace TweetDuck.Core{
     sealed class TweetDeckBrowser : IDisposable{
         private static UserConfig Config => Program.Config.User;
 
+        private const string ErrorUrl = "http://td/error";
+        private const string TwitterStyleUrl = "https://abs.twimg.com/tduck/css";
+
         public bool Ready { get; private set; }
 
         public bool Enabled{
@@ -39,10 +42,14 @@ namespace TweetDuck.Core{
         }
         
         private readonly ChromiumWebBrowser browser;
+        private readonly ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
 
         private string prevSoundNotificationPath = null;
 
         public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
+            resourceHandlerFactory.RegisterHandler(TweetNotification.AppLogo);
+            resourceHandlerFactory.RegisterHandler(TwitterUtils.LoadingSpinner);
+
             RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
             
             this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
@@ -52,7 +59,8 @@ namespace TweetDuck.Core{
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 KeyboardHandler = new KeyboardHandlerBrowser(owner),
                 LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = requestHandler
+                RequestHandler = requestHandler,
+                ResourceHandlerFactory = resourceHandlerFactory
             };
 
             this.browser.LoadingStateChanged += browser_LoadingStateChanged;
@@ -66,9 +74,6 @@ namespace TweetDuck.Core{
             this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             this.browser.Dock = DockStyle.None;
             this.browser.Location = ControlExtensions.InvisibleLocation;
-
-            this.browser.SetupResourceHandler(TweetNotification.AppLogo);
-            this.browser.SetupResourceHandler(TwitterUtils.LoadingSpinner);
             this.browser.SetupZoomEvents();
             
             owner.Controls.Add(browser);
@@ -117,12 +122,17 @@ namespace TweetDuck.Core{
 
             if (frame.IsMain){
                 if (TwitterUtils.IsTwitterWebsite(frame)){
+                    string css = ScriptLoader.LoadResource("styles/twitter.css", browser);
+                    resourceHandlerFactory.RegisterHandler(TwitterStyleUrl, ResourceHandler.FromString(css, mimeType: "text/css"));
+
                     ScriptLoader.ExecuteFile(frame, "twitter.js", browser);
                 }
                 
+                if (!TwitterUtils.IsTwitterLogin2FactorWebsite(frame)){
                     frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
                 }
             }
+        }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             IFrame frame = e.Frame;
@@ -149,6 +159,10 @@ namespace TweetDuck.Core{
 
                 ScriptLoader.ExecuteFile(frame, "update.js", browser);
             }
+
+            if (frame.Url == ErrorUrl){
+                resourceHandlerFactory.UnregisterHandler(ErrorUrl);
+            }
         }
 
         private void browser_LoadError(object sender, LoadErrorEventArgs e){
@@ -160,7 +174,8 @@ namespace TweetDuck.Core{
                 string errorPage = ScriptLoader.LoadResourceSilent("pages/error.html");
 
                 if (errorPage != null){
-                    browser.LoadHtml(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode)), "http://td/error");
+                    resourceHandlerFactory.RegisterHandler(ErrorUrl, ResourceHandler.FromString(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode))));
+                    browser.Load(ErrorUrl);
                 }
             }
         }
@@ -176,8 +191,14 @@ namespace TweetDuck.Core{
             string newNotificationPath = Config.NotificationSoundPath;
             
             if (prevSoundNotificationPath != newNotificationPath){
-                browser.SetupResourceHandler(soundUrl, hasCustomSound ? SoundNotification.CreateFileHandler(newNotificationPath) : null);
                 prevSoundNotificationPath = newNotificationPath;
+
+                if (hasCustomSound){
+                    resourceHandlerFactory.RegisterHandler(soundUrl, SoundNotification.CreateFileHandler(newNotificationPath));
+                }
+                else{
+                    resourceHandlerFactory.UnregisterHandler(soundUrl);
+                }
             }
 
             browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Config.NotificationSoundVolume);

Core/Utils/BrowserUtils.cs

@@ -8,7 +8,6 @@ using System.Windows.Forms;
 using CefSharp.WinForms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
-using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
@@ -60,21 +59,6 @@ namespace TweetDuck.Core.Utils{
             return (ChromiumWebBrowser)browserControl;
         }
 
-        public static void SetupResourceHandler(this ChromiumWebBrowser browser, string url, IResourceHandler handler){
-            DefaultResourceHandlerFactory factory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
-
-            if (handler == null){
-                factory.UnregisterHandler(url);
-            }
-            else{
-                factory.RegisterHandler(url, handler);
-            }
-        }
-
-        public static void SetupResourceHandler(this ChromiumWebBrowser browser, ResourceLink resource){
-            browser.SetupResourceHandler(resource.Url, resource.Handler);
-        }
-
         public static void SetupZoomEvents(this ChromiumWebBrowser browser){
             void UpdateZoomLevel(object sender, EventArgs args){
                 SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
@@ -207,9 +191,13 @@ namespace TweetDuck.Core.Utils{
             return client;
         }
 
-        public static WebClient DownloadFileAsync(string url, string target, Action onSuccess, Action<Exception> onFailure){
+        public static WebClient DownloadFileAsync(string url, string target, string cookie, Action onSuccess, Action<Exception> onFailure){
             WebClient client = CreateWebClient();
 
+            if (cookie != null){
+                client.Headers[HttpRequestHeader.Cookie] = cookie;
+            }
+
             client.DownloadFileCompleted += (sender, args) => {
                 if (args.Cancelled){
                     try{

Core/Utils/TwitterUtils.cs

@@ -4,15 +4,19 @@ using System.Drawing;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using TweetDuck.Core.Management;
 using TweetDuck.Core.Other;
 using TweetDuck.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using Cookie = CefSharp.Cookie;
 
 namespace TweetDuck.Core.Utils{
     static class TwitterUtils{
         public const string TweetDeckURL = "https://tweetdeck.twitter.com";
 
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
-        public const string BackgroundColorOverride = "setTimeout(function f(){let h=document.head;if(!h){setTimeout(f,5);return;}let e=document.createElement('style');e.innerHTML='body,body::before{background:#1c6399!important}';h.appendChild(e);},1)";
+        public const string BackgroundColorOverride = "setTimeout(function f(){let h=document.head;if(!h){setTimeout(f,5);return;}let e=document.createElement('style');e.innerHTML='body,body::before{background:#1c6399!important;margin:0}';h.appendChild(e);},1)";
 
         public static readonly ResourceLink LoadingSpinner = new ResourceLink("https://ton.twimg.com/tduck/spinner", ResourceHandler.FromByteArray(Properties.Resources.spinner, "image/apng"));
         
@@ -39,6 +43,10 @@ namespace TweetDuck.Core.Utils{
             return frame.Url.Contains("//twitter.com/");
         }
 
+        public static bool IsTwitterLogin2FactorWebsite(IFrame frame){
+            return frame.Url.Contains("//twitter.com/account/login_verification");
+        }
+
         private static string ExtractMediaBaseLink(string url){
             int slash = url.LastIndexOf('/');
             return slash == -1 ? url : StringUtils.ExtractBefore(url, ':', slash);
@@ -48,7 +56,10 @@ namespace TweetDuck.Core.Utils{
             if (quality == ImageQuality.Orig){
                 string result = ExtractMediaBaseLink(url);
 
-                if (result != url || url.Contains("//pbs.twimg.com/media/")){
+                if (url.Contains("//ton.twitter.com/") && url.Contains("/ton/data/dm/")){
+                    result += ":large";
+                }
+                else if (result != url || url.Contains("//pbs.twimg.com/media/")){
                     result += ":orig";
                 }
 
@@ -63,6 +74,32 @@ namespace TweetDuck.Core.Utils{
             return BrowserUtils.GetFileNameFromUrl(ExtractMediaBaseLink(url));
         }
 
+        public static void ViewImage(string url, ImageQuality quality){
+            void ViewImageInternal(string path){
+                string ext = Path.GetExtension(path);
+
+                if (ValidImageExtensions.Contains(ext)){
+                    WindowsUtils.OpenAssociatedProgram(path);
+                }
+                else{
+                    FormMessage.Error("Image Download", "Invalid file extension "+ext, FormMessage.OK);
+                }
+            }
+
+            string file = Path.Combine(BrowserCache.CacheFolder, GetImageFileName(url) ?? Path.GetRandomFileName());
+            
+            if (WindowsUtils.FileExistsAndNotEmpty(file)){
+                ViewImageInternal(file);
+            }
+            else{
+                DownloadFileAuth(GetMediaLink(url, quality), file, () => {
+                    ViewImageInternal(file);
+                }, ex => {
+                    FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                });
+            }
+        }
+        
         public static void DownloadImage(string url, string username, ImageQuality quality){
             DownloadImages(new string[]{ url }, username, quality);
         }
@@ -91,14 +128,14 @@ namespace TweetDuck.Core.Utils{
                     }
 
                     if (urls.Length == 1){
-                        BrowserUtils.DownloadFileAsync(firstImageLink, dialog.FileName, null, OnFailure);
+                        DownloadFileAuth(firstImageLink, dialog.FileName, null, OnFailure);
                     }
                     else{
                         string pathBase = Path.ChangeExtension(dialog.FileName, null);
                         string pathExt = Path.GetExtension(dialog.FileName);
 
                         for(int index = 0; index < urls.Length; index++){
-                            BrowserUtils.DownloadFileAsync(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
+                            DownloadFileAuth(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
                         }
                     }
                 }
@@ -117,11 +154,33 @@ namespace TweetDuck.Core.Utils{
                 Filter = "Video"+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
-                    BrowserUtils.DownloadFileAsync(url, dialog.FileName, null, ex => {
+                    DownloadFileAuth(url, dialog.FileName, null, ex => {
                         FormMessage.Error("Video Download", "An error occurred while downloading the video: "+ex.Message, FormMessage.OK);
                     });
                 }
             }
         }
+
+        private static void DownloadFileAuth(string url, string target, Action onSuccess, Action<Exception> onFailure){
+            const string AuthCookieName = "auth_token";
+
+            TaskScheduler scheduler = TaskScheduler.FromCurrentSynchronizationContext();
+
+            using(ICookieManager cookies = Cef.GetGlobalCookieManager()){
+                cookies.VisitUrlCookiesAsync(url, true).ContinueWith(task => {
+                    string cookieStr = null;
+
+                    if (task.Status == TaskStatus.RanToCompletion){
+                        Cookie found = task.Result?.Find(cookie => cookie.Name == AuthCookieName); // the list may be null
+
+                        if (found != null){
+                            cookieStr = $"{found.Name}={found.Value}";
+                        }
+                    }
+
+                    BrowserUtils.DownloadFileAsync(url, target, cookieStr, onSuccess, onFailure);
+                }, scheduler);
+            }
+        }
     }
 }

Core/Utils/WindowsUtils.cs

@@ -66,6 +66,14 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
+        public static bool FileExistsAndNotEmpty(string path){
+            try{
+                return new FileInfo(path).Length > 0;
+            }catch{
+                return false;
+            }
+        }
+
         public static bool OpenAssociatedProgram(string file, string arguments = "", bool runElevated = false){
             try{
                 using(Process.Start(new ProcessStartInfo{

Program.cs

@@ -9,6 +9,7 @@ using System.Threading;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core;
+using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Management;
@@ -20,7 +21,7 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.16";
+        public const string VersionTag = "1.17.3";
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
@@ -126,6 +127,14 @@ namespace TweetDuck{
 
             if (Arguments.HasFlag(Arguments.ArgUpdated)){
                 WindowsUtils.TryDeleteFolderWhenAble(InstallerPath, 8000);
+                BrowserCache.TryClearNow();
+            }
+            
+            try{
+                RequestHandlerBase.LoadResourceRewriteRules(Arguments.GetValue(Arguments.ArgFreeze, null));
+            }catch(Exception e){
+                FormMessage.Error("Resource Freeze", "Error parsing resource rewrite rules: "+e.Message, FormMessage.OK);
+                return;
             }
 
             BrowserCache.RefreshTimer();

README.md

@@ -45,7 +45,7 @@ If you decide to publicly release a custom version, please make it clear that it
   - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
 
 #### Error: The "EmbedAllSources" parameter is not supported by the "Csc" task
-1. Open `C:\Program Files (x86)\Visual Studio\2017\<edition>\MSBuild\15.0\Bin\Microsoft.CSharp.CurrentVersion.targets` in a text editor
+1. Open `C:\Program Files (x86)\Visual Studio\2017\<edition>\MSBuild\15.0\Bin\Roslyn\Microsoft.CSharp.Core.targets` in a text editor
 2. Remove line that says `EmbedAllSources="$(EmbedAllSources)"`
 3. Hope the next Visual Studio update fixes it...
 

Reporter.cs

@@ -4,6 +4,7 @@ using System.Drawing;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
 
 namespace TweetDuck{
@@ -22,7 +23,11 @@ namespace TweetDuck{
             };
         }
 
-        public bool Log(string data){
+        public bool LogVerbose(string data){
+            return Arguments.HasFlag(Arguments.ArgLogging) && LogImportant(data);
+        }
+
+        public bool LogImportant(string data){
             #if DEBUG
             Debug.WriteLine(data);
             #endif
@@ -45,7 +50,7 @@ namespace TweetDuck{
         }
 
         public void HandleException(string caption, string message, bool canIgnore, Exception e){
-            bool loggedSuccessfully = Log(e.ToString());
+            bool loggedSuccessfully = LogImportant(e.ToString());
             
             string exceptionText = e is ExpandedLogException ? e.Message+"\n\nDetails with potentially sensitive information are in the Error Log." : e.Message;
             FormMessage form = new FormMessage(caption, message+"\nError: "+exceptionText, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);

Resources/Plugins/clear-columns/browser.js

@@ -110,16 +110,27 @@ enabled(){
   
   // styles
   
+  if (!document.getElementById("td-clearcolumns-workaround")){
+    // TD started caching mustaches so disabling the plugin doesn't update the column headers properly...
+    let workaround = document.createElement("style");
+    workaround.id = "td-clearcolumns-workaround";
+    workaround.innerText = "#tduck a[data-action='td-clearcolumns-dosingle'] { display: none }";
+    document.head.appendChild(workaround);
+  }
+  
   this.css = window.TDPF_createCustomStyle(this);
+  
   this.css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
-  this.css.insert(".column-header-links { min-width: 51px !important; }");
-  this.css.insert("[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
   this.css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
   this.css.insert(".column-navigator-overflow { bottom: 224px !important; }");
-  this.css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
-  this.css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
-  this.css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
-  this.css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
+  
+  this.css.insert(".column-header-links { min-width: 51px !important; }");
+  this.css.insert(".column[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
+  this.css.insert(".btn-options-tray[data-action='clear'] { display: none !important; }");
+  
+  this.css.insert("#tduck a[data-action='td-clearcolumns-dosingle'] { display: inline-block; }");
+  this.css.insert("#tduck .column[data-td-icon='icon-schedule'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
+  this.css.insert("#tduck .column[data-td-icon='icon-custom-timeline'] a[data-action='td-clearcolumns-dosingle'] { display: none; }");
 }
 
 ready(){

Resources/Plugins/edit-design/browser.js

@@ -14,6 +14,7 @@ enabled(){
     themeColorTweaks: true,
     revertIcons: true,
     showCharacterCount: true,
+    forceArialFont: true,
     increaseQuoteTextSize: false,
     smallComposeTextSize: false,
     optimizeAnimations: true,
@@ -254,7 +255,7 @@ enabled(){
       
       setTimeout(function(){
         if (theme != TD.settings.getTheme()){
-          $(document).trigger("uiToggleTheme");
+          TD.settings.setTheme(theme);
         }
         
         me.saveConfig();
@@ -430,6 +431,11 @@ enabled(){
       this.css.insert("#tduck .tweet-actions > li:nth-child(4) { margin-right: 2px !important }");
     }
     
+    if (this.config.forceArialFont){
+      this.css.insert("#tduck { font-family: Arial, sans-serif; font-weight: 400 }");
+      this.css.insert("#tduck input, #tduck label, #tduck select, #tduck textarea { font-family: Arial }")
+    }
+    
     if (this.config.increaseQuoteTextSize){
       this.css.insert(".quoted-tweet { font-size: 1em !important }");
     }
@@ -536,11 +542,13 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
 .app-search-fake .icon { margin-top: -3px !important }
-#tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
 #tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
+#tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
+#tduck .compose-media-bar-remove .icon-close, #tduck .compose-media-grid-remove .icon-close { padding: 3px 2px 1px !important }
 
 .js-column-header .column-type-icon { margin-top: 0 !important }
 .inline-reply .pull-left .Button--link { margin-top: 3px !important }
+.js-inline-compose-pop .icon-popout { font-size: 23px !important }
 
 .tweet-action-item .icon-favorite-toggle { font-size: 16px !important; }
 .tweet-action-item .heartsprite { top: -260% !important; left: -260% !important; transform: scale(0.4, 0.39) translateY(0.5px) !important; }
@@ -595,6 +603,10 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 html[data-td-font] { font-size: ${this.config.fontSize} !important }
 .avatar { border-radius: ${this.config.avatarRadius}% !important }
 
+${this.config.forceArialFont ? `
+#tduck { font-family: Arial, sans-serif; font-weight: 400 }
+` : ``}
+
 ${this.config.increaseQuoteTextSize ? `
 .quoted-tweet { font-size: 1em !important }
 ` : ``}

Resources/Plugins/edit-design/modal.html

@@ -69,6 +69,10 @@
             <option value="custom-px">Custom</option>
             <option value="change-custom-px">Change custom value...</option>
           </select>
+          <label class="checkbox">
+            <input data-td-key="forceArialFont" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Use Arial as default font
+          </label>
           <label class="checkbox">
             <input data-td-key="increaseQuoteTextSize" class="js-theme-checkbox touch-larger-label" type="checkbox">
             Increase quoted tweet font size
@@ -169,12 +173,23 @@
   #edit-design-panel {
     width: 693px;
     height: 380px;
+    background-color: #FFF;
+    box-shadow: 0 0 10px rgba(17, 17, 17, 0.5);
+  }
+  
+  #edit-design-panel .mdl-header {
+    color: #8899A6;
   }
   
   #edit-design-panel .mdl-inner {
     padding-top: 0;
   }
   
+  #edit-design-panel .mdl-content {
+    border: 1px solid #CCD6DD;
+    background: #EAEAEA;
+  }
+  
   #edit-design-panel-inner-cols {
     padding: 0 6px;
   }

Resources/Plugins/edit-design/theme.black.css

@@ -117,7 +117,7 @@ html.dark .account-settings-bt{border-top:1px solid #e1e8ed}
 html.dark .account-settings-bb{border-bottom:1px solid #e1e8ed}
 html.dark .account-stats a{color:#66757f}
 html.dark .account-stats a:hover{color:#2b7bb9}
-html.dark .column{background-color:#222426}
+html.dark .column-panel{background-color:#222426}
 html.dark .column.is-focused{box-shadow:0 0 0 6px #7aa2c0}
 html.dark .column-background-fill{background-color:#F5F8FA}
 html.dark .more-tweets-glow{background-color:#55acee;background:radial-gradient(ellipse farthest-corner at 50% 100%,#55acee 0%,#55acee 25%,rgba(255,255,255,0) 75%)}
@@ -135,7 +135,6 @@ html.dark .column-header{background-color:#292F33}
 html.dark .is-inverted-dark .column-header{border-bottom:1px solid #ddd}
 html.dark .is-inverted-dark .column-title-edit-box{color:#111;background-color:#fff;border-color:#e1e8ed}
 html.dark .column-header{border-bottom:1px solid #222426}
-html.dark .column-header-temp{border-bottom:1px solid #ddd}
 html.dark .column-title-edit-box{color:#e1e8ed;background-color:#14171A;border-color:#111}
 html.dark .column-number{color:#66757f}
 html.dark .is-new .column-type-icon{color:#55acee}
@@ -428,8 +427,7 @@ html.dark .list-account .username{color:#8899a6}
 html.dark .list-listmember .username{color:#8899a6}
 html.dark .list-listmember .bio{color:#657786}
 html.dark .divider-bar{background-color:#ddd}
-html.dark select{background-color:#fff}
-html.dark input,html.dark textarea,html.dark select{color:#111;border:1px solid #e1e8ed}
+html.dark input,html.dark textarea,html.dark select{color:#111;border:1px solid #e1e8ed;background-color:#fff}
 html.dark input:disabled{background-color:#eaeaea;border-color:#e1e8ed}
 html.dark select:disabled{background-color:#f5f8fa}
 html.dark input:focus,html.dark select:focus,html.dark textarea:focus,html.dark .focus{border-color:rgba(80,165,230,0.8);box-shadow:inset 0 1px 3px rgba(17,17,17,0.1),0 0 8px rgba(80,165,230,0.6)}
@@ -802,5 +800,10 @@ html.dark .NotificationList .Notification-body{color:#14171A}
 html.dark .DrawerModal{color:#14171A}
 /* fixes */
 html.dark .app-search-fake{border-color:transparent}
-html.dark .spinner-small,html.dark .spinner-large{filter:grayscale(80%)brightness(93%)}
+html.dark .spinner-small,html.dark .spinner-large{filter:grayscale(85%)brightness(117%)}
 html.dark .tweet>.color-twitter-blue{color:#8bd!important}
+html.dark .hw-card-container>div{border-color:#292F33;background:transparent}
+html.dark .hw-card-container>div>div{border-color:#292F33}
+html.dark .modal-content,html.dark .lst-group{color:#292F33}
+html.dark .lst-launcher a span{color:#657786!important}
+html.dark .social-proof-names a{color:#3b94d9}

Resources/Plugins/templates/modal.html

@@ -171,14 +171,14 @@
     }
     
     .template-editor-form input, .template-editor-form textarea {
-      color: #111;
-      background-color: #fff;
+      color: #111 !important;
+      background-color: #fff !important;
       border: none;
       border-radius: 0;
     }
     
     .template-editor-form input:focus, .template-editor-form textarea:focus {
-      box-shadow: inset 0 1px 3px rgba(17, 17, 17, 0.1), 0 0 8px rgba(80, 165, 230, 0.6);
+      box-shadow: inset 0 1px 3px rgba(17, 17, 17, 0.1), 0 0 8px rgba(80, 165, 230, 0.6) !important;
     }
     
     .template-editor-form textarea {

Resources/ScriptLoader.cs

@@ -80,6 +80,10 @@ namespace TweetDuck.Resources{
             }
         }
 
+        public static void ClearCache(){
+            CachedData.Clear();
+        }
+
         private static void ShowLoadError(Control sync, string message){
             sync?.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
         }
@@ -128,7 +132,7 @@ namespace TweetDuck.Resources{
             sw.Stop();
             Debug.WriteLine("Finished rebuild script in "+sw.ElapsedMilliseconds+" ms");
 
-            CachedData.Clear();
+            ClearCache();
 
             // Force update plugin manager setup scripts
 

Resources/Scripts/code.js

@@ -245,6 +245,7 @@
       if (column.model.getHasNotification()){
         let sensitive = isSensitive(tweet);
         let previews = $TDX.notificationMediaPreviews && (!sensitive || TD.settings.getDisplaySensitiveMedia());
+        // TODO new cards don't have either previews or links
         
         let html = $(tweet.render({
           withFooter: false,
@@ -413,7 +414,7 @@
       let fontSizeName = TD.settings.getFontSize();
       let themeName = TD.settings.getTheme();
       
-      let columnBackground = getClassStyleProperty("column", "background-color");
+      let columnBackground = getClassStyleProperty("column-panel", "background-color");
       
       let tags = [
         "<html "+Array.prototype.map.call(document.documentElement.attributes, ele => `${ele.name}="${ele.value}"`).join(" ")+"><head>"
@@ -559,7 +560,7 @@
   execSafe(function setupShortenerBypass(){
     $(document.body).delegate("a[data-full-url]", "click auxclick", function(e){
       if (e.button === 0 || e.button === 1){ // event.which seems to be borked in auxclick
-        $TD.openBrowser($(this).attr("data-full-url"));
+        $TD.openBrowser($(this).attr("data-full-url")); // TODO detect rel="tweet"?
         e.preventDefault();
       }
     });
@@ -574,6 +575,31 @@
       data.setData("text/html", `<a href="${url}">${url}</a>`);
     });
     
+    if (ensurePropertyExists(TD, "services", "TwitterStatus", "prototype", "_generateHTMLText")){
+      TD.services.TwitterStatus.prototype._generateHTMLText = prependToFunction(TD.services.TwitterStatus.prototype._generateHTMLText, function(){
+        let card = this.card;
+        let entities = this.entities;
+        return if !(card && entities);
+        
+        let urls = entities.urls;
+        return if !(urls && urls.length);
+        
+        let shortUrl = card.url;
+        let urlObj = entities.urls.find(obj => obj.url === shortUrl && obj.expanded_url);
+        
+        if (urlObj){
+          let expandedUrl = urlObj.expanded_url;
+          card.url = expandedUrl;
+          
+          let values = card.binding_values;
+          
+          if (values && values.card_url){
+            values.card_url.string_value = expandedUrl;
+          }
+        }
+      });
+    }
+    
     if (ensurePropertyExists(TD, "services", "TwitterMedia", "prototype", "fromMediaEntity")){
       const prevFunc = TD.services.TwitterMedia.prototype.fromMediaEntity;
       
@@ -729,28 +755,35 @@
       return chirp.getMedia().filter(item => !item.isAnimatedGif).map(item => item.entity.media_url_https+":small").join(";");
     };
     
-    app.delegate("section.js-column", {
-      contextmenu: function(){
-        let hovered = getHoveredTweet();
-        return if !hovered;
+    const updateContextInfo = function(chirp){
+      let quote = chirp.quotedTweet;
       
-        let tweet = hovered.obj;
-        let quote = tweet.quotedTweet;
-        
-        if (tweet.chirpType === TD.services.ChirpBase.TWEET){
-          let tweetUrl = tweet.getChirpURL();
+      if (chirp.chirpType === TD.services.ChirpBase.TWEET){
+        let tweetUrl = chirp.getChirpURL();
         let quoteUrl = quote && quote.getChirpURL();
         
-          let chirpAuthors = quote ? [ tweet.getMainUser().screenName, quote.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
-          let chirpImages = tweet.hasImage() ? processMedia(tweet) : quote && quote.hasImage() ? processMedia(quote) : "";
+        let chirpAuthors = quote ? [ chirp.getMainUser().screenName, quote.getMainUser().screenName ].join(";") : chirp.getMainUser().screenName;
+        let chirpImages = chirp.hasImage() ? processMedia(chirp) : quote && quote.hasImage() ? processMedia(quote) : "";
         
         $TD.setRightClickedChirp(tweetUrl || "", quoteUrl || "", chirpAuthors, chirpImages);
       }
-        else if (tweet instanceof TD.services.TwitterActionFollow){
-          $TD.setRightClickedLink("link", tweet.following.getProfileURL());
+      else if (chirp instanceof TD.services.TwitterActionFollow){
+        $TD.setRightClickedLink("link", chirp.following.getProfileURL());
       }
+    };
+    
+    app.delegate("section.js-column", {
+      contextmenu: function(){
+        let hovered = getHoveredTweet();
+        hovered && updateContextInfo(hovered.obj);
       }
     });
+    
+    if (ensurePropertyExists(TD, "services", "TwitterStatus", "prototype", "renderInMediaGallery")){
+      TD.services.TwitterStatus.prototype.renderInMediaGallery = appendToFunction(TD.services.TwitterStatus.prototype.renderInMediaGallery, function(){
+        updateContextInfo(this);
+      });
+    }
   });
   
   //
@@ -1172,6 +1205,8 @@
   //
   execSafe(function setupVideoPlayer(){
     window.TDGF_playVideo = function(url, username){
+      return if !url;
+      
       $('<div id="td-video-player-overlay" class="ovl" style="display:block"></div>').on("click contextmenu", function(){
         $TD.playVideo(null, null);
       }).appendTo(app);

Resources/Scripts/imports/styles/introduction.css

@@ -7,19 +7,30 @@
   min-width: 515px;
   max-width: 835px;
   height: 328px;
+  background-color: #fff;
 }
 
-#td-introduction-modal .mdl-inner {
-  padding-top: 0;
+#td-introduction-modal .mdl-header {
+  color: #8899a6;
 }
 
 #td-introduction-modal .mdl-header-title {
   cursor: default;
 }
 
+#td-introduction-modal .mdl-dismiss {
+  color: #292f33;
+}
+
+#td-introduction-modal .mdl-inner {
+  padding-top: 0;
+}
+
 #td-introduction-modal .mdl-content {
   padding: 4px 16px 0;
   overflow-y: auto;
+  border-color: #ccd6dd;
+  background: #eaeaea;
 }
 
 #td-introduction-modal p {

Resources/Scripts/imports/styles/twitter.logout.css

@@ -1,38 +0,0 @@
-/*****************************/
-/* Fix min width and margins */
-/*****************************/
-
-.page-canvas {
-  width: auto !important;
-  max-width: 888px;
-}
-
-.signout-wrapper {
-  width: auto !important;
-  margin: 0 auto !important;
-}
-
-.signout {
-  margin: 60px 0 54px !important;
-}
-
-.buttons {
-  padding-bottom: 0 !important;
-}
-
-/*******************/
-/* General styling */
-/*******************/
-
-.aside {
-  /* hide elements around dialog */
-  display: none;
-}
-
-.buttons button, .buttons a {
-  /* style buttons */
-  display: inline-block;
-  margin: 0 4px !important;
-  border: 1px solid rgba(0, 0, 0, 0.3) !important;
-  border-radius: 0 !important;
-}

Resources/Scripts/styles/browser.css

@@ -38,19 +38,23 @@
 /* Square-ify stuff */
 /********************/
 
-button, .btn, .mdl, .mdl-content, .popover, .lst-modal, .tooltip-inner {
+#tduck .compose-media-bar-remove .icon-close, #tduck .compose-media-grid-remove .icon-close {
+  border-radius: 2px !important;
+}
+
+button, .btn, .mdl, .mdl-content, .modal-content, .popover, .lst-modal, .tooltip-inner {
   border-radius: 1px !important;
 }
 
-.media-item, .media-preview, .media-image, .js-media-added .br--4, #tduck .compose-message-recipient img {
+.media-item, .media-preview, .media-image, .media-badge, .js-media-sensitive-overlay, .js-media-added .br--4, #tduck .compose-message-recipient img {
   border-radius: 1px !important;
 }
 
-.tweet-button, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .media-grid-container, .js-quote-tweet-holder, .detail-view-inline-text {
+.tweet-button, .app-search-fake, .app-search-input, .compose-text-container, .compose-reply-tweet, .compose-message-recipient-input-container, .compose-message-recipient, .compose-media-bar-holder, .compose-media-bar-thumb, .media-grid-container, .js-add-image-description, .js-quote-tweet-holder, .detail-view-inline-text, .mdl-column-rhs {
   border-radius: 0 !important;
 }
 
-.dropdown-menu, .list-item-last, .quoted-tweet, input, textarea, select, .prf-header {
+.dropdown-menu, .list-item-last, .quoted-tweet, .hw-card-container > div, input, textarea, select, .prf-header {
   border-radius: 0 !important;
 }
 
@@ -253,9 +257,9 @@ a[data-full-url] {
   bottom: 0 !important;
 }
 
-/**********************************************************/
-/* Prevent column icons from being hidden by column title */
-/**********************************************************/
+/**************************************************************************/
+/* Prevent column icons from being hidden by column title & fix alignment */
+/**************************************************************************/
 
 .column-header-title {
   overflow: hidden !important;
@@ -270,9 +274,10 @@ a[data-full-url] {
 
 .column-header-links {
   max-width: 100% !important;
+  text-align: right;
 }
 
-[data-td-icon="icon-message"] .column-header-links {
+.column[data-td-icon="icon-message"] .column-header-links {
   min-width: 86px;
 }
 
@@ -455,18 +460,18 @@ a:not(.tweet-detail-action) .reply-triangle {
 /* Fix cut off usernames in Messages column */
 /********************************************/
 
-[data-td-icon="icon-message"].is-shifted-1 .column-title-container {
+.column[data-td-icon="icon-message"].is-shifted-1 .column-title-container {
   height: 100%;
   border-bottom-color: transparent;
 }
 
-#tduck [data-td-icon="icon-message"].is-shifted-1 .column-title-items {
+#tduck .column[data-td-icon="icon-message"].is-shifted-1 .column-title-items {
   height: 100%;
   margin-left: 4px !important;
   padding-top: 1px;
 }
 
-[data-td-icon="icon-message"].is-shifted-1 .username {
+.column[data-td-icon="icon-message"].is-shifted-1 .username {
   vertical-align: bottom;
 }
 

Resources/Scripts/styles/notification.css

@@ -6,6 +6,7 @@ html, body {
   height: auto !important;
   overflow-x: hidden !important;
   overflow-y: auto !important;
+  margin: 0;
 }
 
 body::before {
@@ -36,7 +37,7 @@ body::before {
 /* Square-ify stuff */
 /********************/
 
-.media-item, .media-preview {
+.media-item, .media-preview, .media-badge {
   border-radius: 1px !important;
 }
 

Resources/Scripts/styles/twitter.css

@@ -25,6 +25,17 @@
   margin: 0 auto !important;
 }
 
+.ResponsiveLayout {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+}
+
+.Section {
+  padding: 36px !important;
+}
+
 /*******************/
 /* General styling */
 /*******************/
@@ -39,7 +50,7 @@ body {
   box-shadow: 0 0 150px rgba(255, 255, 255, 0.3) !important;
 }
 
-.topbar {
+.topbar, .TopNav {
   /* hide top bar */
   display: none !important;
 }
@@ -65,3 +76,42 @@ button[type='submit'] {
   margin-top: 15px !important;
   font-weight: bold !important;
 }
+
+/********************************************/
+/* Fix min width and margins on logout page */
+/********************************************/
+
+html[logout] .page-canvas {
+  width: auto !important;
+  max-width: 888px;
+}
+
+html[logout] .signout-wrapper {
+  width: auto !important;
+  margin: 0 auto !important;
+}
+
+html[logout] .signout {
+  margin: 60px 0 54px !important;
+}
+
+html[logout] .buttons {
+  padding-bottom: 0 !important;
+}
+
+/*******************************/
+/* General logout page styling */
+/*******************************/
+
+html[logout] .aside {
+  /* hide elements around dialog */
+  display: none;
+}
+
+html[logout] .buttons button, html[logout] .buttons a {
+  /* style buttons */
+  display: inline-block;
+  margin: 0 4px !important;
+  border: 1px solid rgba(0, 0, 0, 0.3) !important;
+  border-radius: 0 !important;
+}

Resources/Scripts/twitter.js

@@ -8,15 +8,15 @@
       return;
     }
     
-    let style = document.createElement("style");
+    let link = document.createElement("link");
+    link.rel = "stylesheet";
+    link.href = "https://abs.twimg.com/tduck/css";
     
-    style.innerText = `#import "styles/twitter.base.css"`;
+    document.head.appendChild(link);
     
     if (location.pathname === "/logout"){
-      style.innerText += `#import "styles/twitter.logout.css"`;
+      document.documentElement.setAttribute("logout", "");
     }
-    
-    document.head.appendChild(style);
   };
   
   setTimeout(injectCSS, 1);

TweetDuck.csproj

@@ -1,7 +1,8 @@
 <?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.67.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props')" />
+  <Import Project="packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.Common.67.0.0\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0\build\CefSharp.Common.props')" />
   <Import Project="packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props')" />
   <Import Project="packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -91,10 +92,12 @@
       <DependentUpon>FormBrowser.cs</DependentUpon>
     </Compile>
     <Compile Include="Core\Handling\General\FileDialogHandler.cs" />
+    <Compile Include="Core\Handling\KeyboardHandlerBase.cs" />
     <Compile Include="Core\Handling\KeyboardHandlerBrowser.cs" />
     <Compile Include="Core\Handling\KeyboardHandlerNotification.cs" />
     <Compile Include="Core\Handling\RequestHandlerBase.cs" />
     <Compile Include="Core\Handling\RequestHandlerBrowser.cs" />
+    <Compile Include="Core\Handling\ResourceHandlerFactory.cs" />
     <Compile Include="Core\Handling\ResourceHandlerNotification.cs" />
     <Compile Include="Core\Management\ContextInfo.cs" />
     <Compile Include="Core\Notification\Example\FormNotificationExample.cs">
@@ -424,11 +427,12 @@ IF EXIST "$(ProjectDir)bld\post_build.exe" (
     </PropertyGroup>
     <Error Condition="!Exists('packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3396.1786\build\cef.redist.x64.props'))" />
     <Error Condition="!Exists('packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3396.1786\build\cef.redist.x86.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.67.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.67.0.0\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
   </Target>
-  <Import Project="packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.67.0.0-pre01\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.67.0.0-pre01\build\CefSharp.WinForms.targets')" />
+  <Import Project="packages\CefSharp.Common.67.0.0\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.67.0.0\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.67.0.0\build\CefSharp.WinForms.targets')" />
 </Project>

Updates/UpdateInfo.cs

@@ -26,7 +26,7 @@ namespace TweetDuck.Updates{
         }
 
         public void BeginSilentDownload(){
-            if (File.Exists(InstallerPath)){
+            if (WindowsUtils.FileExistsAndNotEmpty(InstallerPath)){
                 DownloadStatus = UpdateDownloadStatus.Done;
                 return;
             }
@@ -48,7 +48,7 @@ namespace TweetDuck.Updates{
                     return;
                 }
 
-                currentDownload = BrowserUtils.DownloadFileAsync(downloadUrl, InstallerPath, () => {
+                currentDownload = BrowserUtils.DownloadFileAsync(downloadUrl, InstallerPath, null, () => {
                     DownloadStatus = UpdateDownloadStatus.Done;
                     currentDownload = null;
                 }, e => {

bld/gen_upd.iss

@@ -220,14 +220,14 @@ begin
 end;
 
 { Return whether the version of the installed libcef.dll library matches internal one. }
-{ TODO: Remove workaround that forces full installation for 1.15 and older eventually. }
+{ TODO: Remove workaround that forces full installation for 1.16 and older eventually. }
 function TDIsMatchingCEFVersion: Boolean;
 var CEFVersion: String;
 var TDVersionMS: Cardinal;
 var TDVersionLS: Cardinal;
 
 begin
-  if (GetVersionNumbers(UpdatePath+'TweetDuck.exe', TDVersionMS, TDVersionLS)) and ((TDVersionMS and $FFFF) < 16) then
+  if (GetVersionNumbers(UpdatePath+'TweetDuck.exe', TDVersionMS, TDVersionLS)) and ((TDVersionMS and $FFFF) < 17) then
   begin
     Result := False
     Exit

lib/TweetLib.Communication/TweetLib.Communication.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
     <AssemblyName>TweetLib.Communication</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -40,5 +43,14 @@
     <Compile Include="DuplexPipe.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+  </Target>
 </Project>

lib/TweetLib.Communication/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net452" developmentDependency="true" />
+</packages>

lib/TweetTest.System/TweetTest.System.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
@@ -55,6 +58,9 @@
       <Name>TweetDuck</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -75,6 +81,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+  </Target>
   <!-- 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">

lib/TweetTest.System/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net452" developmentDependency="true" />
+</packages>

packages.config

@@ -2,6 +2,7 @@
 <packages>
   <package id="cef.redist.x64" version="3.3396.1786" targetFramework="net452" />
   <package id="cef.redist.x86" version="3.3396.1786" targetFramework="net452" />
-  <package id="CefSharp.Common" version="67.0.0-pre01" targetFramework="net452" />
-  <package id="CefSharp.WinForms" version="67.0.0-pre01" targetFramework="net452" />
+  <package id="CefSharp.Common" version="67.0.0" targetFramework="net452" />
+  <package id="CefSharp.WinForms" version="67.0.0" targetFramework="net452" />
+  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net452" developmentDependency="true" />
 </packages>

subprocess/Program.cs

@@ -1,17 +1,29 @@
 using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
 using CefSharp.BrowserSubprocess;
 
 namespace TweetDuck.Browser{
     static class Program{
-        internal const string Version = "1.4.1.0";
+        internal const string Version = "1.4.2";
 
         private static int Main(string[] args){
             SubProcess.EnableHighDPISupport();
             
-            const string typePrefix = "--type=";
-            string type = Array.Find(args, arg => arg.StartsWith(typePrefix, StringComparison.OrdinalIgnoreCase)).Substring(typePrefix.Length);
+            string FindArg(string key){
+                return Array.Find(args, arg => arg.StartsWith(key, StringComparison.OrdinalIgnoreCase)).Substring(key.Length);
+            }
 
-            if (type == "renderer"){
+            const string typePrefix = "--type=";
+            const string parentIdPrefix = "--host-process-id=";
+
+            if (!int.TryParse(FindArg(parentIdPrefix), out int parentId)){
+                return 0;
+            }
+
+            Task.Factory.StartNew(() => KillWhenHung(parentId), TaskCreationOptions.LongRunning);
+            
+            if (FindArg(typePrefix) == "renderer"){
                 using(SubProcess subProcess = new SubProcess(args)){
                     return subProcess.Run();
                 }
@@ -20,5 +32,18 @@ namespace TweetDuck.Browser{
                 return SubProcess.ExecuteProcess();
             }
         }
+
+        private static async void KillWhenHung(int parentId){
+            try{
+                using(Process process = Process.GetProcessById(parentId)){
+                    process.WaitForExit();
+                }
+            }catch{
+                // ded
+            }
+
+            await Task.Delay(10000);
+            Environment.Exit(0);
+        }
     }
 }

subprocess/TweetDuck.Browser.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +12,8 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
@@ -28,7 +31,7 @@
   <ItemGroup>
     <Reference Include="CefSharp.BrowserSubprocess.Core, Version=67.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CefSharp.Common.67.0.0-pre01\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
+      <HintPath>..\packages\CefSharp.Common.67.0.0\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
@@ -36,9 +39,18 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>call "$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars32.bat"
 editbin /largeaddressaware /TSAWARE "$(TargetPath)"</PostBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+  </Target>
 </Project>

subprocess/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net452" developmentDependency="true" />
+</packages>

video/Controls/LabelTooltip.cs

@@ -19,7 +19,14 @@ namespace TweetDuck.Video.Controls{
                 Form form = control.FindForm();
                 System.Diagnostics.Debug.Assert(form != null);
                 
-                Text = tooltipFunc(args);
+                string text = tooltipFunc(args);
+
+                if (text == null){
+                    Visible = false;
+                    return;
+                }
+
+                Text = text;
 
                 Point loc = form.PointToClient(control.Parent.PointToScreen(new Point(control.Location.X+(followCursor ? args.X : control.Width/2), 0)));
                 loc.X = Math.Max(0, Math.Min(form.Width-Width, loc.X-Width/2));

video/Controls/SeekBar.cs

@@ -30,7 +30,7 @@ namespace TweetDuck.Video.Controls{
                 brushBack.Color = Parent.BackColor;
             }
             
-            Rectangle rect = e.ClipRectangle;
+            Rectangle rect = new Rectangle(0, 0, Width, Height);
             Point cursor = PointToClient(Cursor.Position);
             int width = rect.Width-1;
             int progress = (int)(width*((double)Value/Maximum));

video/FormPlayer.Designer.cs

@@ -26,16 +26,18 @@
             this.components = new System.ComponentModel.Container();
             this.timerSync = new System.Windows.Forms.Timer(this.components);
             this.trackBarVolume = new System.Windows.Forms.TrackBar();
-            this.tablePanel = new System.Windows.Forms.TableLayoutPanel();
+            this.tablePanelFull = new System.Windows.Forms.TableLayoutPanel();
             this.progressSeek = new TweetDuck.Video.Controls.SeekBar();
             this.labelTime = new System.Windows.Forms.Label();
-            this.timerData = new System.Windows.Forms.Timer(this.components);
-            this.labelTooltip = new TweetDuck.Video.Controls.LabelTooltip();
             this.imageResize = new System.Windows.Forms.PictureBox();
             this.imageDownload = new System.Windows.Forms.PictureBox();
             this.imageClose = new System.Windows.Forms.PictureBox();
+            this.timerData = new System.Windows.Forms.Timer(this.components);
+            this.tablePanelCompactBottom = new System.Windows.Forms.TableLayoutPanel();
+            this.tablePanelCompactTop = new System.Windows.Forms.TableLayoutPanel();
+            this.labelTooltip = new TweetDuck.Video.Controls.LabelTooltip();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).BeginInit();
-            this.tablePanel.SuspendLayout();
+            this.tablePanelFull.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.imageResize)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageDownload)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageClose)).BeginInit();
@@ -64,30 +66,32 @@
             this.trackBarVolume.MouseDown += new System.Windows.Forms.MouseEventHandler(this.trackBarVolume_MouseDown);
             this.trackBarVolume.MouseUp += new System.Windows.Forms.MouseEventHandler(this.trackBarVolume_MouseUp);
             // 
-            // tablePanel
+            // tablePanelFull
             // 
-            this.tablePanel.BackColor = System.Drawing.SystemColors.Control;
-            this.tablePanel.ColumnCount = 6;
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 74F));
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F));
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
-            this.tablePanel.Controls.Add(this.trackBarVolume, 3, 0);
-            this.tablePanel.Controls.Add(this.progressSeek, 1, 0);
-            this.tablePanel.Controls.Add(this.labelTime, 2, 0);
-            this.tablePanel.Controls.Add(this.imageResize, 5, 0);
-            this.tablePanel.Controls.Add(this.imageDownload, 4, 0);
-            this.tablePanel.Controls.Add(this.imageClose, 0, 0);
-            this.tablePanel.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tablePanel.Location = new System.Drawing.Point(0, 86);
-            this.tablePanel.Name = "tablePanel";
-            this.tablePanel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.tablePanel.RowCount = 1;
-            this.tablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tablePanel.Size = new System.Drawing.Size(400, 34);
-            this.tablePanel.TabIndex = 1;
+            this.tablePanelFull.BackColor = System.Drawing.SystemColors.Control;
+            this.tablePanelFull.ColumnCount = 6;
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F));
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
+            this.tablePanelFull.Controls.Add(this.trackBarVolume, 3, 0);
+            this.tablePanelFull.Controls.Add(this.progressSeek, 1, 0);
+            this.tablePanelFull.Controls.Add(this.labelTime, 2, 0);
+            this.tablePanelFull.Controls.Add(this.imageResize, 5, 0);
+            this.tablePanelFull.Controls.Add(this.imageDownload, 4, 0);
+            this.tablePanelFull.Controls.Add(this.imageClose, 0, 0);
+            this.tablePanelFull.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tablePanelFull.Enabled = false;
+            this.tablePanelFull.Location = new System.Drawing.Point(0, 86);
+            this.tablePanelFull.Name = "tablePanelFull";
+            this.tablePanelFull.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.tablePanelFull.RowCount = 1;
+            this.tablePanelFull.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelFull.Size = new System.Drawing.Size(400, 34);
+            this.tablePanelFull.TabIndex = 0;
+            this.tablePanelFull.Visible = false;
             // 
             // progressSeek
             // 
@@ -98,7 +102,7 @@
             this.progressSeek.Margin = new System.Windows.Forms.Padding(9, 10, 8, 10);
             this.progressSeek.Maximum = 5000;
             this.progressSeek.Name = "progressSeek";
-            this.progressSeek.Size = new System.Drawing.Size(91, 14);
+            this.progressSeek.Size = new System.Drawing.Size(85, 14);
             this.progressSeek.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
             this.progressSeek.TabIndex = 0;
             this.progressSeek.MouseDown += new System.Windows.Forms.MouseEventHandler(this.progressSeek_MouseDown);
@@ -106,32 +110,14 @@
             // labelTime
             // 
             this.labelTime.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelTime.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
-            this.labelTime.Location = new System.Drawing.Point(138, 3);
+            this.labelTime.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.labelTime.Location = new System.Drawing.Point(132, 3);
             this.labelTime.Margin = new System.Windows.Forms.Padding(0, 3, 0, 5);
             this.labelTime.Name = "labelTime";
-            this.labelTime.Size = new System.Drawing.Size(74, 26);
+            this.labelTime.Size = new System.Drawing.Size(80, 26);
             this.labelTime.TabIndex = 1;
             this.labelTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // timerData
-            // 
-            this.timerData.Interval = 500;
-            this.timerData.Tick += new System.EventHandler(this.timerData_Tick);
-            // 
-            // labelTooltip
-            // 
-            this.labelTooltip.AutoSize = true;
-            this.labelTooltip.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelTooltip.ForeColor = System.Drawing.Color.White;
-            this.labelTooltip.Location = new System.Drawing.Point(0, 0);
-            this.labelTooltip.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
-            this.labelTooltip.Name = "labelTooltip";
-            this.labelTooltip.Padding = new System.Windows.Forms.Padding(4, 2, 2, 2);
-            this.labelTooltip.Size = new System.Drawing.Size(6, 19);
-            this.labelTooltip.TabIndex = 2;
-            this.labelTooltip.Visible = false;
-            // 
             // imageResize
             // 
             this.imageResize.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -178,6 +164,66 @@
             this.imageClose.WaitOnLoad = true;
             this.imageClose.Click += new System.EventHandler(this.imageClose_Click);
             // 
+            // timerData
+            // 
+            this.timerData.Interval = 500;
+            this.timerData.Tick += new System.EventHandler(this.timerData_Tick);
+            // 
+            // tablePanelCompactBottom
+            // 
+            this.tablePanelCompactBottom.BackColor = System.Drawing.SystemColors.Control;
+            this.tablePanelCompactBottom.ColumnCount = 5;
+            this.tablePanelCompactBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
+            this.tablePanelCompactBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelCompactBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F));
+            this.tablePanelCompactBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
+            this.tablePanelCompactBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 28F));
+            this.tablePanelCompactBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tablePanelCompactBottom.Enabled = false;
+            this.tablePanelCompactBottom.Location = new System.Drawing.Point(0, 52);
+            this.tablePanelCompactBottom.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tablePanelCompactBottom.Name = "tablePanelCompactBottom";
+            this.tablePanelCompactBottom.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.tablePanelCompactBottom.RowCount = 1;
+            this.tablePanelCompactBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelCompactBottom.Size = new System.Drawing.Size(400, 34);
+            this.tablePanelCompactBottom.TabIndex = 1;
+            // 
+            // tablePanelCompactTop
+            // 
+            this.tablePanelCompactTop.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tablePanelCompactTop.BackColor = System.Drawing.SystemColors.Control;
+            this.tablePanelCompactTop.ColumnCount = 2;
+            this.tablePanelCompactTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelCompactTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+            this.tablePanelCompactTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tablePanelCompactTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tablePanelCompactTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tablePanelCompactTop.Enabled = false;
+            this.tablePanelCompactTop.Location = new System.Drawing.Point(0, 60);
+            this.tablePanelCompactTop.Margin = new System.Windows.Forms.Padding(0);
+            this.tablePanelCompactTop.Name = "tablePanelCompactTop";
+            this.tablePanelCompactTop.Padding = new System.Windows.Forms.Padding(2, 0, 4, 0);
+            this.tablePanelCompactTop.RowCount = 1;
+            this.tablePanelCompactTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelCompactTop.Size = new System.Drawing.Size(400, 34);
+            this.tablePanelCompactTop.TabIndex = 2;
+            this.tablePanelCompactTop.Visible = false;
+            // 
+            // labelTooltip
+            // 
+            this.labelTooltip.AutoSize = true;
+            this.labelTooltip.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelTooltip.ForeColor = System.Drawing.Color.White;
+            this.labelTooltip.Location = new System.Drawing.Point(0, 0);
+            this.labelTooltip.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelTooltip.Name = "labelTooltip";
+            this.labelTooltip.Padding = new System.Windows.Forms.Padding(4, 2, 2, 2);
+            this.labelTooltip.Size = new System.Drawing.Size(6, 19);
+            this.labelTooltip.TabIndex = 3;
+            this.labelTooltip.Visible = false;
+            // 
             // FormPlayer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -186,12 +232,13 @@
             this.ClientSize = new System.Drawing.Size(400, 120);
             this.ControlBox = false;
             this.Controls.Add(this.labelTooltip);
-            this.Controls.Add(this.tablePanel);
+            this.Controls.Add(this.tablePanelCompactBottom);
+            this.Controls.Add(this.tablePanelFull);
+            this.Controls.Add(this.tablePanelCompactTop);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Location = new System.Drawing.Point(-32000, -32000);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(400, 120);
             this.Name = "FormPlayer";
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
@@ -199,7 +246,7 @@
             this.Text = "TweetDuck Video";
             this.Load += new System.EventHandler(this.FormPlayer_Load);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).EndInit();
-            this.tablePanel.ResumeLayout(false);
+            this.tablePanelFull.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.imageResize)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageDownload)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.imageClose)).EndInit();
@@ -212,7 +259,7 @@
 
         private System.Windows.Forms.Timer timerSync;
         private System.Windows.Forms.TrackBar trackBarVolume;
-        private System.Windows.Forms.TableLayoutPanel tablePanel;
+        private System.Windows.Forms.TableLayoutPanel tablePanelFull;
         private Controls.SeekBar progressSeek;
         private System.Windows.Forms.Label labelTime;
         private System.Windows.Forms.Timer timerData;
@@ -220,6 +267,8 @@
         private System.Windows.Forms.PictureBox imageResize;
         private System.Windows.Forms.PictureBox imageDownload;
         private System.Windows.Forms.PictureBox imageClose;
+        private System.Windows.Forms.TableLayoutPanel tablePanelCompactBottom;
+        private System.Windows.Forms.TableLayoutPanel tablePanelCompactTop;
     }
 }
 

video/FormPlayer.cs

@@ -10,9 +10,17 @@ using WMPLib;
 
 namespace TweetDuck.Video{
     sealed partial class FormPlayer : Form{
+        private bool IsCursorOverVideo{
+            get{
+                Point cursor = PointToClient(Cursor.Position);
+                return cursor.Y < (tablePanelFull.Enabled ? tablePanelFull.Location.Y : tablePanelCompactTop.Location.Y);
+            }
+        }
+
         protected override bool ShowWithoutActivation => true;
 
         private readonly IntPtr ownerHandle;
+        private readonly float ownerDpi;
         private readonly string videoUrl;
         private readonly DuplexPipe pipe;
         
@@ -23,14 +31,21 @@ namespace TweetDuck.Video{
 
         private WindowsMediaPlayer Player => player.Ocx;
 
-        public FormPlayer(IntPtr handle, int volume, string url, string token){
+        public FormPlayer(IntPtr handle, int dpi, int volume, string url, string token){
             InitializeComponent();
 
             this.ownerHandle = handle;
+            this.ownerDpi = dpi / 100F;
             this.videoUrl = url;
             this.pipe = DuplexPipe.CreateClient(token);
             this.pipe.DataIn += pipe_DataIn;
 
+            if (NativeMethods.GetWindowRect(ownerHandle, out NativeMethods.RECT rect)){
+                ClientSize = new Size(0, 0);
+                Location = new Point((rect.Left+rect.Right)/2, (rect.Top+rect.Bottom)/2);
+                Opacity = 0;
+            }
+            
             player = new ControlWMP{
                 Dock = DockStyle.Fill
             };
@@ -51,6 +66,10 @@ namespace TweetDuck.Video{
             trackBarVolume.Value = volume; // changes player volume too if non-default
 
             labelTooltip.AttachTooltip(progressSeek, true, args => {
+                if (args.X < 0 || args.Y < 0 || args.X >= progressSeek.Width || args.Y >= progressSeek.Height){
+                    return null;
+                }
+
                 IWMPMedia media = Player.currentMedia;
                 int progress = (int)(media.duration*progressSeek.GetProgress(args.X));
 
@@ -68,6 +87,59 @@ namespace TweetDuck.Video{
             Application.AddMessageFilter(new MessageFilter(this));
         }
 
+        // Layout
+
+        private int DpiScaled(int value){
+            return (int)Math.Round(value*ownerDpi);
+        }
+
+        private void RefreshControlPanel(){
+            bool useCompactLayout = ClientSize.Width < DpiScaled(480);
+            bool needsUpdate = !timerSync.Enabled || (useCompactLayout ? tablePanelFull.Enabled : tablePanelCompactBottom.Enabled);
+
+            if (needsUpdate){
+                void Disable(TableLayoutPanel panel){
+                    panel.Controls.Clear();
+                    panel.Visible = false;
+                    panel.Enabled = false;
+                }
+
+                tablePanelFull.SuspendLayout();
+                tablePanelCompactBottom.SuspendLayout();
+                tablePanelCompactTop.SuspendLayout();
+
+                if (useCompactLayout){
+                    Disable(tablePanelFull);
+
+                    tablePanelCompactBottom.Enabled = true;
+                    tablePanelCompactBottom.Controls.Add(imageClose, 0, 0);
+                    tablePanelCompactBottom.Controls.Add(trackBarVolume, 2, 0);
+                    tablePanelCompactBottom.Controls.Add(imageDownload, 3, 0);
+                    tablePanelCompactBottom.Controls.Add(imageResize, 4, 0);
+
+                    tablePanelCompactTop.Enabled = true;
+                    tablePanelCompactTop.Controls.Add(progressSeek, 0, 0);
+                    tablePanelCompactTop.Controls.Add(labelTime, 1, 0);
+                }
+                else{
+                    Disable(tablePanelCompactBottom);
+                    Disable(tablePanelCompactTop);
+
+                    tablePanelFull.Enabled = true;
+                    tablePanelFull.Controls.Add(imageClose, 0, 0);
+                    tablePanelFull.Controls.Add(progressSeek, 1, 0);
+                    tablePanelFull.Controls.Add(labelTime, 2, 0);
+                    tablePanelFull.Controls.Add(trackBarVolume, 3, 0);
+                    tablePanelFull.Controls.Add(imageDownload, 4, 0);
+                    tablePanelFull.Controls.Add(imageResize, 5, 0);
+                }
+                
+                tablePanelFull.ResumeLayout();
+                tablePanelCompactBottom.ResumeLayout();
+                tablePanelCompactTop.ResumeLayout();
+            }
+        }
+
         // Events
 
         private void FormPlayer_Load(object sender, EventArgs e){
@@ -97,9 +169,14 @@ namespace TweetDuck.Video{
             else if (state == WMPPlayState.wmppsPlaying){
                 Player.PlayStateChange -= player_PlayStateChange;
                 
-                timerSync.Start();
                 NativeMethods.SetWindowOwner(Handle, ownerHandle);
                 Cursor.Current = Cursors.Default;
+
+                SuspendLayout();
+                timerSync_Tick(timerSync, EventArgs.Empty);
+                timerSync.Start();
+                Opacity = 1;
+                ResumeLayout(true);
             }
         }
 
@@ -115,20 +192,38 @@ namespace TweetDuck.Video{
         [HandleProcessCorruptedStateExceptions]
         private void timerSync_Tick(object sender, EventArgs e){
             if (NativeMethods.GetWindowRect(ownerHandle, out NativeMethods.RECT rect)){
-                int width = rect.Right-rect.Left+1;
-                int height = rect.Bottom-rect.Top+1;
-
                 IWMPMedia media = Player.currentMedia;
                 IWMPControls controls = Player.controls;
 
+                int ownerLeft = rect.Left;
+                int ownerTop = rect.Top;
+                int ownerWidth = rect.Right-rect.Left+1;
+                int ownerHeight = rect.Bottom-rect.Top+1;
+                
+                // roughly matches MinimumSize for client bounds, adjusted a bit for weirdness with higher DPI
+                int minWidth = DpiScaled(356);
+                int minHeight = DpiScaled(386);
+
+                if (NativeMethods.GetClientRect(ownerHandle, out NativeMethods.RECT clientSize)){
+                    minWidth = Math.Min(minWidth, clientSize.Right);
+                    minHeight = Math.Min(minHeight, clientSize.Bottom);
+                }
+
+                int maxWidth = Math.Min(DpiScaled(media.imageSourceWidth), ownerWidth*3/4);
+                int maxHeight = Math.Min(DpiScaled(media.imageSourceHeight), ownerHeight*3/4);
+                
                 bool isCursorInside = ClientRectangle.Contains(PointToClient(Cursor.Position));
                 
-                ClientSize = new Size(Math.Max(MinimumSize.Width, Math.Min(media.imageSourceWidth, width*3/4)), Math.Max(MinimumSize.Height, Math.Min(media.imageSourceHeight, height*3/4)));
-                Location = new Point(rect.Left+(width-ClientSize.Width)/2, rect.Top+(height-ClientSize.Height+SystemInformation.CaptionHeight)/2);
+                Size newSize = new Size(Math.Max(minWidth+2, maxWidth), Math.Max(minHeight+2, maxHeight));
+                Point newLocation = new Point(ownerLeft+(ownerWidth-newSize.Width)/2, ownerTop+(ownerHeight-newSize.Height+SystemInformation.CaptionHeight)/2);
                 
-                tablePanel.Visible = isCursorInside || isDragging;
+                if (ClientSize != newSize || Location != newLocation){
+                    ClientSize = newSize;
+                    Location = newLocation;
+                    RefreshControlPanel();
+                }
                 
-                if (tablePanel.Visible){
+                if (isCursorInside || isDragging){
                     labelTime.Text = $"{controls.currentPositionString} / {media.durationString}";
 
                     int value = (int)Math.Round(progressSeek.Maximum*controls.currentPosition/media.duration);
@@ -142,6 +237,19 @@ namespace TweetDuck.Video{
                         progressSeek.Value = value+1;
                         progressSeek.Value = value;
                     }
+                    
+                    if (tablePanelFull.Enabled){
+                        tablePanelFull.Visible = true;
+                    }
+                    else{
+                        tablePanelCompactBottom.Visible = true;
+                        tablePanelCompactTop.Visible = true;
+                    }
+                }
+                else{
+                    tablePanelFull.Visible = false;
+                    tablePanelCompactBottom.Visible = false;
+                    tablePanelCompactTop.Visible = false;
                 }
                 
                 if (controls.currentPosition > media.duration){ // pausing near the end of the video causes WMP to play beyond the end of the video wtf
@@ -157,6 +265,10 @@ namespace TweetDuck.Video{
                 
                 if (isCursorInside && !wasCursorInside){
                     wasCursorInside = true;
+
+                    if (IsCursorOverVideo){
+                        Cursor.Current = Cursors.Default;
+                    }
                 }
                 else if (!isCursorInside && wasCursorInside){
                     wasCursorInside = false;
@@ -273,26 +385,19 @@ namespace TweetDuck.Video{
         internal sealed class MessageFilter : IMessageFilter{
             private readonly FormPlayer form;
 
-            private bool IsCursorOverVideo{
-                get{
-                    Point cursor = form.PointToClient(Cursor.Position);
-                    return cursor.Y < form.tablePanel.Location.Y;
-                }
-            }
-
             public MessageFilter(FormPlayer form){
                 this.form = form;
             }
 
             bool IMessageFilter.PreFilterMessage(ref Message m){
                 if (m.Msg == 0x0201){ // WM_LBUTTONDOWN
-                    if (IsCursorOverVideo){
+                    if (form.IsCursorOverVideo){
                         form.TogglePause();
                         return true;
                     }
                 }
                 else if (m.Msg == 0x0203){ // WM_LBUTTONDBLCLK
-                    if (IsCursorOverVideo){
+                    if (form.IsCursorOverVideo){
                         form.TogglePause();
                         form.Player.fullScreen = !form.Player.fullScreen;
                         return true;

video/NativeMethods.cs

@@ -9,6 +9,10 @@ namespace TweetDuck.Video{
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
 
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
         [DllImport("user32.dll")]
         private static extern int SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
 

video/Program.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 
 namespace TweetDuck.Video{
     static class Program{
-        internal const string Version = "1.3";
+        internal const string Version = "1.4.2";
 
         // referenced in VideoPlayer
         // set by task manager -- public const int CODE_PROCESS_KILLED = 1;
@@ -25,21 +25,23 @@ namespace TweetDuck.Video{
             CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
 
             IntPtr ownerHandle;
+            int ownerDpi;
             int defaultVolume;
             string videoUrl;
             string pipeToken;
 
             try{
                 ownerHandle = new IntPtr(int.Parse(args[0], NumberStyles.Integer));
-                defaultVolume = int.Parse(args[1], NumberStyles.Integer);
-                videoUrl = new Uri(args[2], UriKind.Absolute).AbsoluteUri;
-                pipeToken = args[3];
+                ownerDpi = int.Parse(args[1], NumberStyles.Integer);
+                defaultVolume = int.Parse(args[2], NumberStyles.Integer);
+                videoUrl = new Uri(args[3], UriKind.Absolute).AbsoluteUri;
+                pipeToken = args[4];
             }catch{
                 return CODE_INVALID_ARGS;
             }
 
             try{
-                Application.Run(new FormPlayer(ownerHandle, defaultVolume, videoUrl, pipeToken));
+                Application.Run(new FormPlayer(ownerHandle, ownerDpi, defaultVolume, videoUrl, pipeToken));
             }catch(Exception e){
                 Console.Out.WriteLine(e);
                 return CODE_LAUNCH_FAIL;

video/TweetDuck.Video.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ResolveComReferenceSilent>True</ResolveComReferenceSilent>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -82,6 +85,7 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\btnResize.png" />
     <None Include="Resources\btnDownload.png" />
     <None Include="Resources\btnClose.png" />
@@ -100,4 +104,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+  </Target>
 </Project>

video/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net452" developmentDependency="true" />
+</packages>