Fixed strange visual bug when DPI is set to 130% or 131%.

TBXin · Jun 5, 2017 · 29ad852 · 29ad852
1 parent 958ff1d
commit 29ad852
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/NCore/UI/MenuButton.cs b/src/NCore/UI/MenuButton.cs
@@ -102,17 +102,29 @@ protected override void OnClick(EventArgs e)
 			m_menu.Focus();
 		}
 
-		protected override void OnPaint(PaintEventArgs e)
+		#region Overrides of Control
+		protected override void OnLayout(LayoutEventArgs e)
 		{
-			var actualDropDownArrowRectangleWidth = e.Graphics.ScaleToDpi(DropDownArrowRectangleWidth);
-			var paddingRight = actualDropDownArrowRectangleWidth / 2;
-			if (Padding.Right != paddingRight)
+			if (!string.Equals(e.AffectedProperty, "Padding")) return;
+
+			using (var gfx = CreateGraphics())
 			{
-				Padding = new Padding(Padding.Left, Padding.Top, Padding.Right + paddingRight, Padding.Bottom);
+				var actualDropDownArrowRectangleWidth = gfx.ScaleToDpi(DropDownArrowRectangleWidth);
+				var paddingRight = actualDropDownArrowRectangleWidth / 2;
+				if (Padding.Right != paddingRight)
+				{
+					Padding = new Padding(Padding.Left, Padding.Top, paddingRight, Padding.Bottom);
+				}
 			}
+			base.OnLayout(e);
+		}
+		#endregion
 
+		protected override void OnPaint(PaintEventArgs e)
+		{
 			base.OnPaint(e);
 
+			var actualDropDownArrowRectangleWidth = e.Graphics.ScaleToDpi(DropDownArrowRectangleWidth);
 			if (ComboBoxRenderer.IsSupported)
 			{