mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-10 03:53:26 -08:00
[Icons] Render lock and dropdown glyphs through the icon engine
Both generators rendered the sentinel SVG to a fixed height x height pixmap at DPR 1. The pre-migration path rendered larger and let QIcon scale it, so on a 2x display the games-list lock (13px) and the banner dropdown arrow (24px) came back crisp; the new path hands the widget a DPR-1 bitmap that gets upscaled and blurred. - The games list asks the themed engine for `icons/lock` directly, so the item view paints it at the device pixel ratio and the lock also follows HighlightedText on a selected row. - The dropdown goes through `loadThemedIcon(...).pixmap(size, dpr)`, which keeps the glyph's aspect ratio and renders at the requested ratio. - LockPixmapGenerator has no consumer left, so it and its cache are gone.
This commit is contained in:
parent
c2ecd58e99
commit
31fb173881
4 changed files with 15 additions and 42 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#include "games_model.h"
|
||||
|
||||
#include "../../../client/settings/cache_settings.h"
|
||||
#include "../../theme_icon.h"
|
||||
#include "../interface/pixel_map_generator.h"
|
||||
#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
|
||||
#include "user/user_list_proxy.h"
|
||||
|
|
@ -85,7 +86,8 @@ const QString GamesModel::getGameCreatedString(const int secs)
|
|||
}
|
||||
|
||||
GamesModel::GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent)
|
||||
: QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes)
|
||||
: QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes),
|
||||
lockIcon(loadThemedIcon(QStringLiteral("icons/lock")))
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +190,9 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
|
|||
return result.join(", ");
|
||||
}
|
||||
case Qt::DecorationRole: {
|
||||
return gameentry.with_password() ? QIcon(LockPixmapGenerator::generatePixmap(13)) : QVariant();
|
||||
// One engine per model: it is palette- and theme-aware and
|
||||
// invalidates itself, so a repaint must not build a new one.
|
||||
return gameentry.with_password() ? lockIcon : QVariant();
|
||||
case Qt::TextAlignmentRole:
|
||||
return Qt::AlignLeft;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include "game_type_map.h"
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
#include <QIcon>
|
||||
#include <QList>
|
||||
#include <QMap>
|
||||
#include <QModelIndex>
|
||||
|
|
@ -32,6 +33,7 @@ private:
|
|||
QList<ServerInfo_Game> gameList; /**< List of games currently displayed. */
|
||||
QMap<int, QString> rooms; /**< Map of room IDs to room names. */
|
||||
QMap<int, GameTypeMap> gameTypes; /**< Map of room IDs to available game types. */
|
||||
QIcon lockIcon; /**< Themed lock for password-protected games. */
|
||||
|
||||
static const int NUM_COLS = 8; /**< Number of columns in the table. */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue