Release 1.17.3

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

@@ -494,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/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){
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
-            return type == KeyType.RawKeyDown && form.ProcessBrowserKey((Keys)windowsKeyCode);
+            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 form.ProcessBrowserKey(key);
-            return false;
         }
     }
 }

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){
+        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
-            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
+            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
-                switch((Keys)windowsKeyCode){
+                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,20 +1,45 @@
-// Uncomment to force TweetDeck to load a predefined version of the vendor/bundle scripts and stylesheets
+using System;
-// #define FREEZE_TWEETDECK_RESOURCES
+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;
 using TweetDuck.Core.Utils;
 
-#if FREEZE_TWEETDECK_RESOURCES
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-#endif
-
 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){
@@ -35,33 +60,17 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
         }
 
-        public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
-            if (autoReload){
-                browser.Reload();
-            }
-        }
-
-        #if FREEZE_TWEETDECK_RESOURCES
-        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$", RegexOptions.Compiled);
-        
-        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(2){
-            { "vendor.js", "d897f6b9ed" },
-            { "bundle.js", "851d3877b9" },
-            { "vendor.css", "ce7cdd10b6" },
-            { "bundle.css", "c339f07047" }
-        };
-
         public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet){
+            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){
-                        Debug.WriteLine($"Accepting {url}");
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Accepting " + url);
                     }
                     else{
-                        Debug.WriteLine($"Rewriting {url} hash to {hash}");
+                        Program.Reporter.LogVerbose("[RequestHandlerBase] Replacing " + url + " hash with " + hash);
                         request.Url = TweetDeckResourceUrl.Replace(url, $"/dist/$1.{hash}.$3");
                         return true;
                     }
@@ -70,6 +79,11 @@ namespace TweetDuck.Core.Handling{
 
             return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }
-        #endif
+        
+        public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
+            if (autoReload){
+                browser.Reload();
+            }
+        }
     }
 }

Core/Handling/RequestHandlerBrowser.cs

@@ -13,7 +13,12 @@ namespace TweetDuck.Core.Handling{
         public RequestHandlerBrowser() : base(true){}
 
         public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (request.ResourceType == ResourceType.Script){
+            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.")){

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/Other/FormGuide.cs

@@ -70,6 +70,7 @@ namespace TweetDuck.Core.Other{
             this.browser = new ChromiumWebBrowser(url){
                 MenuHandler = new ContextMenuGuide(owner),
                 JsDialogHandler = new JavaScriptDialogHandler(),
+                KeyboardHandler = new KeyboardHandlerBase(),
                 LifeSpanHandler = new LifeSpanHandler(),
                 RequestHandler = new RequestHandlerBase(true),
                 ResourceHandlerFactory = resourceHandlerFactory

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{
@@ -119,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;
@@ -151,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){
@@ -162,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);
                 }
             }
         }

Core/Utils/TwitterUtils.cs

@@ -16,7 +16,7 @@ namespace TweetDuck.Core.Utils{
         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"));
         
@@ -43,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);

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.17";
+        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"));
@@ -129,6 +130,13 @@ namespace TweetDuck{
                 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();
 
             CefSharpSettings.WcfEnabled = false;

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/edit-design/theme.black.css

@@ -800,7 +800,7 @@ 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}

Resources/Scripts/code.js

@@ -1198,6 +1198,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 {
+#td-introduction-modal .mdl-header {
-  padding-top: 0;
+  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

@@ -1,11 +1,3 @@
-/***********/
-/* General */
-/***********/
-
-body {
-  margin: 0;
-}
-
 /***********************/
 /* Redesign scrollbars */
 /***********************/

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

@@ -92,6 +92,7 @@
       <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" />

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 FindArg(string key){
-            string type = Array.Find(args, arg => arg.StartsWith(typePrefix, StringComparison.OrdinalIgnoreCase)).Substring(typePrefix.Length);
+                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);
+        }
     }
 }

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.tablePanelFull.BackColor = System.Drawing.SystemColors.Control;
-            this.tablePanel.ColumnCount = 6;
+            this.tablePanelFull.ColumnCount = 6;
-            this.tablePanel.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.tablePanel.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.Percent, 100F));
-            this.tablePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 74F));
+            this.tablePanelFull.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
-            this.tablePanel.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, 130F));
-            this.tablePanel.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.tablePanel.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.tablePanel.Controls.Add(this.trackBarVolume, 3, 0);
+            this.tablePanelFull.Controls.Add(this.trackBarVolume, 3, 0);
-            this.tablePanel.Controls.Add(this.progressSeek, 1, 0);
+            this.tablePanelFull.Controls.Add(this.progressSeek, 1, 0);
-            this.tablePanel.Controls.Add(this.labelTime, 2, 0);
+            this.tablePanelFull.Controls.Add(this.labelTime, 2, 0);
-            this.tablePanel.Controls.Add(this.imageResize, 5, 0);
+            this.tablePanelFull.Controls.Add(this.imageResize, 5, 0);
-            this.tablePanel.Controls.Add(this.imageDownload, 4, 0);
+            this.tablePanelFull.Controls.Add(this.imageDownload, 4, 0);
-            this.tablePanel.Controls.Add(this.imageClose, 0, 0);
+            this.tablePanelFull.Controls.Add(this.imageClose, 0, 0);
-            this.tablePanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tablePanelFull.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tablePanel.Location = new System.Drawing.Point(0, 86);
+            this.tablePanelFull.Enabled = false;
-            this.tablePanel.Name = "tablePanel";
+            this.tablePanelFull.Location = new System.Drawing.Point(0, 86);
-            this.tablePanel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.tablePanelFull.Name = "tablePanelFull";
-            this.tablePanel.RowCount = 1;
+            this.tablePanelFull.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.tablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tablePanelFull.RowCount = 1;
-            this.tablePanel.Size = new System.Drawing.Size(400, 34);
+            this.tablePanelFull.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tablePanel.TabIndex = 1;
+            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.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelTime.Location = new System.Drawing.Point(138, 3);
+            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)));
+                Size newSize = new Size(Math.Max(minWidth+2, maxWidth), Math.Max(minHeight+2, maxHeight));
-                Location = new Point(rect.Left+(width-ClientSize.Width)/2, rect.Top+(height-ClientSize.Height+SystemInformation.CaptionHeight)/2);
+                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);
+                ownerDpi = int.Parse(args[1], NumberStyles.Integer);
-                videoUrl = new Uri(args[2], UriKind.Absolute).AbsoluteUri;
+                defaultVolume = int.Parse(args[2], NumberStyles.Integer);
-                pipeToken = args[3];
+                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;