diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-06-19 20:17:28 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-06-19 20:17:28 (GMT) |
| commit | 260b1a8ad5dbe75a23cfdd903405f5a74fa911d0 (patch) | |
| tree | 3612cf5cdaed2166a0c7e088e0b4b2f44306b333 /generic | |
| parent | 73b7effc31ec76c6f682fa75ab4bcac6b50e6955 (diff) | |
| parent | 6e4eb0606125762a717666ff72b145b0fc6d04a5 (diff) | |
| download | tk-260b1a8ad5dbe75a23cfdd903405f5a74fa911d0.zip tk-260b1a8ad5dbe75a23cfdd903405f5a74fa911d0.tar.gz tk-260b1a8ad5dbe75a23cfdd903405f5a74fa911d0.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkPanedWindow.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index f350d0a..17e2b4a 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -1789,10 +1789,18 @@ ArrangePanes( */ if (horizontal) { - paneSize = slavePtr->paneWidth; + if (slavePtr->width > 0) { + paneSize = slavePtr->width; + } else { + paneSize = slavePtr->paneWidth; + } stretchReserve -= paneSize + (2 * slavePtr->padx); } else { - paneSize = slavePtr->paneHeight; + if (slavePtr->height > 0) { + paneSize = slavePtr->height; + } else { + paneSize = slavePtr->paneHeight; + } stretchReserve -= paneSize + (2 * slavePtr->pady); } if (IsStretchable(slavePtr->stretch,i,first,last) @@ -1842,10 +1850,18 @@ ArrangePanes( */ if (horizontal) { - paneSize = slavePtr->paneWidth; + if (slavePtr->width > 0) { + paneSize = slavePtr->width; + } else { + paneSize = slavePtr->paneWidth; + } pwSize = pwWidth; } else { - paneSize = slavePtr->paneHeight; + if (slavePtr->height > 0) { + paneSize = slavePtr->height; + } else { + paneSize = slavePtr->paneHeight; + } pwSize = pwHeight; } if (IsStretchable(slavePtr->stretch, i, first, last)) { |