From e62a1aa2628f6bcd0ccd7794de0ca33f6bc4ab7b Mon Sep 17 00:00:00 2001 From: Brian Ferguson Date: Sat, 31 Aug 2013 23:58:12 -0600 Subject: [PATCH] Fixed issue where the width/height of a meter would not update when using the Padding option. --- Library/Meter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Meter.cpp b/Library/Meter.cpp index 18c51f08..dbfbdf5b 100644 --- a/Library/Meter.cpp +++ b/Library/Meter.cpp @@ -313,7 +313,8 @@ void Meter::ReadOptions(ConfigParser& parser, const WCHAR* section) int w = parser.ReadInt(section, L"W", m_W); m_WDefined = parser.GetLastValueDefined(); if (IsFixedSize(true)) m_W = w; - if (oldW != m_W) m_W += GetWidthPadding(); + const int widthPadding = GetWidthPadding(); + if (oldW != (m_W - widthPadding)) m_W += widthPadding; if (!m_WDefined && oldWDefined && IsFixedSize()) { m_W = 0; @@ -324,7 +325,8 @@ void Meter::ReadOptions(ConfigParser& parser, const WCHAR* section) int h = parser.ReadInt(section, L"H", m_H); m_HDefined = parser.GetLastValueDefined(); if (IsFixedSize(true)) m_H = h; - if (oldH != m_H) m_H += GetHeightPadding(); + const int heightPadding = GetHeightPadding(); + if (oldH != (m_H - heightPadding)) m_H += heightPadding; if (!m_HDefined && oldHDefined && IsFixedSize()) { m_H = 0;