archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu synced 2024-09-20 03:11:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Create GamePad window at correct size (#1247)

Browse source 
Don't change the size on canvas initialization
This commit is contained in:
Colin Kinloch 2024-06-29 21:31:47 +01:00 committed by GitHub
parent aefbb918be
commit 64b0b85ed5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/PadViewFrame.cpp
View file

@ -20,18 +20,24 @@
extern WindowInfo g_window_info; extern WindowInfo g_window_info;
#define PAD_MIN_WIDTH 320
#define PAD_MIN_HEIGHT 180
PadViewFrame::PadViewFrame(wxFrame* parent) PadViewFrame::PadViewFrame(wxFrame* parent)
: wxFrame(nullptr, wxID_ANY, _("GamePad View"), wxDefaultPosition, wxSize(854, 480), wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER | wxCLOSE_BOX | wxWANTS_CHARS) : wxFrame(nullptr, wxID_ANY, _("GamePad View"), wxDefaultPosition, wxDefaultSize, wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER | wxCLOSE_BOX | wxWANTS_CHARS)
{ {
gui_initHandleContextFromWxWidgetsWindow(g_window_info.window_pad, this); gui_initHandleContextFromWxWidgetsWindow(g_window_info.window_pad, this);
SetIcon(wxICON(M_WND_ICON128)); SetIcon(wxICON(M_WND_ICON128));
wxWindow::EnableTouchEvents(wxTOUCH_PAN_GESTURES); wxWindow::EnableTouchEvents(wxTOUCH_PAN_GESTURES);
SetMinClientSize({ 320, 180 }); SetMinClientSize({ PAD_MIN_WIDTH, PAD_MIN_HEIGHT });
SetPosition({ g_window_info.restored_pad_x, g_window_info.restored_pad_y }); SetPosition({ g_window_info.restored_pad_x, g_window_info.restored_pad_y });
SetSize({ g_window_info.restored_pad_width, g_window_info.restored_pad_height }); if (g_window_info.restored_pad_width >= PAD_MIN_WIDTH && g_window_info.restored_pad_height >= PAD_MIN_HEIGHT)
SetClientSize({ g_window_info.restored_pad_width, g_window_info.restored_pad_height });
else
SetClientSize(wxSize(854, 480));
if (g_window_info.pad_maximized) if (g_window_info.pad_maximized)
Maximize(); Maximize();
@ -72,7 +78,7 @@ void PadViewFrame::InitializeRenderCanvas()
m_render_canvas = GLCanvas_Create(this, wxSize(854, 480), false); m_render_canvas = GLCanvas_Create(this, wxSize(854, 480), false);
sizer->Add(m_render_canvas, 1, wxEXPAND, 0, nullptr); sizer->Add(m_render_canvas, 1, wxEXPAND, 0, nullptr);
} }
SetSizerAndFit(sizer); SetSizer(sizer);
Layout(); Layout();
m_render_canvas->Bind(wxEVT_KEY_UP, &PadViewFrame::OnKeyUp, this); m_render_canvas->Bind(wxEVT_KEY_UP, &PadViewFrame::OnKeyUp, this);