Merge branch 'master' into blur_bg

README.md

@@ -10,12 +10,14 @@ Cross platform Neovim front-end UI, built with [F#](https://fsharp.org/) + [Aval
 [Download](https:/yatli/fvim/releases) the latest release package for your system, extract and run `FVim`!
 
 - For Windows 7, use the `win7-x64` package.
+ - Make sure you have [KB2533623](https://www.microsoft.com/en-us/download/details.aspx?id=26764) installed.
 - For Windows 10, use the `win-x64` package -- this version has faster startup.
 - For macOS, it's packaged as an app bundle -- unzip and drag it to your applications folder.
 - For Linux:
  - Debian based distributions: `dpkg -i fvim_package_name.deb`
  - Arch Linux: [Install via AUR](https://aur.archlinux.org/packages/fvim/)
  - RPM-based distributions: `rpm -ivh fvim_package_name.rpm`
+ - Fedora: `dnf install fvim_package_name.rpm`
  - Compile from Source (having dotnet-sdk-3+ installed):
  ```
  git clone https:/yatli/fvim && cd fvim && dotnet publish -f netcoreapp3.0 -c Release -r linux-x64 --self-contained

ViewModels/PopupMenuViewModel.fs

@@ -88,8 +88,9 @@ type PopupMenuViewModel() =
  member this.SetItems(items: CompleteItem[], textArea: Rect, lineHeight: float, desiredSizeVec: Point, editorSizeVec: Point) =
  m_items.Clear()
 
- // new completion items coming in while old still being added?
- // cancel them, otherwise it blocks the UI thread/add dups.
+ // New completion items coming in while old still being added?
+ // Cancel them, otherwise it blocks the UI thread/add dups.
+ // --------------------------------
  if m_cancelSrc <> null then
  m_cancelSrc.Cancel()
  m_cancelSrc.Dispose()

Views/PopupMenu.xaml.fs

@@ -6,7 +6,6 @@ open Avalonia.Markup.Xaml
 open Avalonia.Controls
 open Avalonia.Data
 
-open System.Linq
 open FVim.log
 
 open FSharp.Control.Reactive
@@ -23,11 +22,10 @@ type PopupMenu() as this =
  AvaloniaXamlLoader.Load(this)
  let lst = this.FindControl<ListBox>("List")
  this.Watch [
- lst.SelectionChanged.Subscribe(fun x -> for item in x.AddedItems do lst.ScrollIntoView item)
- (*this.ViewModelConnected.Subscribe(fun vm -> vm.Watch [*)
- (*vm.ObservableForProperty(fun x -> x.SelectBackground)*)
- (*|> Observable.subscribe(fun selectBg -> lst.Resources.["HighlightBrush"] <- selectBg.Value)*)
- (*])*)
+ lst.SelectionChanged.Subscribe(fun x -> 
+ let items = x.AddedItems
+ if items.Count > 0 then Some items.[0] else None
+ |> Option.iter lst.ScrollIntoView)
  ]
 
  override this.OnKeyDown(e) =

pack.ps1

@@ -12,6 +12,8 @@ foreach($i in $plat) {
  if ($i -eq "win-x64") {
 # replace the coreclr hosting exe with an icon-patched one
  Copy-Item lib/fvim-win10.exe bin/Release/netcoreapp3.0/$i/publish/FVim.exe
+ } elseif ($i -eq "win7-x64") {
+ Copy-Item lib/fvim-win7.exe bin/Release/netcoreapp3.0/$i/publish/FVim.exe
  }
  Compress-Archive -Path bin/Release/netcoreapp3.0/$i/publish/* -DestinationPath publish/fvim-$i.zip -Force
 }