Merge pull request #5495 from Tilka/gamelist

WX: improve game list reload speed
This commit is contained in:
shuffle2
2017-05-28 22:03:38 -07:00
committed by GitHub
3 changed files with 2 additions and 6 deletions

View File

@ -26,5 +26,4 @@ private:
MappingWidget* m_parent; MappingWidget* m_parent;
ControllerEmu::BooleanSetting* m_setting; ControllerEmu::BooleanSetting* m_setting;
double m_range;
}; };

View File

@ -52,7 +52,6 @@ void InterfacePane::CreateUI()
combobox_layout->addRow(tr("&Language:"), m_combobox_language); combobox_layout->addRow(tr("&Language:"), m_combobox_language);
// Theme Combobox // Theme Combobox
auto* theme_layout = new QFormLayout;
m_combobox_theme = new QComboBox; m_combobox_theme = new QComboBox;
m_combobox_theme->setMaximumWidth(300); m_combobox_theme->setMaximumWidth(300);
combobox_layout->addRow(tr("&Theme:"), m_combobox_theme); combobox_layout->addRow(tr("&Theme:"), m_combobox_theme);

View File

@ -437,6 +437,7 @@ void CGameListCtrl::ReloadList()
// add all items // add all items
for (int i = 0; i < (int)m_ISOFiles.size(); i++) for (int i = 0; i < (int)m_ISOFiles.size(); i++)
InsertItemInReportView(i); InsertItemInReportView(i);
SetColors();
// Sort items by Title // Sort items by Title
if (!sorted) if (!sorted)
@ -596,9 +597,6 @@ void CGameListCtrl::InsertItemInReportView(long index)
if (GetColumnWidth(i) != 0) if (GetColumnWidth(i) != 0)
UpdateItemAtColumn(item_index, i); UpdateItemAtColumn(item_index, i);
} }
// List colors
SetColors();
} }
static wxColour blend50(const wxColour& c1, const wxColour& c2) static wxColour blend50(const wxColour& c1, const wxColour& c2)
@ -626,7 +624,7 @@ void CGameListCtrl::SetColors()
wxColour color = (i & 1) ? blend50(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), wxColour color = (i & 1) ? blend50(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT),
wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) :
wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
CGameListCtrl::SetItemBackgroundColour(i, color); SetItemBackgroundColour(i, color);
SetItemTextColour(i, ContrastText(color)); SetItemTextColour(i, ContrastText(color));
} }
} }