Button icons centralised by default

This commit is contained in:
Robin 2015-12-04 20:13:20 +00:00
parent 55ecd42596
commit 466a9ec9d6

View File

@ -374,7 +374,7 @@ namespace DarkUI.Controls
{ {
var stringSize = g.MeasureString(Text, Font, rect.Size); var stringSize = g.MeasureString(Text, Font, rect.Size);
var x = 0; var x = (ClientSize.Width / 2) - (Image.Size.Width / 2);
var y = (ClientSize.Height / 2) - (Image.Size.Height / 2); var y = (ClientSize.Height / 2) - (Image.Size.Height / 2);
switch (TextImageRelation) switch (TextImageRelation)
@ -388,7 +388,8 @@ namespace DarkUI.Controls
y = y + ((int)(stringSize.Height / 2) + (ImagePadding / 2)); y = y + ((int)(stringSize.Height / 2) + (ImagePadding / 2));
break; break;
case TextImageRelation.ImageBeforeText: case TextImageRelation.ImageBeforeText:
textOffsetX = Image.Size.Width + ImagePadding; textOffsetX = Image.Size.Width + (ImagePadding * 2);
x = ImagePadding;
break; break;
case TextImageRelation.TextBeforeImage: case TextImageRelation.TextBeforeImage:
x = x + (int)stringSize.Width; x = x + (int)stringSize.Width;
@ -405,11 +406,11 @@ namespace DarkUI.Controls
rect.Height - Padding.Vertical); rect.Height - Padding.Vertical);
var stringFormat = new StringFormat var stringFormat = new StringFormat
{ {
LineAlignment = StringAlignment.Center, LineAlignment = StringAlignment.Center,
Alignment = StringAlignment.Center, Alignment = StringAlignment.Center,
Trimming = StringTrimming.EllipsisCharacter Trimming = StringTrimming.EllipsisCharacter
}; };
g.DrawString(Text, Font, b, modRect, stringFormat); g.DrawString(Text, Font, b, modRect, stringFormat);
} }