From 044e607b9419f9a9f6fd6e767d1081539a61efec Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 28 Mar 2018 17:53:46 -0400 Subject: [PATCH] Adds settings to the settings editor Adds the status bar reduce flashing setting Adds the current line scrollable setting --- README.md | 2 +- package.json | 2 +- .../images/settings/current-line-blame-on-scrollable.png | Bin 0 -> 1728 bytes src/ui/settings/index.html | 11 +++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/ui/images/settings/current-line-blame-on-scrollable.png diff --git a/README.md b/README.md index dacf78b..6ad3ddf 100644 --- a/README.md +++ b/README.md @@ -646,7 +646,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings") |`gitlens.statusBar.dateFormat`|Specifies the date format of absolute dates shown in the blame information on the status bar
See https://momentjs.com/docs/#/displaying/format/ for valid formats |`gitlens.statusBar.enabled`|Specifies whether to provide blame information on the status bar |`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar
Available tokens
`${id}` - commit id
`${author}` - commit author
`${message}` - commit message
`${ago}` - relative commit date (e.g. 1 day ago)
`${date}` - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)
`${agoOrDate}` - commit date specified by `gitlens.defaultDateStyle`
`${authorAgo}` - commit author, relative commit date
`${authorAgoOrDate}` - commit author, commit date specified by `gitlens.defaultDateStyle`
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting -|`gitlens.statusBar.reduceFlicker`|Specifies whether to reduce the status bar "flickering" when changing lines by not first clearing the previous blame information +|`gitlens.statusBar.reduceFlicker`|Specifies whether to avoid clearing the previous blame information when changing lines to reduce status bar "flashing" ### Advanced Settings diff --git a/package.json b/package.json index 5e8e5d5..daf5446 100644 --- a/package.json +++ b/package.json @@ -776,7 +776,7 @@ "gitlens.statusBar.reduceFlicker": { "type": "boolean", "default": false, - "description": "Specifies whether to reduce the status bar \"flickering\" when changing lines by not first clearing the previous blame information", + "description": "Specifies whether to avoid clearing the previous blame information when changing lines to reduce status bar \"flashing\"", "scope": "window" }, "gitlens.strings.codeLens.unsavedChanges.recentChangeAndAuthors": { diff --git a/src/ui/images/settings/current-line-blame-on-scrollable.png b/src/ui/images/settings/current-line-blame-on-scrollable.png new file mode 100644 index 0000000000000000000000000000000000000000..43f7504d94076afeae1cbdb939fb31b367fd5211 GIT binary patch literal 1728 zcmeAS@N?(olHy`uVBq!ia0y~yV2S{;&v7sV$*U4QGl3LKx}&cn1H;CC?mvmF3=GT+ z0X`wFKyg=B5IG7)Ltq4k0MkpRRt5$}hLRw^;Qu2VFa&>RR|O^k&H|6fVg?4jeIU&E z%4y>PprB-lYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoqfu51!M}^F(z#>Q0)5S5QBJS;_ zjhxJkJPaFC{xAG5E#BC0@M!5Jo?kWs0^KbUDo2zQ#W**5bhtX{2qjG%6&kuB@lpCU kcfH#2sS$68C(eG}!<86%m*M*1YoOA`)78&qol`;+06IJ6egFUf literal 0 HcmV?d00001 diff --git a/src/ui/settings/index.html b/src/ui/settings/index.html index c54192a..73f85d3 100644 --- a/src/ui/settings/index.html +++ b/src/ui/settings/index.html @@ -269,10 +269,16 @@ +
+ + +
+

When enabled the annotation can be scrolled into view when it is outside the viewport

+

@@ -601,6 +607,11 @@ +

+ + +
+

Avoids clearing the previous blame information when changing lines to reduce status bar "flashing"