Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-14 19:08:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make fullscreen works

Browse Source
This commit is contained in:
Xele02 2013-02-01 02:08:01 +01:00
parent 34946d2fd8
commit d903f05dde
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Qt/mainwindow.cpp
View File

@ -6,6 +6,7 @@
#include <QDesktopServices>
#include <QUrl>
#include <QKeyEvent>
#include <QDesktopWidget>
#include "Core/MIPS/MIPSDebugInterface.h"
#include "Core/SaveState.h"
@ -13,6 +14,8 @@
#include "Core/Config.h"
#include "ConsoleListener.h"
#include "base/display.h"
#include "GPU/GPUInterface.h"
#include "GPU/GPUState.h"
#include "QtHost.h"
#include "EmuThread.h"
@ -45,8 +48,7 @@ MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
nextState(CORE_POWERDOWN),
dialogDisasm(0),
g_bFullScreen(false)
dialogDisasm(0)
{
ui->setupUi(this);
qApp->installEventFilter(this);
@ -301,9 +303,8 @@ void MainWindow::SetZoom(float zoom) {
setFixedSize(sizeHint());
resize(sizeHint());
PSP_CoreParameter().pixelWidth = (int) (480 * zoom);
PSP_CoreParameter().pixelHeight = (int) (272 * zoom);
//GL_Resized();
PSP_CoreParameter().pixelWidth = pixel_xres;
PSP_CoreParameter().pixelHeight = pixel_yres;
}
void MainWindow::on_action_FileLoad_triggered()
@ -584,16 +585,36 @@ void MainWindow::on_action_OptionsIgnoreIllegalReadsWrites_triggered()
void MainWindow::on_action_OptionsFullScreen_triggered()
{
// TODO
if(g_bFullScreen) {
//_ViewNormal(hWnd);
SetZoom(1); //restore window to original size
if(isFullScreen()) {
showNormal();
ui->menubar->setVisible(true);
ui->statusbar->setVisible(true);
SetZoom(g_Config.iWindowZoom);
}
else {
/*int cx = ::GetSystemMetrics(SM_CXSCREEN);
float screenfactor = cx / 480.0f;
SetZoom(screenfactor);
_ViewFullScreen(hWnd);*/
ui->menubar->setVisible(false);
ui->statusbar->setVisible(false);
// Remove constraint
w->setMinimumSize(0, 0);
w->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
ui->centralwidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
showFullScreen();
int width = (int) QApplication::desktop()->screenGeometry().width();
int height = (int) QApplication::desktop()->screenGeometry().height();
PSP_CoreParameter().pixelWidth = width;
PSP_CoreParameter().pixelHeight = height;
PSP_CoreParameter().renderWidth = width;
PSP_CoreParameter().renderHeight = height;
PSP_CoreParameter().outputWidth = width;
PSP_CoreParameter().outputHeight = height;
pixel_xres = width;
pixel_yres = height;
if (gpu)
gpu->Resized();
}
}
@ -646,6 +667,12 @@ void MainWindow::closeEvent(QCloseEvent *event)
void MainWindow::keyPressEvent(QKeyEvent *e)
{
if(isFullScreen() && e->key() == Qt::Key_F12)
{
on_action_OptionsFullScreen_triggered();
return;
}
for (int b = 0; b < 14; b++) {
if (e->key() == buttonMappings[b])
{

9
Qt/mainwindow.ui
View File

@ -324,9 +324,6 @@
</property>
</action>
<action name="action_OptionsFullScreen">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Toggle Full Screen</string>
</property>
@ -407,7 +404,7 @@
<string>Screen &amp;2x</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+2</string>
<string>Ctrl+2</string>
</property>
</action>
<action name="action_OptionsScreen3x">
@ -418,7 +415,7 @@
<string>Screen &amp;3x</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+3</string>
<string>Ctrl+3</string>
</property>
</action>
<action name="action_OptionsScreen4x">
@ -429,7 +426,7 @@
<string>Screen &amp;4x</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+3</string>
<string>Ctrl+4</string>
</property>
</action>
<action name="action_OptionsFastMemory">