(81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-18 17:44:13 +03:00
parent ada4e17dfe
commit 6332cfd55f
17 changed files with 126 additions and 123 deletions
@@ -273,7 +273,7 @@ namespace Barotrauma
{
IsHorizontal = false
};
cprButton = new GUIButton(new RectTransform(new Point(80, 80), GUI.Canvas), text: "", style: "CPRButton")
cprButton = new GUIButton(new RectTransform(new Point((int)(80 * GUI.Scale)), GUI.Canvas), text: "", style: "CPRButton")
{
OnClicked = (button, userData) =>
{