From 40da21aacd5506b373d45f5bd1d9bed0f8863323 Mon Sep 17 00:00:00 2001 From: FellippeHeitor Date: Tue, 31 Oct 2017 04:35:20 -0200 Subject: [PATCH] Add tweaks to Line Numbers in config.txt. - ShowLineNumbersSeparator will separate the line numbers panel from the main text are with CHR$(179); - ShowLineNumbersUseBG will use the same color assigned to current line highlight in the line numbers panel. --- source/global/IDEsettings.bas | 27 +++++++++++++++++++++++++++ source/ide/ide_methods.bas | 6 +++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/source/global/IDEsettings.bas b/source/global/IDEsettings.bas index c8a04614f..25c2723ea 100644 --- a/source/global/IDEsettings.bas +++ b/source/global/IDEsettings.bas @@ -12,6 +12,7 @@ DIM SHARED MouseButtonSwapped AS _BYTE DIM SHARED PasteCursorAtEnd AS _BYTE DIM SHARED SaveExeWithSource AS _BYTE DIM SHARED IDEShowErrorsImmediately AS _BYTE +DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE IF LoadedIDESettings = 0 THEN 'We only want to load the file once when QB64 first starts @@ -204,6 +205,32 @@ IF LoadedIDESettings = 0 THEN ShowLineNumbers = 0 END IF + result = ReadConfigSetting("ShowLineNumbersSeparator", value$) + IF result THEN + IF value$ = "TRUE" OR VAL(value$) = -1 THEN + ShowLineNumbersSeparator = -1 + ELSE + ShowLineNumbersSeparator = 0 + WriteConfigSetting "'[GENERAL SETTINGS]", "ShowLineNumbersSeparator", "FALSE" + END IF + ELSE + WriteConfigSetting "'[GENERAL SETTINGS]", "ShowLineNumbersSeparator", "TRUE" + ShowLineNumbersSeparator = -1 + END IF + + result = ReadConfigSetting("ShowLineNumbersUseBG", value$) + IF result THEN + IF value$ = "TRUE" OR VAL(value$) = -1 THEN + ShowLineNumbersUseBG = -1 + ELSE + ShowLineNumbersUseBG = 0 + WriteConfigSetting "'[GENERAL SETTINGS]", "ShowLineNumbersUseBG", "FALSE" + END IF + ELSE + WriteConfigSetting "'[GENERAL SETTINGS]", "ShowLineNumbersUseBG", "TRUE" + ShowLineNumbersUseBG = -1 + END IF + result = ReadConfigSetting("BracketHighlight", value$) IF result THEN IF value$ = "TRUE" OR VAL(value$) = -1 THEN diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas index d3d29c0cf..ab95fc334 100644 --- a/source/ide/ide_methods.bas +++ b/source/ide/ide_methods.bas @@ -8258,16 +8258,16 @@ SUB ideshowtext PRINT CHR$(179); 'clear prev bookmarks from lhs IF ShowLineNumbers THEN - COLOR , 6 - 'IF l = idecy THEN COLOR , 6 + IF ShowLineNumbersUseBG THEN COLOR , 6 PRINT SPACE$(maxLineNumberLength); IF l <= iden THEN l2$ = STR$(l) IF POS(1) - (LEN(l2$) + 1) >= 2 THEN LOCATE y + 3, POS(1) - (LEN(l2$) + 1) - PRINT l2$; 'CHR$(179); + PRINT l2$; END IF END IF + IF ShowLineNumbersSeparator THEN LOCATE y + 3, 1 + maxLineNumberLength: PRINT CHR$(179); COLOR , 1 END IF