From e3c8ae2dfa159d8729af6a8b9f4c392aadd4b0d7 Mon Sep 17 00:00:00 2001
From: Brian Ferguson <ferguson.brian@gmail.com>
Date: Sun, 21 Jul 2013 09:49:16 -0600
Subject: [PATCH] Fixed issues with Padding

---
 Library/Meter.cpp       | 8 ++++++--
 Library/MeterString.cpp | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Library/Meter.cpp b/Library/Meter.cpp
index 77e25bea..1ca33e11 100644
--- a/Library/Meter.cpp
+++ b/Library/Meter.cpp
@@ -308,19 +308,23 @@ void Meter::ReadOptions(ConfigParser& parser, const WCHAR* section)
 	static const Gdiplus::Rect defPadding;
 	m_Padding = parser.ReadRect(section, L"Padding", defPadding);
 
+	int oldW = m_W;
 	bool oldWDefined = m_WDefined;
 	int w = parser.ReadInt(section, L"W", m_W);
 	m_WDefined = parser.GetLastValueDefined();
-	if (IsFixedSize(true)) m_W = w + GetWidthPadding();
+	if (IsFixedSize(true)) m_W = w;
+	if (oldW != m_W) m_W += GetWidthPadding();
 	if (!m_WDefined && oldWDefined && IsFixedSize())
 	{
 		m_W = 0;
 	}
 	
+	int oldH = m_H;
 	bool oldHDefined = m_HDefined;
 	int h = parser.ReadInt(section, L"H", m_H);
 	m_HDefined = parser.GetLastValueDefined();
-	if (IsFixedSize(true)) m_H = h + GetHeightPadding();
+	if (IsFixedSize(true)) m_H = h;
+	if (oldH != m_H) m_H += GetHeightPadding();
 	if (!m_HDefined && oldHDefined && IsFixedSize())
 	{
 		m_H = 0;
diff --git a/Library/MeterString.cpp b/Library/MeterString.cpp
index c6e8603e..ddbc761f 100644
--- a/Library/MeterString.cpp
+++ b/Library/MeterString.cpp
@@ -398,8 +398,8 @@ bool MeterString::Update()
 			}
 			else
 			{
-				m_W = GetWidthPadding() + 1;
-				m_H = GetHeightPadding() + 1;
+				m_W = 1;
+				m_H = 1;
 			}
 		}