Mercurial > dwindows
comparison os2/dw.c @ 454:f1f188c678f3
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 | e6b00c3e5086 |
comparison
equal
deleted
inserted
replaced
453:031d762fc8d6 | 454:f1f188c678f3 |
---|---|
969 } | 969 } |
970 } | 970 } |
971 | 971 |
972 if(pass > 1 && *depth > 0) | 972 if(pass > 1 && *depth > 0) |
973 { | 973 { |
974 if(thisbox->type == DW_VERT) | 974 if(thisbox->minwidth-thisbox->upx == 0) |
975 { | 975 thisbox->items[z].xratio = 1.0; |
976 if((thisbox->minwidth-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))) == 0) | |
977 thisbox->items[z].xratio = 1.0; | |
978 else | |
979 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)))); | |
980 } | |
981 else | 976 else |
982 { | 977 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx)); |
983 if(thisbox->minwidth-thisbox->upx == 0) | 978 if(thisbox->minheight-thisbox->upy == 0) |
984 thisbox->items[z].xratio = 1.0; | 979 thisbox->items[z].yratio = 1.0; |
985 else | |
986 thisbox->items[z].xratio = ((float)((thisbox->width * thisbox->parentxratio)-thisbox->upx))/((float)(thisbox->minwidth-thisbox->upx)); | |
987 } | |
988 | |
989 if(thisbox->type == DW_HORZ) | |
990 { | |
991 if((thisbox->minheight-((thisbox->items[z].pad*2)+(thisbox->parentpad*2))) == 0) | |
992 thisbox->items[z].yratio = 1.0; | |
993 else | |
994 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)))); | |
995 } | |
996 else | 980 else |
997 { | 981 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy)); |
998 if(thisbox->minheight-thisbox->upy == 0) | |
999 thisbox->items[z].yratio = 1.0; | |
1000 else | |
1001 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy)); | |
1002 } | |
1003 | 982 |
1004 if(thisbox->items[z].type == TYPEBOX) | 983 if(thisbox->items[z].type == TYPEBOX) |
1005 { | 984 { |
1006 Box *tmp = WinQueryWindowPtr(thisbox->items[z].hwnd, QWP_USER); | 985 Box *tmp = WinQueryWindowPtr(thisbox->items[z].hwnd, QWP_USER); |
1007 | 986 |