Merge pull request #6663 from spycrab/qt_fix_columns

Qt: Fix columns not properly showing / hiding
dolphin-emu · Apr 17, 2018 · e04592e · e04592e
2 parents 8bb0e0e + 9ffc600
commit e04592e
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp
@@ -84,18 +84,6 @@ void GameList::MakeListView()
             emit SelectionChanged(GetSelectedGame());
           });
 
-  m_list->setColumnHidden(GameListModel::COL_PLATFORM, !SConfig::GetInstance().m_showSystemColumn);
-  m_list->setColumnHidden(GameListModel::COL_BANNER, !SConfig::GetInstance().m_showBannerColumn);
-  m_list->setColumnHidden(GameListModel::COL_TITLE, !SConfig::GetInstance().m_showTitleColumn);
-  m_list->setColumnHidden(GameListModel::COL_DESCRIPTION,
-                          !SConfig::GetInstance().m_showDescriptionColumn);
-  m_list->setColumnHidden(GameListModel::COL_MAKER, !SConfig::GetInstance().m_showMakerColumn);
-  m_list->setColumnHidden(GameListModel::COL_ID, !SConfig::GetInstance().m_showIDColumn);
-  m_list->setColumnHidden(GameListModel::COL_COUNTRY, !SConfig::GetInstance().m_showRegionColumn);
-  m_list->setColumnHidden(GameListModel::COL_SIZE, !SConfig::GetInstance().m_showSizeColumn);
-  m_list->setColumnHidden(GameListModel::COL_FILE_NAME,
-                          !SConfig::GetInstance().m_showFileNameColumn);
-
   QHeaderView* hor_header = m_list->horizontalHeader();
 
   connect(hor_header, &QHeaderView::sortIndicatorChanged, this, &GameList::OnHeaderViewChanged);
@@ -117,6 +105,18 @@ void GameList::MakeListView()
   hor_header->setSectionResizeMode(GameListModel::COL_SIZE, QHeaderView::ResizeToContents);
   hor_header->setSectionResizeMode(GameListModel::COL_FILE_NAME, QHeaderView::Interactive);
 
+  m_list->setColumnHidden(GameListModel::COL_PLATFORM, !SConfig::GetInstance().m_showSystemColumn);
+  m_list->setColumnHidden(GameListModel::COL_BANNER, !SConfig::GetInstance().m_showBannerColumn);
+  m_list->setColumnHidden(GameListModel::COL_TITLE, !SConfig::GetInstance().m_showTitleColumn);
+  m_list->setColumnHidden(GameListModel::COL_DESCRIPTION,
+                          !SConfig::GetInstance().m_showDescriptionColumn);
+  m_list->setColumnHidden(GameListModel::COL_MAKER, !SConfig::GetInstance().m_showMakerColumn);
+  m_list->setColumnHidden(GameListModel::COL_ID, !SConfig::GetInstance().m_showIDColumn);
+  m_list->setColumnHidden(GameListModel::COL_COUNTRY, !SConfig::GetInstance().m_showRegionColumn);
+  m_list->setColumnHidden(GameListModel::COL_SIZE, !SConfig::GetInstance().m_showSizeColumn);
+  m_list->setColumnHidden(GameListModel::COL_FILE_NAME,
+                          !SConfig::GetInstance().m_showFileNameColumn);
+
   m_list->verticalHeader()->hide();
   m_list->setFrameStyle(QFrame::NoFrame);
 }
@@ -485,15 +485,15 @@ void GameList::keyReleaseEvent(QKeyEvent* event)
 void GameList::OnColumnVisibilityToggled(const QString& row, bool visible)
 {
   static const QMap<QString, int> rowname_to_col_index = {
+      {tr("Platform"), GameListModel::COL_PLATFORM},
       {tr("Banner"), GameListModel::COL_BANNER},
-      {tr("Country"), GameListModel::COL_COUNTRY},
+      {tr("Title"), GameListModel::COL_TITLE},
       {tr("Description"), GameListModel::COL_DESCRIPTION},
-      {tr("ID"), GameListModel::COL_ID},
       {tr("Maker"), GameListModel::COL_MAKER},
-      {tr("Platform"), GameListModel::COL_PLATFORM},
-      {tr("Size"), GameListModel::COL_SIZE},
-      {tr("Title"), GameListModel::COL_TITLE},
-      {tr("File Name"), GameListModel::COL_FILE_NAME}};
+      {tr("File Name"), GameListModel::COL_FILE_NAME},
+      {tr("Game ID"), GameListModel::COL_ID},
+      {tr("Region"), GameListModel::COL_COUNTRY},
+      {tr("File Size"), GameListModel::COL_SIZE}};
 
   m_list->setColumnHidden(rowname_to_col_index[row], !visible);
 }