Update to spice2x-25-04-25 (pre-apply)
> broken commit
This commit is contained in:
@@ -1,13 +1,23 @@
|
||||
#undef CINTERFACE
|
||||
|
||||
#include "iidx_sub.h"
|
||||
#include "cfg/screen_resize.h"
|
||||
#include "games/iidx/iidx.h"
|
||||
#include "hooks/graphics/graphics.h"
|
||||
#include "touch/touch.h"
|
||||
|
||||
namespace overlay::windows {
|
||||
|
||||
IIDXSubScreen::IIDXSubScreen(SpiceOverlay *overlay) : GenericSubScreen(overlay) {
|
||||
this->title = "IIDX Sub Screen";
|
||||
|
||||
if (GRAPHICS_IIDX_WSUB) {
|
||||
this->disabled_message =
|
||||
"Close this overlay and use the second window.\n"
|
||||
"Or, turn on -iidxnosub to use the overlay instead.";
|
||||
this->draws_window = false;
|
||||
}
|
||||
|
||||
float size = 0.5f;
|
||||
if (games::iidx::SUBSCREEN_OVERLAY_SIZE.has_value()) {
|
||||
if (games::iidx::SUBSCREEN_OVERLAY_SIZE.value() == "large") {
|
||||
@@ -15,6 +25,7 @@ namespace overlay::windows {
|
||||
} else if (games::iidx::SUBSCREEN_OVERLAY_SIZE.value() == "small") {
|
||||
size = 0.3f;
|
||||
} else if (games::iidx::SUBSCREEN_OVERLAY_SIZE.value() == "fullscreen") {
|
||||
GENERIC_SUB_WINDOW_FULLSIZE = true;
|
||||
this->draws_window = false;
|
||||
}
|
||||
}
|
||||
@@ -37,7 +48,14 @@ namespace overlay::windows {
|
||||
return;
|
||||
}
|
||||
|
||||
*x_out = xy_in.x * ImGui::GetIO().DisplaySize.x;
|
||||
*y_out = xy_in.y * ImGui::GetIO().DisplaySize.y;
|
||||
if (GRAPHICS_WINDOWED) {
|
||||
// Touch needs to be registered on global coords
|
||||
*x_out = SPICETOUCH_TOUCH_X + xy_in.x * SPICETOUCH_TOUCH_WIDTH;
|
||||
*y_out = SPICETOUCH_TOUCH_Y + xy_in.y * SPICETOUCH_TOUCH_HEIGHT;
|
||||
} else {
|
||||
// Fullscreen mode, scale to game coords
|
||||
*x_out = xy_in.x * ImGui::GetIO().DisplaySize.x;
|
||||
*y_out = xy_in.y * ImGui::GetIO().DisplaySize.y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user