Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 20:42:21 +02:00
Code Activity

Fixed more scaling issues

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf
View file

@ -38,7 +38,8 @@ namespace Beefy.theme.dark
mDragMarginSize = GS!(64); mDragMarginSize = GS!(64);
mDragWindowMarginSize = GS!(10); mDragWindowMarginSize = GS!(10);
mWindowMargin = 0; if (mParentDockingFrame == null)
mWindowMargin = GS!(1);
mSplitterSize = GS!(6.0f); mSplitterSize = GS!(6.0f);
mWindowSpacing = GS!(2.0f); mWindowSpacing = GS!(2.0f);
} }

2
BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf
View file

@ -506,7 +506,7 @@ namespace Beefy.theme.dark
if (tabIdx < mTabs.Count - 1) if (tabIdx < mTabs.Count - 1)
{ {
tabButton.mWidth = (float)Math.Round(Math.Min(tabButton.mWantWidth, showWidth + GS!(8))); tabButton.mWidth = (float)Math.Round(Math.Min(tabButton.mWantWidth, showWidth + GS!(8)));
tabButton.mCloseButton.mVisible = tabButton.mWidth >= tabButton.mWantWidth; tabButton.mCloseButton.mVisible = tabButton.mWidth + 1 >= tabButton.mWantWidth;
} }
else else
{ {

2
BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf
View file

@ -431,7 +431,7 @@ namespace Beefy.theme.dark
{ {
DarkDockingFrame dockingFrame = new DarkDockingFrame(); DarkDockingFrame dockingFrame = new DarkDockingFrame();
if (parent == null) if (parent == null)
dockingFrame.mWindowMargin = 1; dockingFrame.mWindowMargin = GS!(1);
else if (var darkParent = parent as DarkDockingFrame) else if (var darkParent = parent as DarkDockingFrame)
{ {
dockingFrame.mDrawBkg = darkParent.mDrawBkg; dockingFrame.mDrawBkg = darkParent.mDrawBkg;

8
IDE/src/IDEApp.bf
View file

@ -6771,7 +6771,7 @@ namespace IDE
OutputSmart(useStr); OutputSmart(useStr);
} }
public void SetScale(float scale, bool force = false) public void PhysSetScale(float scale, bool force = false)
{ {
var prevScale = DarkTheme.sScale; var prevScale = DarkTheme.sScale;
float useScale = Math.Clamp(scale, 0.5f, 4.0f); 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) void SysKeyDown(KeyDownEvent evt)
{ {
if (evt.mHandled) if (evt.mHandled)

2
IDE/src/Settings.bf
View file

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

3
IDE/src/ui/ProjectPanel.bf
View file

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

2
IDE/src/ui/WatchPanel.bf
View file

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