From 9946669bb5e5fa86bb1f0be0caa3caa183d296ce Mon Sep 17 00:00:00 2001
From: unodgs <unodgs@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 2 Oct 2010 15:17:13 +0000
Subject: [PATCH] GridCtrl: Fixed using incorrect size ratio in Width (thanx
 Sevenjay!)

git-svn-id: svn://ultimatepp.org/upp/trunk@2731 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/GridCtrl/GridBase.cpp | 8 ++++----
 uppsrc/GridCtrl/GridCtrl.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/uppsrc/GridCtrl/GridBase.cpp b/uppsrc/GridCtrl/GridBase.cpp
index 93c789e95..53f68e8d8 100644
--- a/uppsrc/GridCtrl/GridBase.cpp
+++ b/uppsrc/GridCtrl/GridBase.cpp
@@ -69,11 +69,11 @@ GridCtrl::ItemRect& GridCtrl::ItemRect::Name(const char * s)
 	return *this;
 }
 
-GridCtrl::ItemRect& GridCtrl::ItemRect::Size(int n)
+GridCtrl::ItemRect& GridCtrl::ItemRect::Size(int n, bool hv)
 {
 	hidden = n == 0;
 	
-	n = Ctrl::VertLayoutZoom(n);
+	n = hv ? Ctrl::HorzLayoutZoom(n) : Ctrl::VertLayoutZoom(n);
 
 	if(!hidden)
 	{
@@ -89,12 +89,12 @@ GridCtrl::ItemRect& GridCtrl::ItemRect::Size(int n)
 
 GridCtrl::ItemRect& GridCtrl::ItemRect::Width(int n)
 {
-	return Size(n);
+	return Size(n, true);
 }
 
 GridCtrl::ItemRect& GridCtrl::ItemRect::Height(int n)
 {
-	return Size(n);
+	return Size(n, false);
 }
 
 GridCtrl::ItemRect& GridCtrl::ItemRect::Min(int n)
diff --git a/uppsrc/GridCtrl/GridCtrl.h b/uppsrc/GridCtrl/GridCtrl.h
index 5f3cf2ee8..1d8d2940d 100644
--- a/uppsrc/GridCtrl/GridCtrl.h
+++ b/uppsrc/GridCtrl/GridCtrl.h
@@ -621,7 +621,7 @@ class GridCtrl : public Ctrl
 				int    nWidth()                { return nsize; 				   }
 				int    nHeight()               { return nsize;				   }
 
-				ItemRect& Size(int n);
+				ItemRect& Size(int n, bool hv = false);
 
 				bool IsMin()   { return ismin; }
 				bool IsMax()   { return ismax; }