From 8bc8c768f4183341cda12476c1941b08f724ea87 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Tue, 15 Mar 2011 00:10:30 +0000 Subject: [PATCH] Changing some default layout spacings for the memcard manager. Prolly still not final :p git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4434 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/Panels/MemoryCardListPanel.cpp | 9 ++++++++- pcsx2/gui/Panels/MemoryCardListView.cpp | 14 +++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 91a2fe46e6..f24cffc905 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -510,7 +510,14 @@ Panels::MemoryCardListPanel_Simple::MemoryCardListPanel_Simple( wxWindow* parent m_MultitapEnabled[1] = false; m_listview = new MemoryCardListView_Simple(this); - m_listview->SetMinSize(wxSize(m_listview->GetMinWidth(), m_listview->GetCharHeight() * 13)); + + // Fixme: Small problem: + // m_listview->GetMinWidth() can return -1 (On Win7 x64 + Aero for example) + if ( m_listview->GetMinWidth() <= 0 ) + m_listview->SetMinSize(wxSize(740, m_listview->GetCharHeight() * 14)); // 740 is nice for default font sizes + else + m_listview->SetMinSize(wxSize(m_listview->GetMinWidth(), m_listview->GetCharHeight() * 14)); + m_listview->SetDropTarget( new McdDropTarget(m_listview) ); m_button_Create = new wxButton(this, wxID_ANY, _("Create card file")); diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp index 0f534db4d9..831d23bcd5 100644 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ b/pcsx2/gui/Panels/MemoryCardListView.cpp @@ -102,13 +102,13 @@ const ListViewColumnInfo& MemoryCardListView_Simple::GetDefaultColumnInfo( uint { static const ListViewColumnInfo columns[] = { - { _("PS2 Port") , 140 , wxLIST_FORMAT_LEFT }, - { _("Port status") , 96 , wxLIST_FORMAT_LEFT }, - { _("File name") , 256 , wxLIST_FORMAT_LEFT }, - { _("File size") , 72 , wxLIST_FORMAT_LEFT }, - { _("Formatted") , 96 , wxLIST_FORMAT_LEFT }, - { _("Last Modified"), 120 , wxLIST_FORMAT_LEFT }, - { _("Created on") , 120 , wxLIST_FORMAT_LEFT }, + { _("PS2 Port") , 160 , wxLIST_FORMAT_LEFT }, + { _("Port status") , 80 , wxLIST_FORMAT_LEFT }, + { _("File name") , 128 , wxLIST_FORMAT_LEFT }, + { _("File size") , 80 , wxLIST_FORMAT_LEFT }, + { _("Formatted") , 80 , wxLIST_FORMAT_LEFT }, + { _("Last Modified"), 96 , wxLIST_FORMAT_LEFT }, + { _("Created on") , 96 , wxLIST_FORMAT_LEFT }, }; pxAssumeDev( idx < ArraySize(columns), "ListView column index is out of bounds." );