diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-05-28 22:03:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-28 22:03:38 -0700 |
| commit | c8f9900d2606ba79e309a779121cbc17d5fa3ede (patch) | |
| tree | eb69e06642c9902cbf71e71b28d6457d3defcd40 /Source | |
| parent | 57898654b957cf20dab06007921a08d31a3376ba (diff) | |
| parent | 5c08b1d7042e09409abd0d52f00dd0e13ca6f73f (diff) | |
Merge pull request #5495 from Tilka/gamelist
WX: improve game list reload speed
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Mapping/MappingBool.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/Settings/InterfacePane.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/GameListCtrl.cpp | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.h b/Source/Core/DolphinQt2/Config/Mapping/MappingBool.h index 3ad63ba200..4f8b80dcc5 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.h +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingBool.h @@ -26,5 +26,4 @@ private: MappingWidget* m_parent; ControllerEmu::BooleanSetting* m_setting; - double m_range; }; diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp index 50061cd28c..fd404fb83c 100644 --- a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp +++ b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp @@ -52,7 +52,6 @@ void InterfacePane::CreateUI() combobox_layout->addRow(tr("&Language:"), m_combobox_language); // Theme Combobox - auto* theme_layout = new QFormLayout; m_combobox_theme = new QComboBox; m_combobox_theme->setMaximumWidth(300); combobox_layout->addRow(tr("&Theme:"), m_combobox_theme); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index b620c2688e..3ec0ed3d65 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -437,6 +437,7 @@ void CGameListCtrl::ReloadList() // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) InsertItemInReportView(i); + SetColors(); // Sort items by Title if (!sorted) @@ -596,9 +597,6 @@ void CGameListCtrl::InsertItemInReportView(long index) if (GetColumnWidth(i) != 0) UpdateItemAtColumn(item_index, i); } - - // List colors - SetColors(); } 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), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - CGameListCtrl::SetItemBackgroundColour(i, color); + SetItemBackgroundColour(i, color); SetItemTextColour(i, ContrastText(color)); } } |