preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 09:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16431 from iota97/grid-center

Browse Source 
Snap from screen center
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2022-11-25 10:03:45 +01:00
2 parents 9eb97830c5 e4234bcfaf
commit 8f141d1872
1 file changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files
UI/TouchControlLayoutScreen.cpp
+10 -4
View File
@@ -22,6 +22,7 @@
#include "Common/Render/DrawBuffer.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Math/math_util.h"
#include "Common/System/Display.h"
#include "Common/UI/Context.h"
#include "Common/CommonTypes.h"
@@ -327,10 +328,15 @@ public:
dc.BeginNoTex();
float xOffset = bounds_.x;
float yOffset = bounds_.y;
for (int x = x1; x < x2; x += g_Config.iTouchSnapGridSize)
dc.Draw()->Rect((x1+x2)/2 + xOffset - pixel_in_dps_x, y1 + yOffset, 3.0*pixel_in_dps_x, y2-y1, col);
dc.Draw()->Rect(x1 + xOffset, (y1+y2)/2 + yOffset - pixel_in_dps_y, x2-x1, 3.0*pixel_in_dps_y, col);
for (int x = x1 + (x1+x2)/2 % g_Config.iTouchSnapGridSize; x < x2; x += g_Config.iTouchSnapGridSize)
dc.Draw()->vLine(x + xOffset, y1 + yOffset, y2 + yOffset, col);
for (int y = y1; y < y2; y += g_Config.iTouchSnapGridSize)
for (int y = y1 + (y1+y2)/2 % g_Config.iTouchSnapGridSize; y < y2; y += g_Config.iTouchSnapGridSize)
dc.Draw()->hLine(x1 + xOffset, y + yOffset, x2 + xOffset, col);
dc.Flush();
dc.Begin();
}
@@ -401,8 +407,8 @@ void ControlLayoutView::Touch(const TouchInput &touch) {
newPos.x = startObjectX_ + (touch.x - startDragX_);
newPos.y = startObjectY_ + (touch.y - startDragY_);
if (g_Config.bTouchSnapToGrid) {
newPos.x -= fmod(newPos.x, g_Config.iTouchSnapGridSize);
newPos.y -= fmod(newPos.y, g_Config.iTouchSnapGridSize);
newPos.x -= fmod(newPos.x - validRange.w/2, g_Config.iTouchSnapGridSize);
newPos.y -= fmod(newPos.y - validRange.h/2, g_Config.iTouchSnapGridSize);
}
newPos = ClampTo(newPos, validRange);