From 3fca871fd6580f87c2f81a3c66fa75d20bf7a935 Mon Sep 17 00:00:00 2001 From: Imarok Date: Sat, 29 Jul 2017 18:30:59 +0000 Subject: [PATCH] Take gui.scale into account when repositioning tooltips Patch by: joskar Differential Revision: https://code.wildfiregames.com/D749 This was SVN commit r19928. --- binaries/data/mods/public/gui/credits/texts/programming.json | 1 + source/gui/CTooltip.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json index 4b4e401e8b..bc51bb4b77 100644 --- a/binaries/data/mods/public/gui/credits/texts/programming.json +++ b/binaries/data/mods/public/gui/credits/texts/programming.json @@ -106,6 +106,7 @@ {"nick": "Jgwman"}, {"nick": "JonBaer", "name": "Jon Baer"}, {"nick": "Josh", "name": "Joshua J. Bakita"}, + {"nick": "joskar", "name": "Johnny Oskarsson"}, {"nick": "jP_wanN", "name": "Jonas Platte"}, {"nick": "Jubalbarca", "name": "James Baillie"}, {"nick": "JubJub", "name": "Sebastian Vetter"}, diff --git a/source/gui/CTooltip.cpp b/source/gui/CTooltip.cpp index f44dbe6ced..5f6c7f6aff 100644 --- a/source/gui/CTooltip.cpp +++ b/source/gui/CTooltip.cpp @@ -127,7 +127,9 @@ void CTooltip::SetupText() // Reposition the tooltip if it's falling off the screen: extern int g_xres, g_yres; - float screenw = (float)g_xres, screenh = (float)g_yres; + extern float g_GuiScale; + float screenw = g_xres / g_GuiScale; + float screenh = g_yres / g_GuiScale; if (size.pixel.top < 0.f) size.pixel.bottom -= size.pixel.top, size.pixel.top = 0.f;