osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: fix Qt 5.15 deprecation warning 

QFont::ForceIntegerMetrics is deprecated, and the floating-point
variant of QFontMetrics is no longer used anyway since 96eec0beb9.

Change the font_width_ member to int, as should have been done in
that commit.
This commit is contained in:
Orgad Shaneh 2020-11-30 11:52:13 +02:00 committed by AndersBroman
parent a973416077
commit e74b6bdebe
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,6 @@ void ByteViewText::markAppendix(int start, int length)
void ByteViewText::setMonospaceFont(const QFont &mono_font)
{
QFont int_font(mono_font);
int_font.setStyleStrategy(QFont::ForceIntegerMetrics);
setFont(int_font);
viewport()->setFont(int_font);

2
ui/qt/widgets/byte_view_text.h
View File

@ -120,7 +120,7 @@ private:
bool show_hex_; // Should we show the hex display?
bool show_ascii_; // Should we show the ASCII display?
int row_width_; // Number of bytes per line
qreal font_width_; // Single character width and text margin. NOTE: Use fontMetrics::width for multiple characters.
int font_width_; // Single character width and text margin. NOTE: Use fontMetrics::width for multiple characters.
int line_height_; // Font line spacing
QList<QRect> hover_outlines_; // Hovered byte outlines.