Mercurial > dwindows

changeset 454:f1f188c678f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate unnecessary and also erroneous code segment from the resize code that was causing incorrect calculations of the ratio that is opposite the box direction.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 23 Jun 2003 17:24:54 +0000
parents 031d762fc8d6
children dd04a4d781f8
files os2/dw.c win/dw.c
diffstat 2 files changed, 12 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/os2/dw.c	Mon Jun 23 17:13:02 2003 +0000
+++ b/os2/dw.c	Mon Jun 23 17:24:54 2003 +0000
@@ -971,35 +971,14 @@
 
 		if(pass > 1 && *depth > 0)
 		{
-			if(thisbox->type == DW_VERT)
-			{
-				if((thisbox->minwidth-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))) == 0)
-					thisbox->items[z].xratio = 1.0;
-				else
-					thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))))/((float)(thisbox->minwidth-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))));
-			}
+			if(thisbox->minwidth-thisbox->upx == 0)
+				thisbox->items[z].xratio = 1.0;
 			else
-			{
-				if(thisbox->minwidth-thisbox->upx == 0)
-					thisbox->items[z].xratio = 1.0;
-				else
-					thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
-			}
-
-			if(thisbox->type == DW_HORZ)
-			{
-				if((thisbox->minheight-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))) == 0)
-					thisbox->items[z].yratio = 1.0;
-				else
-					thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))))/((float)(thisbox->minheight-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))));
-			}
+				thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
+			if(thisbox->minheight-thisbox->upy == 0)
+				thisbox->items[z].yratio = 1.0;
 			else
-			{
-				if(thisbox->minheight-thisbox->upy == 0)
-					thisbox->items[z].yratio = 1.0;
-				else
-					thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
-			}
+				thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
 
 			if(thisbox->items[z].type == TYPEBOX)
 			{
--- a/win/dw.c	Mon Jun 23 17:13:02 2003 +0000
+++ b/win/dw.c	Mon Jun 23 17:24:54 2003 +0000
@@ -933,35 +933,14 @@
 
 		if(pass > 1 && *depth > 0)
 		{
-			if(thisbox->type == DW_VERT)
-			{
-				if((thisbox->minwidth-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))) == 0)
-					thisbox->items[z].xratio = 1.0;
-				else
-					thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))))/((float)(thisbox->minwidth-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))));
-			}
+			if(thisbox->minwidth-thisbox->upx == 0)
+				thisbox->items[z].xratio = 1.0;
 			else
-			{
-				if(thisbox->minwidth-thisbox->upx == 0)
-					thisbox->items[z].xratio = 1.0;
-				else
-					thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
-			}
-
-			if(thisbox->type == DW_HORZ)
-			{
-				if((thisbox->minheight-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))) == 0)
-					thisbox->items[z].yratio = 1.0;
-				else
-					thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))))/((float)(thisbox->minheight-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))));
-			}
+				thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx));
+			if(thisbox->minheight-thisbox->upy == 0)
+				thisbox->items[z].yratio = 1.0;
 			else
-			{
-				if(thisbox->minheight-thisbox->upy == 0)
-					thisbox->items[z].yratio = 1.0;
-				else
-					thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
-			}
+				thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
 
 			if(thisbox->items[z].type == TYPEBOX)
 			{