1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00

Fixed more scaling issues

This commit is contained in:
Brian Fiete 2020-03-29 10:17:28 -07:00
parent d9a820f5a1
commit 990d092274
7 changed files with 15 additions and 7 deletions

View file

@ -6771,7 +6771,7 @@ namespace IDE
OutputSmart(useStr);
}
public void SetScale(float scale, bool force = false)
public void PhysSetScale(float scale, bool force = false)
{
var prevScale = DarkTheme.sScale;
float useScale = Math.Clamp(scale, 0.5f, 4.0f);
@ -6818,6 +6818,12 @@ namespace IDE
}
}
public void SetScale(float scale, bool force = false)
{
PhysSetScale(scale, force);
gApp.mSettings.mEditorSettings.mUIScale = DarkTheme.sScale * 100.0f;
}
void SysKeyDown(KeyDownEvent evt)
{
if (evt.mHandled)

View file

@ -792,7 +792,7 @@ namespace IDE
gApp.mSettings.mEditorSettings.mFontSize = Math.Clamp(gApp.mSettings.mEditorSettings.mFontSize, 6.0f, 72.0f);
Font.ClearFontNameCache();
gApp.SetScale(gApp.mSettings.mEditorSettings.mUIScale / 100.0f, true);
gApp.PhysSetScale(gApp.mSettings.mEditorSettings.mUIScale / 100.0f, true);
DeleteAndNullify!(gApp.mKeyChordState);

View file

@ -26,7 +26,8 @@ namespace IDE.ui
public override void RehupScale(float oldScale, float newScale)
{
base.RehupScale(oldScale, newScale);
Utils.SnapScale(ref mLabelOffset, newScale / oldScale);
if (mLabelOffset != 0)
mLabelOffset = GS!(-16);
}
protected override float GetLabelOffset()

View file

@ -1624,8 +1624,8 @@ namespace IDE.ui
public override void RehupScale(float oldScale, float newScale)
{
SetScaleData();
base.RehupScale(oldScale, newScale);
SetScaleData();
}
public void Serialize(StructuredData data, bool includeItems)