ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #801 from turtleli/windows-left-list-icons 

Have listbook icons (Emulation Settings, Plugin BIOS selector) on the left for all platforms.
Don't set minimum widths for Framelimiter and Frameskip panels.
This commit is contained in:
Jonathan Li 2015-09-07 08:46:49 +01:00
parent ca0aeb8e62 1d2d8cd38b
commit 9d4a8688c1
5 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp
View File

@ -37,12 +37,9 @@ DEFINE_EVENT_TYPE( pxEvt_SomethingChanged )
using namespace Panels; using namespace Panels;
// configure the orientation of the listbox based on the platform // configure the orientation of the listbox based on the platform
// For now, they're all on the left.
static const int s_orient = wxLB_LEFT;
#if defined(__WXMAC__) || defined(__WXMSW__)
static const int s_orient = wxBK_TOP;
#else
static const int s_orient = wxBK_LEFT;
#endif
class ScopedOkButtonDisabler class ScopedOkButtonDisabler
{ {
@ -315,9 +312,3 @@ void Dialogs::BaseConfigurationDialog::OnScreenshot_Click( wxCommandEvent& evt )
#endif #endif
} }
} }
void Dialogs::BaseConfigurationDialog::OnSettingsApplied( wxCommandEvent& evt )
{
evt.Skip();
MSW_ListView_SetIconSpacing( m_listbook, GetClientSize().GetWidth() );
}

2
pcsx2/gui/Dialogs/ConfigurationDialog.h
View File

@ -70,8 +70,6 @@ namespace Dialogs
} }
protected: protected:
void OnSettingsApplied( wxCommandEvent& evt );
void OnOk_Click( wxCommandEvent& evt ); void OnOk_Click( wxCommandEvent& evt );
void OnCancel_Click( wxCommandEvent& evt ); void OnCancel_Click( wxCommandEvent& evt );
void OnApply_Click( wxCommandEvent& evt ); void OnApply_Click( wxCommandEvent& evt );

26
pcsx2/gui/MSWstuff.cpp
View File

@ -14,15 +14,11 @@
*/ */
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "GSFrame.h"
#include "MSWstuff.h" #include "MSWstuff.h"
#include <wx/listbook.h>
#include <wx/listctrl.h>
#ifdef __WXMSW__ #ifdef __WXMSW__
# include <wx/msw/wrapwin.h> // needed for OutputDebugString # include <wx/msw/wrapwin.h> // needed for OutputDebugString
# include <commctrl.h>
#endif #endif
void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter ) void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter )
@ -32,28 +28,6 @@ void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter )
#endif #endif
} }
void MSW_ListView_SetIconSpacing( wxListbook& listbook, int width )
{
#ifdef __WXMSW__
// Depending on Windows version and user appearance settings, the default icon spacing can be
// way over generous. This little bit of Win32-specific code ensures proper icon spacing, scaled
// to the size of the frame's ideal width.
if (listbook.GetPageCount())
{
ListView_SetIconSpacing( (HWND)listbook.GetListView()->GetHWND(),
(width / listbook.GetPageCount()) - 4, g_Conf->Listbook_ImageSize+32 // y component appears to be ignored
);
}
#endif
}
void MSW_ListView_SetIconSpacing( wxListbook* listbook, int width )
{
if( listbook == NULL ) return;
MSW_ListView_SetIconSpacing( *listbook, width );
}
float MSW_GetDPIScale() float MSW_GetDPIScale()
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__

5
pcsx2/gui/MSWstuff.h
View File

@ -15,12 +15,9 @@
#pragma once #pragma once
class wxListbook; // FIXME: Missing some includes.
extern void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter ); extern void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter );
extern void MSW_OutputDebugString( const wxString& text ); extern void MSW_OutputDebugString( const wxString& text );
extern void MSW_ListView_SetIconSpacing( wxListbook& listbook, int width );
extern void MSW_ListView_SetIconSpacing( wxListbook* listbook, int width );
extern float MSW_GetDPIScale(); extern float MSW_GetDPIScale();
extern void pxDwm_Load(); extern void pxDwm_Load();

4
pcsx2/gui/Panels/VideoPanel.cpp
View File

@ -29,8 +29,6 @@ using namespace pxSizerFlags;
Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent ) Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent )
: BaseApplicableConfigPanel_SpecificConfig( parent ) : BaseApplicableConfigPanel_SpecificConfig( parent )
{ {
SetMinWidth( 280 );
m_check_LimiterDisable = new pxCheckBox( this, _("Disable Framelimiting"), m_check_LimiterDisable = new pxCheckBox( this, _("Disable Framelimiting"),
_("Useful for running benchmarks. Toggle this option in-game by pressing F4.") ); _("Useful for running benchmarks. Toggle this option in-game by pressing F4.") );
@ -169,8 +167,6 @@ void Panels::FramelimiterPanel::Apply()
Panels::FrameSkipPanel::FrameSkipPanel( wxWindow* parent ) Panels::FrameSkipPanel::FrameSkipPanel( wxWindow* parent )
: BaseApplicableConfigPanel_SpecificConfig( parent ) : BaseApplicableConfigPanel_SpecificConfig( parent )
{ {
SetMinWidth( 350 );
const RadioPanelItem FrameskipOptions[] = const RadioPanelItem FrameskipOptions[] =
{ {
RadioPanelItem( RadioPanelItem(