externals/cpmfile.json

@@ -30,7 +30,6 @@
         "tag": "v%VERSION%",
         "hash": "5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded",
         "git_version": "0.37.0",
-        "version": "0.18.7",
         "find_args": "MODULE GLOBAL",
         "patches": [
             "0001-mingw.patch",

src/yuzu/game/game_card.cpp

@@ -18,25 +18,8 @@ void GameCard::paint(QPainter* painter, const QStyleOptionViewItem& option,
     painter->save();
     painter->setRenderHint(QPainter::Antialiasing);
 
-    // Padding, dimensions, alignment...
-    const int column = index.row() % m_columns;
-    const int cell_width = option.rect.width();
-    const int fixed_card_width = cell_width - m_padding;
-    const int margins = 8;
-
-    // The gist of it is that this anchors the left and right sides to the edges,
-    // while maintaining an even gap between each card.
-    // I just smashed random keys into my keyboard until something worked.
-    // Don't even bother trying to figure out what the hell this is doing.
-    const auto total_row_width = m_columns * cell_width;
-    const auto total_gap_space = total_row_width - (margins * 2) - (m_columns * fixed_card_width);
-    const auto gap = (m_columns > 1) ? (total_gap_space / (m_columns - 1)) : 0;
-
-    const auto relative_x = margins + (column * (fixed_card_width + gap));
-    const auto x_pos = option.rect.left() - (column * cell_width) + static_cast<int>(relative_x);
-
-    // also, add some additional padding here to prevent card overlap
-    QRect cardRect(x_pos + 4, option.rect.top() + 4, fixed_card_width - 8, option.rect.height() - margins);
+    // padding
+    QRect cardRect = option.rect.adjusted(4 + m_padding / 2, 4, -4 - m_padding / 2, -4);
 
     // colors
     QPalette palette = option.palette;
@@ -58,6 +41,8 @@ void GameCard::paint(QPainter* painter, const QStyleOptionViewItem& option,
     painter->setPen(QPen(borderColor, 1));
     painter->drawRoundedRect(cardRect, 10, 10);
 
+    static constexpr const int padding = 8;
+
     // icon
     int _iconsize = UISettings::values.game_icon_size.GetValue();
     QSize iconSize(_iconsize, _iconsize);
@@ -69,7 +54,7 @@ void GameCard::paint(QPainter* painter, const QStyleOptionViewItem& option,
         scaledSize.scale(iconSize, Qt::KeepAspectRatio);
 
         int x = cardRect.left() + (cardRect.width() - scaledSize.width()) / 2;
-        int y = cardRect.top() + margins;
+        int y = cardRect.top() + padding;
 
         iconRect = QRect(x, y, scaledSize.width(), scaledSize.height());
 
@@ -88,14 +73,17 @@ void GameCard::paint(QPainter* painter, const QStyleOptionViewItem& option,
         painter->restore();
     } else {
         // if there is no icon just draw a blank rect
-        iconRect = QRect(cardRect.left() + margins, cardRect.top() + margins, _iconsize, _iconsize);
+        iconRect = QRect(cardRect.left() + padding, cardRect.top() + padding, _iconsize, _iconsize);
     }
 
     if (UISettings::values.show_game_name.GetValue()) {
+        // if "none" is selected, pretend there's a
+        _iconsize = _iconsize ? _iconsize : 96;
+
         // padding + text
         QRect textRect = cardRect;
-        textRect.setTop(iconRect.bottom() + margins);
-        textRect.adjust(margins, 0, -margins, -margins);
+        textRect.setTop(iconRect.bottom() + 8);
+        textRect.adjust(padding, 0, -padding, -padding);
 
         // We are already crammed on space, ignore the row 2
         QString title = index.data(Qt::DisplayRole).toString();
@@ -107,7 +95,8 @@ void GameCard::paint(QPainter* painter, const QStyleOptionViewItem& option,
         font.setBold(true);
 
         // TODO(crueter): fix this abysmal scaling
-        font.setPixelSize(1.5 + std::max(10.0, std::sqrt(_iconsize)));
+        // If "none" is selected, then default to 8.5 point font.
+        font.setPointSize(1 + std::max(7.0, _iconsize ? std::sqrt(_iconsize * 0.6) : 7.5));
 
         // TODO(crueter): elide mode
         painter->setFont(font);
@@ -122,8 +111,7 @@ QSize GameCard::sizeHint(const QStyleOptionViewItem& option, const QModelIndex&
     return m_size;
 }
 
-void GameCard::setSize(const QSize& newSize, const int padding, const int columns) {
+void GameCard::setSize(const QSize& newSize, const int padding) {
     m_size = newSize;
     m_padding = padding;
-    m_columns = columns;
 }

src/yuzu/game/game_card.h

@@ -18,10 +18,9 @@ public:
                const QModelIndex& index) const override;
 
     QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    void setSize(const QSize& newSize, const int padding, const int columns);
+    void setSize(const QSize& newSize, const int padding);
 
 private:
     QSize m_size;
     int m_padding;
-    int m_columns;
 };

src/yuzu/game/game_list.cpp

@@ -411,7 +411,7 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid
     list_view->setEditTriggers(QAbstractItemView::NoEditTriggers);
     list_view->setContextMenuPolicy(Qt::CustomContextMenu);
     list_view->setGridSize(QSize(140, 160));
-    m_gameCard->setSize(list_view->gridSize(), 0, 4);
+    m_gameCard->setSize(list_view->gridSize(), 0);
 
     list_view->setSpacing(10);
     list_view->setWordWrap(true);
@@ -1051,8 +1051,8 @@ void GameList::UpdateIconSize() {
 
     // And now stretch it a bit to fill out remaining space.
     // Not perfect but works well enough for now
-    int columns = std::max(1, (view_width - 16) / min_item_width);
-    int stretched_width = ((view_width) - (spacing * (columns - 1))) / columns;
+    int columns = std::max(1, view_width / min_item_width);
+    int stretched_width = (view_width - (spacing * (columns - 1))) / columns;
 
     // only updates things if grid size is changed
     QSize grid_size(stretched_width, icon_size + heightMargin);
@@ -1060,7 +1060,7 @@ void GameList::UpdateIconSize() {
         list_view->setUpdatesEnabled(false);
 
         list_view->setGridSize(grid_size);
-        m_gameCard->setSize(grid_size, stretched_width - min_item_width, columns);
+        m_gameCard->setSize(grid_size, stretched_width - min_item_width);
 
         list_view->setUpdatesEnabled(true);
     }