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

Qt: Make utils more independent. 

Use qApp instead of wsApp in ColorUtils and StockIcon.
This commit is contained in:
Gerald Combs 2021-12-22 17:02:50 -08:00 committed by Gerald Combs
parent 8d421de42c
commit 20ebe853d1
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/utils/color_utils.cpp
View File

@ -9,8 +9,8 @@
#include <ui/qt/utils/color_utils.h>
#include <ui/qt/utils/tango_colors.h>
#include <ui/qt/wireshark_application.h>
#include <QApplication>
#include <QPalette>
// Colors we use in various parts of the UI.
@ -143,7 +143,7 @@ QRgb ColorUtils::sequenceColor(int item)
bool ColorUtils::themeIsDark()
{
return wsApp->palette().windowText().color().lightness() > wsApp->palette().window().color().lightness();
return qApp->palette().windowText().color().lightness() > qApp->palette().window().color().lightness();
}
// Qt < 5.12.6 on macOS always uses Qt::blue for the link color, which is
@ -165,7 +165,7 @@ QBrush ColorUtils::themeLinkBrush()
return QBrush(tango_sky_blue_2);
}
#endif
return wsApp->palette().link();
return qApp->palette().link();
}
QString ColorUtils::themeLinkStyle()

13
ui/qt/utils/stock_icon.cpp
View File

@ -40,8 +40,7 @@
// GTK_STOCK_PREFERENCES preferences-system
// GTK_STOCK_HELP help-contents
#include "wireshark_application.h"
#include <QApplication>
#include <QFile>
#include <QFontMetrics>
#include <QMap>
@ -72,7 +71,7 @@ StockIcon::StockIcon(const QString icon_name) :
// Is this is an icon we've manually mapped to a standard pixmap below?
if (icon_name_to_standard_pixmap_.contains(icon_name)) {
QIcon standard_icon = wsApp->style()->standardIcon(icon_name_to_standard_pixmap_[icon_name]);
QIcon standard_icon = qApp->style()->standardIcon(icon_name_to_standard_pixmap_[icon_name]);
swap(standard_icon);
return;
}
@ -97,7 +96,7 @@ StockIcon::StockIcon(const QString icon_name) :
QPixmap mask_pm = mask_icon.pixmap(sz);
QImage normal_img(sz, QImage::Format_ARGB32);
QPainter painter(&normal_img);
QBrush br(wsApp->palette().color(QPalette::Active, QPalette::WindowText));
QBrush br(qApp->palette().color(QPalette::Active, QPalette::WindowText));
painter.fillRect(0, 0, sz.width(), sz.height(), br);
painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
painter.drawPixmap(0, 0, mask_pm);
@ -107,9 +106,9 @@ StockIcon::StockIcon(const QString icon_name) :
addPixmap(normal_pm, QIcon::Normal, QIcon::Off);
QStyleOption opt = {};
opt.palette = wsApp->palette();
opt.palette = qApp->palette();
foreach (QIcon::Mode icon_mode, icon_modes) {
QPixmap mode_pm = wsApp->style()->generatedIconPixmap(icon_mode, normal_pm, &opt);
QPixmap mode_pm = qApp->style()->generatedIconPixmap(icon_mode, normal_pm, &opt);
addPixmap(mode_pm, icon_mode, QIcon::On);
addPixmap(mode_pm, icon_mode, QIcon::Off);
}
@ -159,7 +158,7 @@ QIcon StockIcon::colorIcon(const QRgb bg_color, const QRgb fg_color, const QStri
painter.drawRect(border);
if (!glyph.isEmpty()) {
QFont font(wsApp->font());
QFont font(qApp->font());
font.setPointSizeF(size / 2.0);
painter.setFont(font);
QRectF bounding = painter.boundingRect(pm.rect(), glyph, Qt::AlignHCenter | Qt::AlignVCenter);