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

Merge pull request #1357 from blat-blatnik/HighlightCurrentLine

Browse source 
Add option to highlight current line in editor
This commit is contained in:
Brian Fiete 2022-01-07 12:45:13 +01:00 • committed by GitHub
commit fdd1a34d86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf
View file

@ -22,6 +22,7 @@ namespace Beefy.theme.dark
public bool mWantsCheckScrollPosition;
public uint32 mViewWhiteSpaceColor;
public bool mScrollToStartOnLostFocus;
public bool mHiliteCurrentLine;
protected static uint32[] sDefaultColors = new uint32[] ( Color.White ) ~ delete _;
@ -480,9 +481,21 @@ namespace Beefy.theme.dark
}
if (aX != -1)
{
{
if (mHiliteCurrentLine && selStartIdx == selEndIdx)
{
float thickness = 2 * (lineSpacing / 18);
// This isn't quite the right value, but I'm not sure how to get this
// to properly highlight the whole line without getting cut off - this works well for now.
float totalLineWidth = mEditWidget.mScrollContentContainer.mWidth - thickness;
float x = (int)mEditWidget.mHorzPos.v; // If we don't round to int we get jitter while scrolling.
using (g.PushColor(DarkTheme.COLOR_CURRENT_LINE_HILITE))
g.OutlineRect(x, curY, totalLineWidth, lineSpacing + thickness, thickness);
}
float brightness = (float)Math.Cos(Math.Max(0.0f, mCursorBlinkTicks - 20) / 9.0f);
brightness = Math.Max(0, Math.Min(1.0f, brightness * 2.0f + 1.6f));
brightness = Math.Clamp(brightness * 2.0f + 1.6f, 0, 1);
if (mEditWidget.mVertPos.IsMoving)
brightness = 0; // When we animate a pgup or pgdn, it's weird seeing the cursor scrolling around
@ -503,7 +516,7 @@ namespace Beefy.theme.dark
}
else
{
using (g.PushColor(Color.Mult(cursorColor, Color.Get(brightness))))
using (g.PushColor(Color.Mult(cursorColor, Color.Get(brightness))))
g.FillRect(aX, curY, Math.Max(1.0f, GS!(1)), lineSpacing);
}
drewCursor = true;

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

@ -191,6 +191,7 @@ namespace Beefy.theme.dark
public static uint32 COLOR_SELECTED_OUTLINE = 0xFFCFAE11;
public static uint32 COLOR_MENU_FOCUSED = 0xFFE5A910;
public static uint32 COLOR_MENU_SELECTED = 0xFFCB9B80;
public static uint32 COLOR_CURRENT_LINE_HILITE = 0xFF4C4C54;
public static float sScale = 1.0f;
public static int32 sSrcImgScale = 1;