mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-05 00:40:00 +00:00
Linux: When you resize Window, it now resizes video, if you go above start dimension, it goes weird. Gotta look in to it
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@289 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
5f925882d9
commit
18270f0904
@ -517,18 +517,36 @@ void OpenGL_Update()
|
|||||||
nXoff = (nBackbufferWidth - (640 * MValueX)) / 2;
|
nXoff = (nBackbufferWidth - (640 * MValueX)) / 2;
|
||||||
nYoff = (nBackbufferHeight - (480 * MValueY)) / 2;
|
nYoff = (nBackbufferHeight - (480 * MValueY)) / 2;
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
u32 TmpAAx = (width / 640) - 1;
|
|
||||||
u32 TmpAAy = (height / 480) - 1;
|
|
||||||
u32 FinalAA = TmpAAx < TmpAAy ? TmpAAx : TmpAAy;
|
|
||||||
|
|
||||||
g_AAx = FinalAA;
|
|
||||||
g_AAy = FinalAA;
|
|
||||||
|
|
||||||
s_nTargetWidth = 640<<g_AAx;
|
|
||||||
s_nTargetHeight = 480<<g_AAy; */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#elif defined(__linux__)
|
||||||
|
Window winDummy;
|
||||||
|
unsigned int borderDummy;
|
||||||
|
XGetGeometry(GLWin.dpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
|
||||||
|
&GLWin.width, &GLWin.height, &borderDummy, &GLWin.depth);
|
||||||
|
nBackbufferWidth = GLWin.width;
|
||||||
|
nBackbufferHeight = GLWin.height;
|
||||||
|
float FactorW = 640.0f / (float)nBackbufferWidth;
|
||||||
|
float FactorH = 480.0f / (float)nBackbufferHeight;
|
||||||
|
|
||||||
|
float Max = (FactorW < FactorH) ? FactorH : FactorW;
|
||||||
|
|
||||||
|
if(g_Config.bStretchToFit)
|
||||||
|
{
|
||||||
|
MValueX = 1.0f / FactorW;
|
||||||
|
MValueY = 1.0f / FactorH;
|
||||||
|
nXoff = 0;
|
||||||
|
nYoff = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MValueX = 1.0f / Max;
|
||||||
|
MValueY = 1.0f / Max;
|
||||||
|
nXoff = (nBackbufferWidth - (640 * MValueX)) / 2;
|
||||||
|
nYoff = (nBackbufferHeight - (480 * MValueY)) / 2;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
//SDL stuff
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user