archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 19:31:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3687 from rukai/fixMakerColumn

Browse source 
DolphinWX: Disable 'maker' column hiding
This commit is contained in:
Mathew Maidment 2016-04-21 09:15:10 -04:00
commit bdb9da2104
2 changed files with 16 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
Source/Core/DolphinWX/GameListCtrl.cpp
View file

@ -1338,84 +1338,30 @@ void CGameListCtrl::AutomaticColumnWidth()
+ GetColumnWidth(COLUMN_SIZE)
+ GetColumnWidth(COLUMN_EMULATION_STATE));
// We hide the Maker column if the window is too small
// Use ShowColumn() instead of SetColumnWidth because
// the maker column may have been autohidden and the
// therefore the content needs to be restored.
if (resizable > 425)
if (SConfig::GetInstance().m_showMakerColumn &&
SConfig::GetInstance().m_showFileNameColumn)
{
if (SConfig::GetInstance().m_showMakerColumn &&
SConfig::GetInstance().m_showFileNameColumn)
{
SetColumnWidth(COLUMN_TITLE, resizable / 3);
ShowColumn(COLUMN_MAKER, resizable / 3);
SetColumnWidth(COLUMN_FILENAME, resizable / 3);
}
else if (SConfig::GetInstance().m_showMakerColumn)
{
SetColumnWidth(COLUMN_TITLE, resizable / 2);
ShowColumn(COLUMN_MAKER, resizable / 2);
}
else if (SConfig::GetInstance().m_showFileNameColumn)
{
SetColumnWidth(COLUMN_TITLE, resizable / 2);
SetColumnWidth(COLUMN_FILENAME, resizable / 2);
}
else
{
SetColumnWidth(COLUMN_TITLE, resizable);
}
SetColumnWidth(COLUMN_TITLE, resizable / 3);
SetColumnWidth(COLUMN_MAKER, resizable / 3);
SetColumnWidth(COLUMN_FILENAME, resizable / 3);
}
else if (SConfig::GetInstance().m_showMakerColumn)
{
SetColumnWidth(COLUMN_TITLE, resizable / 2);
SetColumnWidth(COLUMN_MAKER, resizable / 2);
}
else if (SConfig::GetInstance().m_showFileNameColumn)
{
SetColumnWidth(COLUMN_TITLE, resizable / 2);
SetColumnWidth(COLUMN_FILENAME, resizable / 2);
}
else
{
if (SConfig::GetInstance().m_showFileNameColumn)
{
SetColumnWidth(COLUMN_TITLE, resizable / 2);
SetColumnWidth(COLUMN_FILENAME, resizable / 2);
}
else
{
SetColumnWidth(COLUMN_TITLE, resizable);
}
HideColumn(COLUMN_MAKER);
SetColumnWidth(COLUMN_TITLE, resizable);
}
}
}
// Fills a previously hidden column with items. Acts
// as a SetColumnWidth if width is nonzero.
void CGameListCtrl::ShowColumn(int column, int width)
{
// Fill the column with items if it was hidden
if (GetColumnWidth(column) == 0)
{
for (int i = 0; i < GetItemCount(); i++)
{
UpdateItemAtColumn(i, column);
}
}
SetColumnWidth(column, width);
}
// Hide the passed column from the gamelist.
// It is not enough to set the width to zero because this leads to
// graphical glitches where the content of the hidden column is
// squeezed into the next column. Therefore we need to clear the
// items, too.
void CGameListCtrl::HideColumn(int column)
{
// Do nothing if the column is already hidden
if (GetColumnWidth(column) == 0)
return;
// Remove the items from the column
for (int i = 0; i < GetItemCount(); i++)
{
SetItem(i, column, "", -1);
}
SetColumnWidth(column, 0);
}
void CGameListCtrl::UnselectAll()
{
for (int i = 0; i < GetItemCount(); i++)

2
Source/Core/DolphinWX/GameListCtrl.h
View file

@ -105,8 +105,6 @@ private:
void CompressSelection(bool _compress);
void AutomaticColumnWidth();
void ShowColumn(int column, int width);
void HideColumn(int column);
void UnselectAll();
static bool CompressCB(const std::string& text, float percent, void* arg);