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

Qt: Packet list fixes. 

When updating the monospace font, don't apply it to PacketList itself.
On Windows and Linux here it sets the header font as well.

Add the item delegate width to the column size hint. This correctly
resizes column 0 on Windows. It seems to add extra space on OS X and
Linux, unfortunately.

Change-Id: I294cd9868fe00144b896636be65896e8557ab208
Reviewed-on: https://code.wireshark.org/review/8402
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-05-11 12:10:25 -07:00
parent 5a9d065f1b
commit 341f2cee6b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/qt/packet_list.cpp
View File

@ -594,12 +594,17 @@ void PacketList::setColumnVisibility()
int PacketList::sizeHintForColumn(int column) const
{
int size_hint;
int size_hint = 0;
// This is a bit hacky but Qt does a fine job of column sizing and
// reimplementing QTreeView::sizeHintForColumn seems worse.
// reimplementing QTreeView::sizeHintForColumn seems like a worse idea.
if (itemDelegateForColumn(column)) {
// In my (gcc) testing this results in correct behavior on Windows but adds extra space
// on OS X and Linux. We might want to add Q_OS_... #ifdefs accordingly.
size_hint = itemDelegateForColumn(column)->sizeHint(viewOptions(), QModelIndex()).width();
}
packet_list_model_->setSizeHintEnabled(false);
size_hint = QTreeView::sizeHintForColumn(column);
size_hint += QTreeView::sizeHintForColumn(column);
packet_list_model_->setSizeHintEnabled(true);
return size_hint;
}
@ -673,6 +678,7 @@ void PacketList::applyRecentColumnWidths()
{
// Either we've just started up or a profile has changed. Read
// the recent settings, apply them, and save the header state.
QFontMetrics fm = QFontMetrics(wsApp->monospaceFont());
for (int i = 0; i < prefs.num_cols; i++) {
int col_width = recent_get_column_width(i);
@ -683,9 +689,9 @@ void PacketList::applyRecentColumnWidths()
fmt = get_column_format(i);
long_str = get_column_width_string(fmt, i);
if (long_str) {
col_width = fontMetrics().width(long_str);
col_width = fm.width(long_str);
} else {
col_width = fontMetrics().width(MIN_COL_WIDTH_STR);
col_width = fm.width(MIN_COL_WIDTH_STR);
}
}
col_width += QTreeView::sizeHintForColumn(i); // Decoration padding
@ -929,7 +935,9 @@ void PacketList::setCaptureFile(capture_file *cf)
void PacketList::setMonospaceFont(const QFont &mono_font)
{
setFont(mono_font);
// Don't call setFont here. It changes the header font on Windows and
// Linux.
// qtreeview.cpp does something similar in Qt 5 so this *should* be
// safe...
int row_height = itemDelegate()->sizeHint(viewOptions(), QModelIndex()).height();