Merge pull request #308 from yshavit/autocomplete-mouseover

fix autocomplete mouseover highlight
yshavit · Sep 22, 2022 · fb2d0ac · fb2d0ac
2 parents 0f56cea + b6ea2d3
commit fb2d0ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml
@@ -18,10 +18,11 @@ jobs:
         python-version: 3.7
     - name: Check actions to perform
       run: |
+        set -x
         if [[ -n '${{ secrets.APPLE_ID}}' ]]; then
           echo "should_notarize_app=yes" >> "$GITHUB_ENV"
         fi
-        if [[ "{{ github.event_name }}" == 'workflow_dispatch' || "{{ github.ref }}" == 'refs/heads/main' ]]; then
+        if [[ "${{ github.event_name }}" == 'workflow_dispatch' || "${{ github.ref }}" == 'refs/heads/main' ]]; then
           echo "should_upload_app=yes" >> "$GITHUB_ENV"
         fi
     - name: Will notarize

diff --git a/whatdid/views/TextOptionsList.swift b/whatdid/views/TextOptionsList.swift
@@ -179,7 +179,7 @@ class TextOptionsList: WdView, TextFieldWithPopupContents {
         let grafStyle = NSMutableParagraphStyle()
         grafStyle.setParagraphStyle(NSParagraphStyle.default)
         grafStyle.headIndent = 10.0
-        grafStyle.alignment = .justified
+        grafStyle.alignment = .natural
         textView.defaultParagraphStyle = grafStyle
 
         heightConstraint = textView.heightAnchor.constraint(equalToConstant: 0)
@@ -190,9 +190,11 @@ class TextOptionsList: WdView, TextFieldWithPopupContents {
         mouseoverHighlight = NSVisualEffectView()
         arrowSelectionHighlight = NSVisualEffectView()
         arrowSelectionHighlight.isEmphasized = true
-        arrowSelectionHighlight.state = .active
-        arrowSelectionHighlight.material = .selection
-        arrowSelectionHighlight.blendingMode = .behindWindow
+        for highlight in [mouseoverHighlight, arrowSelectionHighlight] {
+            highlight!.state = .active
+            highlight!.material = .selection
+            highlight!.blendingMode = .behindWindow
+        }
 
         textView.wantsLayer = true
         textView.drawsBackground = false