Excel: stop freeze when detecting overflow/cropped text#6526
Merged
Conversation
…re row is merged. Specifically: * rename _getCellWidthAndTextWidth to _getCellTextWidth and no longer return the cell width. * In __overlapInfo: No longer use a for loop to calculate the total column width for a merge area, instead just use the first and last column's left and width to calculate it. * in __overlapInfo: Fetch coordinates and widths as points rather than units, and use Excel's own pointsToScreenPixelsX, which may solve the DPI issue.
Member
Author
|
@feerrenrut: A review please. I confirmed this fixes Derek's testcase mentioned on #6216, and @Qchristensen confirms this fixes #6472 |
feerrenrut
reviewed
Nov 4, 2016
| cellWidth = self.excelCellObject.ColumnWidth * xlCellWidthUnitToPixels #Conversion factor to convert the cellwidth to pixels | ||
| return (cellWidth,textWidth) | ||
| textWidth = StructText.width | ||
| return textWidth #ctypes.windll.kernel32.MulDiv(textWidth, 96, dpi) |
Contributor
There was a problem hiding this comment.
I dont understand the comment on the end of this. Was it left there by mistake?
Member
Author
There was a problem hiding this comment.
Yep, left there by mistake, I shall remove.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #6216, Fixes #6472