disable systray, upgrade grey to fix #88

aloneguid · Jul 31, 2024 · 403e2d6 · 403e2d6
1 parent 5cc418a
commit 403e2d6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,11 +1,11 @@
 name: 'Build'
 
 env:
-  VERSION: 4.0.2
+  VERSION: 4.0.3
   BUILD_TYPE: Release
   ARCH: x64
   VCPKG_CONFIG: Release
-  VCPKG_HASH: f61a294e765b257926ae9e9d85f96468a0af74e7
+  VCPKG_HASH: 1dc5ee30eb1032221d29f281f4a94b73f06b4284
   DOC_INSTANCE: wrs/bt
   DOC_ARTIFACT: webHelpBT2-all.zip
   DOC_ALGOLIA_ARTIFACT: algolia-indexes-BT.zip

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,6 +27,7 @@ jobs:
 
       - name: 🔢 prep release notes
         run: |
+          envsubst < instructions.md > g.tmp && mv g.tmp instructions.md
           grep -m 2 -B 1000 '^## ' release-notes.md | tail -n +3 | head -n -2 > final_notes.md
           cat instructions.md >> final_notes.md
           cat final_notes.md

diff --git a/bt/app/systray.cpp b/bt/app/systray.cpp
@@ -41,7 +41,8 @@ namespace bt {
                         ::PostQuitMessage(0);
                     } }
                     break;
-                case WM_CLIPBOARDUPDATE:
+                // this is for future, if we want to implement clipboard monitoring
+                /*case WM_CLIPBOARDUPDATE:
                     // get string placed into the clipboard
                     if (::OpenClipboard(app.get_hwnd())) {
                         HANDLE hData = ::GetClipboardData(CF_TEXT);
@@ -54,13 +55,13 @@ namespace bt {
                         }
                         ::CloseClipboard();
                     }
-                    break;
+                    break;*/
 
             }
             return 0;
         };
 
-        app.add_clipboard_listener();
+        //app.add_clipboard_listener();
 
         app.run();
     }

diff --git a/bt/bt.cpp b/bt/bt.cpp
@@ -8,7 +8,7 @@
 #include "win32/window.h"
 #include "app/rule_hit_log.h"
 #include "app/url_opener.h"
-#include "app/systray.h"
+//#include "app/systray.h"
 
 //ui
 #include "app/ui/config_app.h"
@@ -109,12 +109,12 @@ void execute(const string& data) {
     string command_data;
     string command = get_command(data, command_data);
     if(!command.empty()) {
-        if(command == "tray") {
+        /*if(command == "tray") {
             // launch "systray" app
             bt::systray systray;
             systray.run();
             return;
-        } else if(command == "pick") {
+        } else */if(command == "pick") {
             // force-invoke the picker
             force_picker = true;
             clean_data = command_data;

diff --git a/docs/instructions.md b/docs/instructions.md
@@ -1,3 +1,6 @@
 
 
-[Installation instructions](https://aloneguid.github.io/bt/installing.html).
+[Installation instructions](https://aloneguid.github.io/bt/installing.html).
+
+![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/aloneguid/bt/${VERSION}/bt-${VERSION}.zip)
+![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/aloneguid/bt/${VERSION}/bt-${VERSION}.msi)
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,7 +1,8 @@
 ## 4.0.3
 
 Improvements:
-- UX: Picker menu makes it clear which mouse button to click (thanks to @rp1231 in discussion #85)
+- UX: Picker menu makes it clear which mouse button to click (thanks to @rp1231 in discussion #85).
+- UX: Picker would not show in the taskbar (reported by @maddada in #88).
 
 ## 4.0.2
 

diff --git a/grey b/grey
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
     "default-registry": {
         "kind": "git",
-        "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",
+        "baseline": "1dc5ee30eb1032221d29f281f4a94b73f06b4284",
         "repository": "https://github.com/microsoft/vcpkg"
     },
     "registries": [
+2 −2		grey/backends/win32dx11app.hpp
+15 −0		grey/widgets.cpp
+2 −0		grey/widgets.h