KolibriOS/kolibrios
15
21
Fork 36
Code Issues 129 Pull Requests 31 Actions 1 Projects 1 Releases Wiki Activity

CEdit:

Browse Source 
- added line spacing setting
- disabled highlighting of anonymous labels


git-svn-id: svn://kolibrios.org@9946 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Anton Krotov
2023-10-01 12:50:05 +00:00
parent 9ab6258bfe
commit 9398cd7961
5 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
programs/develop/cedit/SRC/CEdit.ob07
View File

@@ -28,7 +28,7 @@ IMPORT
RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;
CONST
HEADER = "CEdit (07-may-2023)";
HEADER = "CEdit (01-oct-2023)";
ShellFilter = "";
EditFilter = "sh|inc|txt|asm|ob07|c|cpp|h|pas|pp|lua|ini|json";
@@ -101,6 +101,8 @@ CONST
menuFontSmall = 20;
menuFontMedium = menuFontSmall + 1;
menuFontLarge = menuFontMedium + 1;
menuIncLS = menuFontLarge + 1;
menuDecLS = menuIncLS + 1;
menuColors = 1000;
menuMaxColors = menuColors + Ini.MAX_SECTIONS - 1;
@@ -169,7 +171,7 @@ CONST
SHIFT = Menu.SHIFT;
CTRL = Menu.CTRL;
ClippingArea = 32 + T.LineSpacing;
ClippingArea = 32 + T.MaxLineSpacing;
VAR
@@ -1073,6 +1075,8 @@ BEGIN
Menu.option(menu, menuFontSmall, font = G.fonts[0]);
Menu.option(menu, menuFontMedium, font = G.fonts[1]);
Menu.option(menu, menuFontLarge, font = G.fonts[2]);
Menu.setEnabled(menu, menuIncLS, T.LineSpacing < T.MaxLineSpacing);
Menu.setEnabled(menu, menuDecLS, T.LineSpacing > 0);
FOR i := 0 TO Ini.sections.count - 1 DO
Menu.option(menu, menuColors + i, Ini.curSectionNum = i)
END
@@ -1258,6 +1262,9 @@ BEGIN
font := G.fonts[Menu.MenuItem - menuFontSmall];
Ini.setInt("settings", "font", Menu.MenuItem - menuFontSmall);
resize
|menuIncLS, menuDecLS:
T.setLineSpacing(canvas, T.LineSpacing + ORD(Menu.MenuItem = menuIncLS)*2 - 1);
Ini.setInt("settings", "line_spacing", T.LineSpacing)
|menuText:
T.setLang(text, Languages.langText)
|menuC:
@@ -1470,6 +1477,9 @@ BEGIN
Menu.AddMenuItem(menu, menuFontMedium, "medium");
Menu.AddMenuItem(menu, menuFontLarge, "large");
Menu.delimiter(menu);
Menu.AddMenuItem(menu, menuIncLS, "line spacing ++");
Menu.AddMenuItem(menu, menuDecLS, "line spacing --");
Menu.delimiter(menu);
colors := Ini.sections.first(Ini.tSection);
idx := menuColors;
@@ -2152,7 +2162,7 @@ BEGIN
Tabs.setArea(tabs, LEFT, TOP - Tabs.tabHeight, canvas.width, Tabs.tabHeight);
font := G.fonts[Ini.font];
G.SetFont(canvas, font);
T.init(resetTimer, Ini.lineNumbers, Ini.autoIndents, Ini.autoBrackets, Ini.trimSpace);
T.init(resetTimer, Ini.lineNumbers, Ini.autoIndents, Ini.autoBrackets, Ini.trimSpace, Ini.lineSpacing);
Ini.selectSection(Ini.theme);
T.setCanvas(canvas);