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

Add 'Line Height' setting.

Browse source
This commit is contained in:
MineBill 2025-02-14 00:23:07 +02:00
parent fa96e0783c
commit 3f41cf32ef
No known key found for this signature in database
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
IDE/src/Settings.bf
View file

@ -698,6 +698,7 @@ namespace IDE
public List<String> mFonts = new .() ~ DeleteContainerAndItems!(_); public List<String> mFonts = new .() ~ DeleteContainerAndItems!(_);
public float mFontSize = 12; public float mFontSize = 12;
public float mLineHeight = 1.0f;
public AutoCompleteShowKind mAutoCompleteShowKind = .PanelIfVisible; public AutoCompleteShowKind mAutoCompleteShowKind = .PanelIfVisible;
public bool mAutoCompleteRequireControl = true; public bool mAutoCompleteRequireControl = true;
public bool mAutoCompleteRequireTab = false; public bool mAutoCompleteRequireTab = false;
@ -732,6 +733,7 @@ namespace IDE
sd.Add(str); sd.Add(str);
} }
sd.Add("FontSize", mFontSize); sd.Add("FontSize", mFontSize);
sd.Add("LineHeight", mLineHeight);
sd.Add("AutoCompleteShowKind", mAutoCompleteShowKind); sd.Add("AutoCompleteShowKind", mAutoCompleteShowKind);
sd.Add("AutoCompleteRequireControl", mAutoCompleteRequireControl); sd.Add("AutoCompleteRequireControl", mAutoCompleteRequireControl);
sd.Add("AutoCompleteRequireTab", mAutoCompleteRequireTab); sd.Add("AutoCompleteRequireTab", mAutoCompleteRequireTab);
@ -769,6 +771,7 @@ namespace IDE
} }
sd.Get("UIScale", ref gApp.mSettings.mUISettings.mScale); // Legacy sd.Get("UIScale", ref gApp.mSettings.mUISettings.mScale); // Legacy
sd.Get("FontSize", ref mFontSize); sd.Get("FontSize", ref mFontSize);
sd.Get("LineHeight", ref mLineHeight);
sd.Get("AutoCompleteShowKind", ref mAutoCompleteShowKind); sd.Get("AutoCompleteShowKind", ref mAutoCompleteShowKind);
sd.Get("AutoCompleteRequireControl", ref mAutoCompleteRequireControl); sd.Get("AutoCompleteRequireControl", ref mAutoCompleteRequireControl);
sd.Get("AutoCompleteRequireTab", ref mAutoCompleteRequireTab); sd.Get("AutoCompleteRequireTab", ref mAutoCompleteRequireTab);
@ -1365,6 +1368,7 @@ namespace IDE
{ {
gApp.mSettings.mUISettings.mScale = Math.Clamp(gApp.mSettings.mUISettings.mScale, 50, 400); gApp.mSettings.mUISettings.mScale = Math.Clamp(gApp.mSettings.mUISettings.mScale, 50, 400);
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);
gApp.mSettings.mEditorSettings.mLineHeight = Math.Clamp(gApp.mSettings.mEditorSettings.mLineHeight, 0.125f, 10.0f);
mUISettings.Apply(); mUISettings.Apply();
mEditorSettings.Apply(); mEditorSettings.Apply();
@ -1387,7 +1391,12 @@ namespace IDE
for (let value in gApp.mFileEditData.Values) for (let value in gApp.mFileEditData.Values)
if (value.mEditWidget != null) if (value.mEditWidget != null)
((SourceEditWidgetContent)value.mEditWidget.Content).mHiliteCurrentLine = gApp.mSettings.mEditorSettings.mHiliteCurrentLine; {
var ewc = (SourceEditWidgetContent)value.mEditWidget.Content;
ewc.mHiliteCurrentLine = gApp.mSettings.mEditorSettings.mHiliteCurrentLine;
ewc.mLineHeight = gApp.mSettings.mEditorSettings.mLineHeight;
ewc.RehupLineCoords();
}
if (!mWakaTimeKey.IsEmpty) if (!mWakaTimeKey.IsEmpty)
{ {

1
IDE/src/ui/SettingsDialog.bf
View file

@ -98,6 +98,7 @@ namespace IDE.ui
category.mTextColor = Color.Mult(DarkTheme.COLOR_TEXT, cHeaderColor); category.mTextColor = Color.Mult(DarkTheme.COLOR_TEXT, cHeaderColor);
AddPropertiesItem(category, "Font", "mFonts"); AddPropertiesItem(category, "Font", "mFonts");
AddPropertiesItem(category, "Font Size", "mFontSize"); AddPropertiesItem(category, "Font Size", "mFontSize");
AddPropertiesItem(category, "Line Height", "mLineHeight");
AddPropertiesItem(category, "Autocomplete", "mAutoCompleteShowKind"); AddPropertiesItem(category, "Autocomplete", "mAutoCompleteShowKind");
AddPropertiesItem(category, "Autocomplete Require Control", "mAutoCompleteRequireControl"); AddPropertiesItem(category, "Autocomplete Require Control", "mAutoCompleteRequireControl");
AddPropertiesItem(category, "Autocomplete Require Tab", "mAutoCompleteRequireTab"); AddPropertiesItem(category, "Autocomplete Require Tab", "mAutoCompleteRequireTab");

1
IDE/src/ui/SourceEditWidgetContent.bf
View file

@ -858,6 +858,7 @@ namespace IDE.ui
SetFont(IDEApp.sApp.mCodeFont, true, true); SetFont(IDEApp.sApp.mCodeFont, true, true);
//SetFont(DarkTheme.sDarkTheme.mSmallFont, false, false); //SetFont(DarkTheme.sDarkTheme.mSmallFont, false, false);
mLineHeight = Math.Clamp(gApp.mSettings.mEditorSettings.mLineHeight, 0.125f, 10.0f);
mWantsTabsAsSpaces = gApp.mSettings.mEditorSettings.mTabsOrSpaces == .Spaces; mWantsTabsAsSpaces = gApp.mSettings.mEditorSettings.mTabsOrSpaces == .Spaces;
mTabLength = gApp.mSettings.mEditorSettings.mTabSize; mTabLength = gApp.mSettings.mEditorSettings.mTabSize;
mTabSize = mFont.GetWidth(scope String(' ', gApp.mSettings.mEditorSettings.mTabSize)); mTabSize = mFont.GetWidth(scope String(' ', gApp.mSettings.mEditorSettings.mTabSize));