From d3b62009e639f03294cced582d4679b700d00ab2 Mon Sep 17 00:00:00 2001 From: "J.D. Purcell" Date: Sun, 13 Oct 2019 14:49:25 -0400 Subject: [PATCH] BasicBot: Fix DPI scaling issues. --- BizHawk.Client.EmuHawk/UIHelper.cs | 2 ++ BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs | 10 ++++++---- .../tools/BasicBot/BotControlsRow.Designer.cs | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/BizHawk.Client.EmuHawk/UIHelper.cs b/BizHawk.Client.EmuHawk/UIHelper.cs index f6e01d6f16..cc74296676 100644 --- a/BizHawk.Client.EmuHawk/UIHelper.cs +++ b/BizHawk.Client.EmuHawk/UIHelper.cs @@ -16,6 +16,8 @@ namespace BizHawk.Client.EmuHawk public static float AutoScaleFactorY { get; } = AutoScaleCurrentSize.Height / AutoScaleBaseSize.Height; + public static SizeF AutoScaleFactor { get; } = new SizeF(AutoScaleFactorX, AutoScaleFactorY); + public static int ScaleX(int size) { return (int)Math.Round(size * AutoScaleFactorX); diff --git a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 9c3361cdaa..e4a1d99ca2 100644 --- a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -845,14 +845,14 @@ namespace BizHawk.Client.EmuHawk StartFromSlotBox.SelectedIndex = 0; - int starty = 0; + const int starty = 0; + const int lineHeight = 30; + const int marginLeft = 15; int accumulatedy = 0; - int lineHeight = 30; - int marginLeft = 15; int count = 0; + ControlProbabilityPanel.SuspendLayout(); ControlProbabilityPanel.Controls.Clear(); - foreach (var button in Emulator.ControllerDefinition.BoolButtons) { var control = new BotControlsRow @@ -863,11 +863,13 @@ namespace BizHawk.Client.EmuHawk TabIndex = count + 1, ProbabilityChangedCallback = AssessRunButtonStatus }; + control.Scale(UIHelper.AutoScaleFactor); ControlProbabilityPanel.Controls.Add(control); accumulatedy += lineHeight; count++; } + ControlProbabilityPanel.ResumeLayout(); if (Settings.RecentBotFiles.AutoLoad) { diff --git a/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs b/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs index 0ddb924cff..9ee550ffe8 100644 --- a/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs @@ -72,8 +72,7 @@ // // BotControlsRow // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.ProbabilitySlider); this.Controls.Add(this.ProbabilityUpDown); this.Controls.Add(this.ButtonNameLabel);