piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-21 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add hybrid layout (#772)

Browse Source
This commit is contained in:
gal20
2021-01-25 20:47:54 +02:00
committed by GitHub
parent 43348210f9
commit 54b1a752d4
4 changed files with 124 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontend/qt_sdl/main.cpp
View File

@ -689,13 +689,20 @@ QSize ScreenHandler::screenGetMinSize()
else
return QSize(w, h+gap+h);
}
else // horizontal
else if (Config::ScreenLayout == 2) // horizontal
{
if (isHori)
return QSize(h+gap+h, w);
else
return QSize(w+gap+w, h);
}
else // hybrid
{
if (isHori)
return QSize(h+gap+h, 3*w +(4*gap) / 3);
else
return QSize(3*w +(4*gap) / 3, h+gap+h);
}
}
void ScreenHandler::screenOnMousePress(QMouseEvent* event)
@ -1257,9 +1264,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
QMenu* submenu = menu->addMenu("Screen layout");
grpScreenLayout = new QActionGroup(submenu);
const char* screenlayout[] = {"Natural", "Vertical", "Horizontal"};
const char* screenlayout[] = {"Natural", "Vertical", "Horizontal", "Hybrid"};
for (int i = 0; i < 3; i++)
for (int i = 0; i < 4; i++)
{
actScreenLayout[i] = submenu->addAction(QString(screenlayout[i]));
actScreenLayout[i]->setActionGroup(grpScreenLayout);
@ -2258,13 +2265,20 @@ void MainWindow::onChangeScreenSize()
else
resize(QSize(w, h+gap+h) + diff);
}
else // horizontal
else if (Config::ScreenLayout == 2) // horizontal
{
if (isHori)
resize(QSize(h+gap+h, w) + diff);
else
resize(QSize(w+gap+w, h) + diff);
}
else // hybrid
{
if (isHori)
return resize(QSize(h+gap+h, 3*w +(4*gap) / 3) + diff);
else
return resize(QSize(3*w +(4*gap) / 3, h+gap+h) + diff);
}
}
void MainWindow::onChangeScreenRotation(QAction* act)
@ -2501,7 +2515,7 @@ int main(int argc, char** argv)
SANITIZE(Config::MicInputType, 0, 3);
SANITIZE(Config::ScreenRotation, 0, 3);
SANITIZE(Config::ScreenGap, 0, 500);
SANITIZE(Config::ScreenLayout, 0, 2);
SANITIZE(Config::ScreenLayout, 0, 3);
SANITIZE(Config::ScreenSizing, 0, 5);
SANITIZE(Config::ScreenAspectTop, 0, 4);
SANITIZE(Config::ScreenAspectBot, 0, 4);