Fixed: 'Texture sizes below names' was handled incorrectly with 'Show texture sizes' disabled

This commit is contained in:
ZZYZX 2017-02-08 19:21:17 +02:00
parent ed6e598519
commit 0d43a7be12
2 changed files with 2 additions and 2 deletions

View file

@ -157,7 +157,7 @@ namespace CodeImp.DoomBuilder.Controls
int fontH = 4 + SystemFonts.MessageBoxFont.Height;
int h2 = h;
if (General.Settings.TextureSizesBelow && ItemType == ImageBrowserItemType.IMAGE)
if (General.Settings.ShowTextureSizes && General.Settings.TextureSizesBelow && ItemType == ImageBrowserItemType.IMAGE)
h2 -= fontH;
var iw = bmp.Width;

View file

@ -530,7 +530,7 @@ namespace CodeImp.DoomBuilder.Controls
int wid = Math.Max((imagesize > 0 ? imagesize : preview.Width), ti.TextureNameWidth) + padhorz + padhorz;
int hei = (imagesize > 0 ? imagesize : preview.Height) + padvert + padvert + font;
// if we draw height below, add another font
if (General.Settings.TextureSizesBelow && ti.ItemType == ImageBrowserItemType.IMAGE)
if (General.Settings.ShowTextureSizes && General.Settings.TextureSizesBelow && ti.ItemType == ImageBrowserItemType.IMAGE)
hei += font;
if(rw < wid)