Revert "Get rid of remains of support for non-square screen DPIs"

This reverts commit f206ed95eb.
This commit is contained in:
Henrik Rydgård
2025-05-21 21:41:50 +02:00
parent 53f8c32309
commit 09e067c6e1
31 changed files with 151 additions and 132 deletions
+6 -6
View File
@@ -321,8 +321,8 @@ public:
float xOffset = bounds_.x;
float yOffset = bounds_.y;
dc.Draw()->Rect((x1+x2)/2 + xOffset - g_display.pixel_in_dps, y1 + yOffset, 3.0f * g_display.pixel_in_dps, y2-y1, col);
dc.Draw()->Rect(x1 + xOffset, (y1+y2)/2 + yOffset - g_display.pixel_in_dps, x2-x1, 3.0f * g_display.pixel_in_dps, col);
dc.Draw()->Rect((x1+x2)/2 + xOffset - g_display.pixel_in_dps_x, y1 + yOffset, 3.0f * g_display.pixel_in_dps_x, y2-y1, col);
dc.Draw()->Rect(x1 + xOffset, (y1+y2)/2 + yOffset - g_display.pixel_in_dps_y, x2-x1, 3.0f * g_display.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);
@@ -622,10 +622,10 @@ void TouchControlLayoutScreen::update() {
Bounds bounds = layoutView_->GetBounds();
// Convert virtual pixels to real pixels.
bounds.x /= g_display.dpi_scale;
bounds.y /= g_display.dpi_scale;
bounds.w /= g_display.dpi_scale;
bounds.h /= g_display.dpi_scale;
bounds.x /= g_display.dpi_scale_x;
bounds.y /= g_display.dpi_scale_y;
bounds.w /= g_display.dpi_scale_x;
bounds.h /= g_display.dpi_scale_y;
SetOverrideScreenFrame(&bounds);
}