Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-17 07:44:09 +02:00
Code Activity

Squiggle fix for non-default font, manually add method fix

Browse source
This commit is contained in:
Brian Fiete 2019-09-30 12:23:27 -07:00
parent e43beb5794
commit 69e3bf94f7
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDE/src/IDEApp.bf
View file

@ -3487,7 +3487,7 @@ namespace IDE
public void Cmd_ZoomOut()
{
float scale = DarkTheme.sScale;
if (scale > 0.30f)
if (scale > 0.25f)
{
if (scale < 0)
scale -= 0.05f;
@ -6559,7 +6559,7 @@ namespace IDE
public void SetScale(float scale, bool force = false)
{
var prevScale = DarkTheme.sScale;
float useScale = Math.Clamp(scale, 0.25f, 4.0f);
float useScale = Math.Clamp(scale, 0.5f, 4.0f);
if ((prevScale == useScale) && (!force))
return;
@ -10069,7 +10069,7 @@ namespace IDE
UpdateRecentFileMenuItems();
ShowStartupFile();
if (mIsFirstRun)
if ((mIsFirstRun) && (!mWorkspace.IsInitialized))
ShowWelcome();
}
#endif
@ -11985,19 +11985,19 @@ namespace IDE
Image squiggleImage = IDEApp.sApp.mSquiggleImage;
int32 segSize = 30;
float height = mSquiggleImage.mHeight;
//int32 segSize = GS!(6 * 5);
float curX = x;
float curWidth = width;
float drawY = y + gApp.mCodeFont.GetHeight();
while (curWidth > 0)
{
float drawWidth = Math.Min(curWidth, segSize - (curX % segSize));
float u1 = ((int32)curX % segSize) / (float)squiggleImage.mSrcWidth;
float u2 = u1 + drawWidth / (float)squiggleImage.mSrcWidth;
g.DrawQuad(squiggleImage, curX, y + (int)GS!(15), u1, 0, drawWidth, height, u2, 1.0f);
g.DrawQuad(squiggleImage, curX, drawY, u1, 0, drawWidth, height, u2, 1.0f);
curWidth -= drawWidth;
curX += drawWidth;