From 54dfd900cab72d9efeff7df35c3a73e9be76bb18 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Wed, 5 Jul 2023 18:25:16 +1000 Subject: interface.bindCanvas uses interface scale by default --- source/frontend/StarMainInterface.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'source/frontend/StarMainInterface.cpp') diff --git a/source/frontend/StarMainInterface.cpp b/source/frontend/StarMainInterface.cpp index 592bc6e..9a47835 100644 --- a/source/frontend/StarMainInterface.cpp +++ b/source/frontend/StarMainInterface.cpp @@ -796,7 +796,10 @@ void MainInterface::update() { for (auto& pair : m_canvases) { pair.second->setPosition(Vec2I()); - pair.second->setSize(Vec2I(m_guiContext->windowSize())); + if (pair.second->ignoreInterfaceScale()) + pair.second->setSize(Vec2I(m_guiContext->windowSize())); + else + pair.second->setSize(Vec2I(m_guiContext->windowInterfaceSize())); pair.second->update(); } } @@ -923,14 +926,17 @@ void MainInterface::warpTo(WarpAction const& warpAction) { } } -CanvasWidgetPtr MainInterface::fetchCanvas(String const& canvasName) { +CanvasWidgetPtr MainInterface::fetchCanvas(String const& canvasName, bool ignoreInterfaceScale) { if (auto canvasPtr = m_canvases.ptr(canvasName)) return *canvasPtr; else { CanvasWidgetPtr canvas = m_canvases.emplace(canvasName, make_shared()).first->second; canvas->setPosition(Vec2I()); - canvas->setSize(Vec2I(m_guiContext->windowSize())); - canvas->setIgnoreInterfaceScale(true); + if (ignoreInterfaceScale) + canvas->setSize(Vec2I(m_guiContext->windowSize())); + else + canvas->setSize(Vec2I(m_guiContext->windowInterfaceSize())); + canvas->setIgnoreInterfaceScale(ignoreInterfaceScale); return canvas; } } -- cgit v1.2.3