osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

QT ByteViewText: calculate string widths consistently to prevent clipping 

For QT >5.11, stringWidth() uses horizontalAdvance, which gives different
(longer) widths than the old boundingRect().width() method.

Other locations use the boundRect().width() method directly, resulting
in underestimating line widths and clipping the last characters in
the byte view window.

Fix by forcing all width calculations to use stringWidth().
Closes #17087.

(cherry picked from commit 95f3d1b075)

Conflicts:
	ui/qt/widgets/byte_view_text.cpp
This commit is contained in:
naf 2021-02-02 13:25:52 -06:00 committed by Pascal Quantin
parent cc954fae7e
commit eee907aeb5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/widgets/byte_view_text.cpp
View File

@ -607,7 +607,7 @@ int ByteViewText::offsetPixels()
if (show_offset_) {
// One pad space before and after
QString zeroes = QString(offsetChars(), '0');
return fontMetrics().boundingRect(zeroes).width();
return stringWidth(zeroes);
}
return 0;
}
@ -618,7 +618,7 @@ int ByteViewText::hexPixels()
if (show_hex_) {
// One pad space before and after
QString zeroes = QString(DataPrinter::hexChars() + 2, '0');
return fontMetrics().boundingRect(zeroes).width();
return stringWidth(zeroes);
}
return 0;
}
@ -629,7 +629,7 @@ int ByteViewText::asciiPixels()
// Two pad spaces before, one after
int ascii_chars = (row_width_ + ((row_width_ - 1) / separator_interval_));
QString zeroes = QString(ascii_chars + 3, '0');
return fontMetrics().boundingRect(zeroes).width();
return stringWidth(zeroes);
}
return 0;
}