Compare commits

...
Author SHA1 Message Date
agrynco b6eaa2c85d Use stripped binaries in the v0.6.111 portable archive 2026-11-17 15:30:50 +02:00
agrynco 72024c3385 Record the v0.6.111 package manifest and legacy upgrade instructions 2026-11-17 15:29:03 +02:00
agrynco d60ef626f0 Prepare KSwitcher v0.6.111 with Files navigation and scrollbars 2026-11-17 15:23:22 +02:00
agrynco e144cd6607 Release KSwitcher v0.6.110 (#56)
Fix unrelated panel repaint and preserve uppercase personal dictionary corrections.
2026-11-17 14:16:03 +02:00
16 changed files with 580 additions and 181 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.24)
project(KSwitcher VERSION 0.6.110 LANGUAGES CXX RC)
project(KSwitcher VERSION 0.6.111 LANGUAGES CXX RC)
if(NOT WIN32)
message(FATAL_ERROR "KSwitcher uses native Windows APIs")
endif()
+8 -2
View File
@@ -19,6 +19,10 @@ Far Manager є зразком для оформлення файлового м
не займають місця. Перед завершенням змін перевір коротке повідомлення й
повідомлення з кількома рядками, включно з відступами до рамки та кнопок.
Смуга прокрутки з’являється, лише коли текст не вміщується в доступну висоту.
Панелі, списки попапів і довгі повідомлення використовують вузьку смугу
прокрутки зі стрілками вгорі й унизу та крапковою доріжкою. Відтінки доріжки
й повзунка залежать від фону, на якому вони малюються. Повзунок світліший
за доріжку й показує положення та розмір видимої частини списку.
Оформлення, кнопки й необов’язковий прапорець задаються параметрами шаблону.
Підтвердження гібернації та віддаленого оновлення мають червоне оформлення
Warning і початковий фокус на No.
@@ -38,7 +42,9 @@ Warning і початковий фокус на No.
Папка відкривається у Провіднику, файл виконує свою стандартну дію Windows.
- У головному вікні клавіатурний фокус залишається в командному рядку.
Tab перемикає активну панель, а клік вибирає рядок.
Tab без модифікаторів перемикає активну панель, а клік вибирає рядок.
Ctrl+U міняє видимі панелі місцями разом із їхніми папками, режимами,
курсорами й позначками. Активна панель залишається активною на новому боці.
Page Up і Page Down пересувають курсор у панелі. Стрілки вгору й вниз
керують панеллю, коли список підказок закритий.
Стрілки вліво й вправо переходять до першого й останнього рядків, коли
@@ -209,7 +215,7 @@ Warning і початковий фокус на No.
За наявності змін перехід у перегляд пропонує Save, Discard або Cancel.
Помилка збереження залишає відкритим редактор зі змінами.
- Ctrl+Tab циклічно перемикає фокус між Files, редакторами й переглядачами
у порядку їх відкриття.
у порядку їх відкриття. Коли відкрито лише Files, активна панель не змінюється.
- F3 відкриває Markdown як форматований документ із таблицями, блоками коду,
інтерактивними чекбоксами списків і діаграмами Mermaid. Відмітки в перегляді
діють до повторного рендерингу або виходу з цього режиму. F4 відкриває текст
+8 -6
View File
@@ -148,12 +148,14 @@ updating the application. After verifying a new package, the updater closes File
screenshot editors, Settings, and bundled StayHere for that installation. Save open work before approving an update.
If settings change in the tray while the configurator is open, a conflicting Save is rejected; reopen
the configurator to load the latest settings.
Updates from v0.3.x–v0.4.1 first install the compatible **v0.4.2 bridge** through
Update in the tray menu. Select Update again to install the full current release;
manual extraction is not required. Future full releases use stable `release-vX.Y.Z`
tags, which the bridge and newer clients recognize. Older clients ignore those tags
and continue to find the bridge instead of skipping it. Versions v0.2.3 and earlier
still require the previously documented initial configurator migration.
Updates from v0.3.x–v0.4.1 go through the compatible **v0.4.2 bridge**. If tray
**Update** does not find it, download [v0.4.2](https://gitea.hrynco.com/hrynco/hrynco-kswitcher/releases/tag/v0.4.2),
close KSwitcher and its editors, and extract the bridge ZIP into the installation
directory while keeping personal data, dictionaries, and tools. Start v0.4.2
and select **Update** to install the current full release. Full releases use
stable `release-vX.Y.Z` tags recognized by the bridge and newer clients.
Versions v0.2.3 and earlier still require the previously documented initial
configurator migration.
Modern ZIPs contain `release-files.json` (schema, version, file paths, sizes and SHA-256
hashes). The updater validates that every packaged file is declared, all hashes match,
+12
View File
@@ -1,5 +1,17 @@
# Latest Windows release
## v0.6.111 — 2026-11-17
- KSwitcher Files updates a panel as soon as its background folder scan finishes.
- **Ctrl+U** swaps the panels, keeping their folders, view modes, cursors, marked items, and active panel together. Use **Tab** by itself to switch the active panel. **Ctrl+Tab** cycles between Files, Editor, and Viewer windows.
- Panels and scrollable Files popups share a Far-style scrollbar with up and down arrows, a dotted track, and a thumb lighter than its background.
**Українською.**
- KSwitcher Files оновлює панель одразу після завершення фонового читання папки.
- **Ctrl+U** міняє панелі місцями разом із папками, режимами перегляду, курсорами й позначками. Активна панель залишається активною на новому боці. Для перемикання активної панелі натисніть **Tab** без модифікаторів. **Ctrl+Tab** перемикає вікна Files, редактора й переглядача.
- Панелі та попапи з прокруткою у Files мають спільний скролбар у стилі Far зі стрілками вгорі й унизу, крапковою доріжкою та повзунком, світлішим за фон.
## v0.6.110 — 2026-11-17
Entering a folder or returning to its parent in KSwitcher Files refreshes the affected panel and the command line without repainting the other panel.
+1 -1
View File
@@ -1 +1 @@
6b25873e86443d57a6bc669170c64d30c79d1a41849739b685b8d0f94f2f4576 KSwitcher-win-x64.zip
dbc8fd01ed92849bab4516d83e6b51defaca6984d9fa2ff8bccd7cf84760a552 KSwitcher-win-x64.zip
+67 -67
View File
@@ -1,166 +1,166 @@
{
"version": "0.6.110",
"version": "0.6.111",
"schema": 1,
"files": [
{
"size": 2479104,
"path": "KSwitcher.exe",
"sha256": "eab543bf53474e7cd0523a96441b0054dbfad8e4b3119f73b552d311233b30da",
"size": 2373632
"sha256": "6b4df34f75dc159b98bb1b442f611faa69d7b0a4c77264c07516394396dcce5d"
},
{
"size": 2458112,
"path": "KSwitcher.Config.exe",
"sha256": "85da336ddec715bfe1660e36969729c83a20f39d5e0cddb4b5091a2c6fa9ce64",
"size": 2370560
"sha256": "83fc9cde793bb447d750328fafa8305a866bc8de54803c230b31a45a026e50bb"
},
{
"size": 3060224,
"path": "KSwitcher.Screenshot.exe",
"sha256": "8e4a38e2b058e6442a8fc40ade9434e771389fceadc3a32bb4ef5287d84fd6f0",
"size": 3350016
"sha256": "5b392de89d073ca5a873133fa2fc35fde44332126ef6e1817a1a87ceb90bb7ae"
},
{
"size": 4214272,
"path": "KSwitcher.Files.exe",
"sha256": "3640e0612d8a54d523b63e2a9f8a6281047679ead9b47058a8d6274cf04b175a",
"size": 4208128
"sha256": "f6ea287774d81d6c28e4dbba87d201d831f958f4cfe9fbd002b7d6a54e287b3c"
},
{
"size": 194912,
"path": "WebView2Loader.dll",
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6",
"size": 194912
"sha256": "d3fce90bdeecb08596e377dea6a316354dd8949e32ff09b89d51be00c14e21b6"
},
{
"size": 1103,
"path": "terminal/addon-fit-LICENSE.txt",
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f",
"size": 1103
"sha256": "e256f01188af527e4d06d21d06fbf785ae9c50d4b328bf03cbe0ba7f0aa4228f"
},
{
"size": 1521,
"path": "terminal/addon-fit.js",
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527",
"size": 1521
"sha256": "ba3ea256ce0620a0992a197d6c9baea64823fc93d8da07a9e366ca9943c18527"
},
{
"size": 527,
"path": "terminal/index.html",
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef",
"size": 527
"sha256": "084d97a727b778fb10d31adcd557ee7840a38377ed60e0ef0f3ece93b349b1ef"
},
{
"size": 1073,
"path": "terminal/markdown-it-LICENSE.txt",
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473",
"size": 1073
"sha256": "792c48c5a849a15fdf9e37e8bcf9e6d1dd13b32b46c642a748a0a46a9919d473"
},
{
"size": 100786,
"path": "terminal/markdown-it.js",
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e",
"size": 100786
"sha256": "391f2aa638e75e6c7859d0a5c5650ef0956722a45998f17e05b83bc655778e1e"
},
{
"size": 3530,
"path": "terminal/markdown.html",
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c",
"size": 3530
"sha256": "e5381c35fb254b558c8b869746e2e575c8ed53600611ac90597ed2dd80fa321c"
},
{
"size": 14987,
"path": "terminal/markdown.js",
"sha256": "5d1e824df1c3570877e985de0cfaae3f2984ceef7fe23bf4c5ade3c890a93223",
"size": 14987
"sha256": "5d1e824df1c3570877e985de0cfaae3f2984ceef7fe23bf4c5ade3c890a93223"
},
{
"size": 1089,
"path": "terminal/mermaid-LICENSE.txt",
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80",
"size": 1089
"sha256": "ec9fb67dcb25eccc416ed56e1aab819222c805a2a4bfe4cb19e7556bf2ffde80"
},
{
"size": 5537838,
"path": "terminal/mermaid.js",
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3",
"size": 5537838
"sha256": "336df803d87a38b70a01e736e666c8f7601d2ce42f5e47c8fafe5d721074b9a3"
},
{
"size": 5033,
"path": "terminal/terminal.js",
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a",
"size": 5033
"sha256": "0557d251962301940785690a3fc49475dd166bb7d0bd0417dc3279d1f1b3a98a"
},
{
"size": 1261,
"path": "terminal/xterm-LICENSE.txt",
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd",
"size": 1261
"sha256": "b569f629d00f2626a8100df2a1798210535621e42164dfd426a6fe5aac7b0ccd"
},
{
"size": 7112,
"path": "terminal/xterm.css",
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6",
"size": 7112
"sha256": "854a7c0fb70e8b1a083c16797ab827299fb18744f5ad34f227b48337e33293c6"
},
{
"size": 488663,
"path": "terminal/xterm.js",
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972",
"size": 488663
"sha256": "14903579ff54664cd72f8e8699e6961a6272c21863ec1c3b118cdc8af5d4a972"
},
{
"size": 4401,
"path": "LICENSE",
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c",
"size": 4401
"sha256": "d3c81140cce01c26bf6cbf52aa40e0825e1fa35b9a91d1387170a65d2597082c"
},
{
"size": 1096,
"path": "json-LICENSE.txt",
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831",
"size": 1096
"sha256": "61e08da79c44061654015ce6b0c4061c23ee1dd18237fbf09e9bfda3c0ea2831"
},
{
"size": 883,
"path": "files-text-license.txt",
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625",
"size": 883
"sha256": "185c5a37521316e940ead89cbf0b1ba5862d810c7c966e6c6a14a4a515b23625"
},
{
"size": 95289,
"path": "README.md",
"sha256": "eb9cc6aa8f764cb0e1bdf2aa073e4e3d2623a7afc51ed9c6a0aba4046fc7f74c",
"size": 95168
"sha256": "fcbd14b6190dc2a3575a4bc4be7229540c647022cb038d33ec4ac22176c67a9e"
},
{
"size": 11577,
"path": "LAN-PREVIEW.md",
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930",
"size": 11577
"sha256": "1233d6a0ed76564dd034f178a9f65db076244a819137f74dc9f2c27df9d3c930"
},
{
"size": 732485,
"path": "dictionaries/en.txt",
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9",
"size": 732485
"sha256": "d0c022b27b9fbc2ff7b6b8bec723cc1adc4eef517202f9ff77eed5d8bea3acb9"
},
{
"size": 20566,
"path": "dictionaries/LICENSE-CC-BY-SA-4.0.txt",
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5",
"size": 20566
"sha256": "0bdfb0201d1803634f268cdff0993b8349d2c70e956a06dbb667c8dd65254ec5"
},
{
"size": 2265,
"path": "dictionaries/README.md",
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311",
"size": 2265
"sha256": "3017bf44d3be9d9dfab21bd6778aa52b7947e61acf9ce2bc86b41d6e949ac311"
},
{
"size": 1109134,
"path": "dictionaries/ru.txt",
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849",
"size": 1109134
"sha256": "80e6b6a27815973535f7facb636c597eb845dfee45cfabfc4e9b3341b9332849"
},
{
"size": 1280,
"path": "dictionaries/sources.json",
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408",
"size": 1280
"sha256": "98e5b3fe7304e37705c9e5ff48b0b399ccb16e806736d21f09921b99e5f2a408"
},
{
"size": 940799,
"path": "dictionaries/uk.txt",
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf",
"size": 940799
"sha256": "d30e990d6ec2983c04f3644a3c61c6c668e8c542323f5931916fdd55b916eebf"
},
{
"size": 993,
"path": "tools/README.txt",
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a",
"size": 993
"sha256": "a34b5161a8315af037e1ec71d816bfc688f7c364141d4ee2347cf0515ef0c82a"
},
{
"size": 133120,
"path": "tools/StayHere.exe",
"sha256": "6ef5cf64708d62b7fc63c3c793cc99188a513433ff4774cae01dc014f6664376",
"size": 134656
"sha256": "a2e34f817ecdc88b870d5e93418d8364a5fe8af81496b364e10b0f6587492e0d"
},
{
"size": 2796,
"path": "tools/StayHere-README.md",
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413",
"size": 2796
"sha256": "ba214e2aca7405e698b3ab21ceb1f41ce088edd996b3e30e4a9d58ff496f9413"
}
],
"schema": 1
]
}
+3 -3
View File
@@ -9,8 +9,8 @@ IDC_SCREENSHOT_PENCIL CURSOR "icons/lucide/pencil.cur"
1 RT_MANIFEST "app.manifest"
201 RCDATA "update.ps1"
1 VERSIONINFO
FILEVERSION 0,6,110,0
PRODUCTVERSION 0,6,110,0
FILEVERSION 0,6,111,0
PRODUCTVERSION 0,6,111,0
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
BEGIN
@@ -20,7 +20,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "KSwitcher — native keyboard and clipboard utility"
VALUE "ProductName", "KSwitcher"
VALUE "FileVersion", "0.6.110"
VALUE "FileVersion", "0.6.111"
END
END
BLOCK "VarFileInfo"
+2 -2
View File
@@ -54,7 +54,7 @@ END
STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN
FONT 10, "Consolas"
BEGIN
CONTROL "", 100, "Edit", ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL | WS_VSCROLL, 14, 16, 157, 13
CONTROL "", 100, "Edit", ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL, 14, 16, 157, 13
AUTOCHECKBOX "&Remember for this session", 101, 14, 30, 157, 13, NOT WS_VISIBLE
CONTROL "", 102, "Static", NOT WS_VISIBLE, 14, 35, 1, 1
CONTROL "&OK", IDOK, "Button", BS_OWNERDRAW | WS_TABSTOP, 67, 38, 51, 15
@@ -68,7 +68,7 @@ STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN
FONT 10, "Consolas"
BEGIN
LTEXT "", 430, 14, 17, 322, 20
LISTBOX 431, 14, 41, 322, 61, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
LISTBOX 431, 14, 41, 322, 61, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_TABSTOP
CONTROL "", 432, "Static", NOT WS_VISIBLE, 14, 108, 1, 1
CONTROL "&End process", 433, "Button", BS_OWNERDRAW | WS_TABSTOP, 56, 110, 80, 16
CONTROL "&Refresh", 434, "Button", BS_OWNERDRAW | WS_TABSTOP, 140, 110, 74, 16
+4 -9
View File
@@ -140,13 +140,7 @@ LRESULT CALLBACK historyListScroll(HWND list,UINT message,WPARAM wp,LPARAM lp,UI
SendMessageW(GetParent(list),WM_COMMAND,IDOK,0);
return 0;
}
if(message==LB_GETTOPINDEX || message==WM_NCDESTROY)
return DefSubclassProc(list,message,wp,lp);
const auto top=SendMessageW(list,LB_GETTOPINDEX,0,0);
const auto result=scrollList(list,message,wp,lp);
if(top!=SendMessageW(list,LB_GETTOPINDEX,0,0))
InvalidateRect(GetParent(list),nullptr,FALSE);
return result;
return DefSubclassProc(list,message,wp,lp);
}
void sizeCommandHistory(HWND dialog,HWND list)
@@ -179,7 +173,7 @@ void sizeCommandHistory(HWND dialog,HWND list)
const int gap=MulDiv(4,dpi,96);
const int listTop=top+2*textHeight+2*gap;
const LONG desired=std::max<LONG>(MulDiv(320,dpi,96),
longest+2*cellWidth+2*historyRowInset(dpi)+GetSystemMetricsForDpi(SM_CXVSCROLL,dpi))+2*inset;
longest+2*cellWidth+2*historyRowInset(dpi)+scrollBarWidth(list))+2*inset;
const auto target=std::min(desired,area.right-area.left);
const auto rows=std::max<LRESULT>(1,SendMessageW(list,LB_GETCOUNT,0,0));
RECT listWindow{},listClient{};
@@ -198,7 +192,7 @@ void sizeCommandHistory(HWND dialog,HWND list)
};
place(GetDlgItem(dialog,historySearchLabel),top,textHeight);
place(GetDlgItem(dialog,historySearch),top+textHeight+gap,textHeight);
SetWindowPos(list,nullptr,inset,listTop,std::max(1L,target-2*inset-5),
SetWindowPos(list,nullptr,inset,listTop,std::max(1L,target-2*inset-scrollBarWidth(list)),
std::max(1L,height-listTop-inset),SWP_NOZORDER|SWP_NOACTIVATE);
GetClientRect(list,&listClient);
if(rows*textHeight<=listClient.bottom) SendMessageW(list,LB_SETTOPINDEX,0,0);
@@ -221,6 +215,7 @@ INT_PTR CALLBACK commandHistoryDialog(HWND dialog,UINT message,WPARAM wp,LPARAM
prepareCopyDialog(dialog);
const auto list=GetDlgItem(dialog,historyList);
SetWindowSubclass(list,historyListScroll,1,0);
installScrollBar(list,dialog);
SendMessageW(list,WM_SETFONT,reinterpret_cast<WPARAM>(mono),TRUE);
SendMessageW(list,LB_SETITEMHEIGHT,0,std::max(1,textHeight));
const auto search=GetDlgItem(dialog,historySearch);
+7 -3
View File
@@ -243,7 +243,8 @@ void layoutQuickFolders(HWND dialog,FolderShortcutView &view,int selection)
GetWindowRect(owner,&parent);
const auto windowWidth=std::max(px(260),static_cast<int>(parent.right-parent.left));
const auto windowHeight=std::max(px(140),static_cast<int>(parent.bottom-parent.top));
width=std::min(width,std::max(1,std::min(windowWidth,static_cast<int>(work.right-work.left))-2*inset));
width=std::min(width+scrollBarWidth(list),
std::max(1,std::min(windowWidth,static_cast<int>(work.right-work.left))-2*inset));
const auto maxRows=std::max(1,(std::min(windowHeight,static_cast<int>(work.bottom-work.top))-2*listTop)/view.rowHeight);
const auto count=static_cast<int>(SendMessageW(list,LB_GETCOUNT,0,0));
const int rows=std::min(count,maxRows);
@@ -255,7 +256,8 @@ void layoutQuickFolders(HWND dialog,FolderShortcutView &view,int selection)
const int y=std::clamp(static_cast<int>((parent.top+parent.bottom-h)/2),
static_cast<int>(work.top),std::max(static_cast<int>(work.top),static_cast<int>(work.bottom)-h));
SetWindowPos(dialog,nullptr,x,y,w,h,SWP_NOZORDER|SWP_NOACTIVATE);
SetWindowPos(list,nullptr,inset,listTop,width,listHeight,SWP_NOZORDER|SWP_NOACTIVATE);
SetWindowPos(list,nullptr,inset,listTop,std::max(1,width-scrollBarWidth(list)),listHeight,
SWP_NOZORDER|SWP_NOACTIVATE);
SendMessageW(list,LB_SETCURSEL,std::clamp(selection,0,std::max(0,count-1)),0);
InvalidateRect(dialog,nullptr,TRUE);
FilesModalDialog::refreshLayout(dialog);
@@ -278,7 +280,7 @@ LRESULT CALLBACK quickFolderKeys(HWND list,UINT message,WPARAM key,LPARAM flags,
return 0;
}
}
return scrollList(list,message,key,flags);
return DefSubclassProc(list,message,key,flags);
}
INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
@@ -291,6 +293,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
layoutQuickFolders(dialog,view,0);
const auto list=GetDlgItem(dialog,shortcutList);
SetWindowSubclass(list,quickFolderKeys,1,0);
installScrollBar(list,dialog);
SetFocus(list);
return FALSE;
}
@@ -311,6 +314,7 @@ INT_PTR CALLBACK quickFolderDialog(HWND dialog,UINT message,WPARAM wp,LPARAM lp)
DeleteObject(frame);
paintDialogFrameCaptions(dc,client,bounds,L"Folder shortcuts",teal,colors[Text],mono,
view->digit<0?L"Enter Esc":quickFolderHints);
paintScrollPosition(dialog,dc,GetDlgItem(dialog,shortcutList),colors[Dialog]);
EndPaint(dialog,&ps);
return TRUE;
}
+7 -1
View File
@@ -186,6 +186,12 @@ INT_PTR CALLBACK lockProcessesDialog(HWND window,UINT message,WPARAM wp,LPARAM l
SetWindowLongPtrW(window,DWLP_USER,lp);
prepareCopyDialog(window);
for(const auto id:{430,431}) SendDlgItemMessageW(window,id,WM_SETFONT,reinterpret_cast<WPARAM>(mono),FALSE);
const auto list=GetDlgItem(window,431);
RECT bounds{};
GetWindowRect(list,&bounds);
SetWindowPos(list,nullptr,0,0,std::max(1L,bounds.right-bounds.left-scrollBarWidth(list)),
bounds.bottom-bounds.top,SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE);
installScrollBar(list,window);
layoutDialogButtons(window,432,{433,434,IDOK});
SendMessageW(window,DM_SETDEFID,IDOK,0);
SetFocus(GetDlgItem(window,IDOK));
@@ -233,7 +239,7 @@ INT_PTR CALLBACK lockProcessesDialog(HWND window,UINT message,WPARAM wp,LPARAM l
}
}
if(message==WM_CLOSE) {FilesModalDialog::finish(window,IDCANCEL);return TRUE;}
return paintCopyDialog(window,message,wp,lp,L" Locking processes ",false,{432});
return paintCopyDialog(window,message,wp,lp,L" Locking processes ",false,{432},false,GetDlgItem(window,431));
}
void showLockProcesses(HWND owner,std::vector<fs::path> paths)
+228 -61
View File
@@ -27,6 +27,7 @@
#include "files_text_preferences.h"
#include "files_menu_paint.h"
#include "files_dropdown_paint.h"
#include "files_scrollbar.h"
#include "files_inline_action.h"
#include "files_history_date.h"
#include "files_terminal_view.h"
@@ -314,6 +315,17 @@ struct Panel
struct DirectoryWatch
{
HANDLE handle=INVALID_HANDLE_VALUE;
DirectoryWatch()=default;
DirectoryWatch(DirectoryWatch &&other) noexcept {std::swap(handle,other.handle);}
DirectoryWatch &operator=(DirectoryWatch &&other) noexcept
{
if(this!=&other)
{
reset();
std::swap(handle,other.handle);
}
return *this;
}
~DirectoryWatch() { reset(); }
void reset()
{
@@ -535,10 +547,12 @@ fs::path savedPanelPath(const wchar_t *key)
return path;
}
constexpr const wchar_t *panelModeKeys[]{L"LeftWide",L"RightWide"};
void setMode(int index, bool wide)
{
panels[index].wide=wide;
savePreference(index ? L"RightWide" : L"LeftWide",wide);
savePreference(panelModeKeys[index],wide);
notifyFilesPreferences(GetParent(panels[index].list));
layout(GetParent(panels[index].list));
InvalidateRect(panels[index].list,nullptr,TRUE);
@@ -549,6 +563,7 @@ LOGFONTW displayFont{};
int fontPoints=110;
int textHeight=20, cellWidth=9;
constexpr UINT refreshProgressLayout=WM_APP+1;
constexpr UINT directoryScanReady=WM_APP+2;
BOOL CALLBACK updateDialogFont(HWND window,LPARAM parameter)
{
@@ -818,44 +833,139 @@ void showMenu(bool show)
if (!show) ShowWindow(menuBar,SW_HIDE);
RedrawWindow(GetParent(menuBar),nullptr,nullptr,RDW_INVALIDATE|RDW_ALLCHILDREN);
}
LRESULT scrollList(HWND list, UINT message, WPARAM wp, LPARAM lp)
{
if (message == WM_MOUSEWHEEL)
{
int delta = GET_WHEEL_DELTA_WPARAM(wp);
int top = static_cast<int>(SendMessageW(list, LB_GETTOPINDEX, 0, 0));
int count = static_cast<int>(SendMessageW(list, LB_GETCOUNT, 0, 0));
RECT rect{};
GetClientRect(list, &rect);
int rowHeight = static_cast<int>(SendMessageW(list, LB_GETITEMHEIGHT, 0, 0));
int visible = std::max(1, static_cast<int>(rect.bottom) / std::max(1, rowHeight));
SendMessageW(list, LB_SETTOPINDEX,
std::clamp(top - (delta / WHEEL_DELTA) * 3, 0, std::max(0, count - visible)), 0);
return 0;
}
return DefSubclassProc(list, message, wp, lp);
}
using ks::files::ScrollPosition;
using ks::files::scrollBarWidth;
constexpr UINT_PTR listScrollBar=2, noticeScrollBar=3, firstPanelScrollBar=4;
void paintScrollPosition(HWND parent, HDC dc, HWND list, COLORREF background)
RECT scrollTrack(HWND host,HWND content)
{
RECT track{};
GetWindowRect(list, &track);
MapWindowPoints(nullptr, parent, reinterpret_cast<POINT *>(&track), 2);
track.left = track.right;
track.right += 5;
SetDCBrushColor(dc, background);
FillRect(dc, &track, static_cast<HBRUSH>(GetStockObject(DC_BRUSH)));
int count = static_cast<int>(SendMessageW(list, LB_GETCOUNT, 0, 0));
int rowHeight = static_cast<int>(SendMessageW(list, LB_GETITEMHEIGHT, 0, 0));
int height = track.bottom - track.top;
int visible = std::max(1, height / std::max(1, rowHeight));
if (height <= 0 || count <= visible) return;
int thumb = std::min(height, std::max(5, MulDiv(height, visible, count)));
int top = static_cast<int>(SendMessageW(list, LB_GETTOPINDEX, 0, 0));
track.top += MulDiv(std::clamp(top, 0, count - visible), height - thumb, count - visible);
track.bottom = track.top + thumb;
SetDCBrushColor(dc, colors[Frame]);
FillRect(dc, &track, static_cast<HBRUSH>(GetStockObject(DC_BRUSH)));
GetWindowRect(content,&track);
MapWindowPoints(nullptr,host,reinterpret_cast<POINT *>(&track),2);
track.left=track.right;
track.right+=scrollBarWidth(content);
return track;
}
ScrollPosition scrollPosition(HWND content,bool edit)
{
RECT client{};
GetClientRect(content,&client);
int rowHeight{};
if(edit)
{
if(const auto dc=GetDC(content))
{
const auto old=SelectObject(dc,mono);
TEXTMETRICW metrics{};
GetTextMetricsW(dc,&metrics);
rowHeight=metrics.tmHeight;
SelectObject(dc,old);
ReleaseDC(content,dc);
}
}
else rowHeight=static_cast<int>(SendMessageW(content,LB_GETITEMHEIGHT,0,0));
return {
static_cast<int>(SendMessageW(content,edit?EM_GETLINECOUNT:LB_GETCOUNT,0,0)),
std::max(1,static_cast<int>(client.bottom)/std::max(1,rowHeight)),
static_cast<int>(SendMessageW(content,edit?EM_GETFIRSTVISIBLELINE:LB_GETTOPINDEX,0,0))};
}
void paintScrollPosition(HWND host,HDC dc,HWND content,COLORREF background,bool edit=false)
{
if(!IsWindowVisible(content)) return;
const auto position=scrollPosition(content,edit);
if(!edit || position.last())
ks::files::paintScrollBar(dc,scrollTrack(host,content),position,background);
}
void setScrollTop(HWND content,bool edit,ScrollPosition position,int top)
{
top=std::clamp(top,0,position.last());
if(edit) SendMessageW(content,EM_LINESCROLL,0,top-position.top);
else SendMessageW(content,LB_SETTOPINDEX,top,0);
}
LRESULT CALLBACK scrollContentProc(HWND content,UINT message,WPARAM wp,LPARAM lp,UINT_PTR kind,DWORD_PTR target)
{
const bool edit=kind==noticeScrollBar;
const auto host=reinterpret_cast<HWND>(target);
if(message==WM_MOUSEWHEEL)
{
const auto position=scrollPosition(content,edit);
setScrollTop(content,edit,position,position.top-3*(GET_WHEEL_DELTA_WPARAM(wp)/WHEEL_DELTA));
return 0;
}
const auto result=DefSubclassProc(content,message,wp,lp);
switch(message)
{
case LB_DELETESTRING: case LB_RESETCONTENT: case LB_SETCURSEL:
case LB_SETTOPINDEX: case LB_SETITEMHEIGHT: case WM_KEYDOWN: case WM_VSCROLL:
case WM_LBUTTONDOWN: case WM_LBUTTONUP: case EM_LINESCROLL: case WM_SETTEXT:
case WM_WINDOWPOSCHANGED:
{
const auto track=scrollTrack(host,content);
InvalidateRect(host,&track,FALSE);
break;
}
}
return result;
}
LRESULT CALLBACK scrollHostProc(HWND host,UINT message,WPARAM wp,LPARAM lp,UINT_PTR kind,DWORD_PTR target)
{
constexpr auto dragProperty=L"KSwitcher.Files.ScrollDrag";
constexpr auto offsetProperty=L"KSwitcher.Files.ScrollDragOffset";
const bool edit=kind==noticeScrollBar;
const auto content=reinterpret_cast<HWND>(target);
const bool dragging=GetPropW(host,dragProperty)==content;
if(message==WM_CAPTURECHANGED && dragging)
{
RemovePropW(host,dragProperty);
RemovePropW(host,offsetProperty);
}
if(message==WM_LBUTTONUP && dragging && GetCapture()==host)
{
ReleaseCapture();
return 0;
}
if(message==WM_NCHITTEST || message==WM_LBUTTONDOWN ||
(message==WM_MOUSEMOVE && dragging && GetCapture()==host))
{
POINT point{GET_X_LPARAM(lp),GET_Y_LPARAM(lp)};
if(message==WM_NCHITTEST) ScreenToClient(host,&point);
const auto track=scrollTrack(host,content);
if(IsWindowVisible(content) && (PtInRect(&track,point) || message==WM_MOUSEMOVE))
{
const auto position=scrollPosition(content,edit);
if(position.last())
{
if(message==WM_NCHITTEST) return HTCLIENT;
const auto thumb=position.thumb(track);
if(message==WM_MOUSEMOVE)
{
const auto offset=reinterpret_cast<INT_PTR>(GetPropW(host,offsetProperty))-1;
setScrollTop(content,edit,position,position.drag(track,point.y,static_cast<int>(offset)));
}
else if(PtInRect(&thumb,point))
{
SetPropW(host,dragProperty,content);
SetPropW(host,offsetProperty,reinterpret_cast<HANDLE>(
static_cast<INT_PTR>(point.y-thumb.top+1)));
SetCapture(host);
}
else setScrollTop(content,edit,position,position.click(track,point.y));
return 0;
}
}
}
return DefSubclassProc(host,message,wp,lp);
}
void installScrollBar(HWND content,HWND host,UINT_PTR kind=listScrollBar)
{
SetWindowSubclass(content,scrollContentProc,kind,reinterpret_cast<DWORD_PTR>(host));
SetWindowSubclass(host,scrollHostProc,kind,reinterpret_cast<DWORD_PTR>(content));
}
void placePanelSearch(HWND window)
@@ -876,6 +986,28 @@ void closePanelSearch()
if(IsWindowVisible(panelSearchPopup)) ShowWindow(panelSearchPopup,SW_HIDE);
}
void swapPanels(HWND window)
{
closePanelSearch();
hidePicker();
showMenu(false);
// Move the controls with their contents to retain the cursor and scroll position.
std::swap(panels[0],panels[1]);
active=1-active;
for(auto &panel:terminalCommandPanels)
if(panel>=0) panel=1-panel;
for(int i=0;i<2;++i)
{
const auto &panel=panels[i];
SetWindowLongPtrW(panel.list,GWLP_ID,102+i);
SetWindowLongPtrW(panel.heading,GWLP_ID,140+i);
SetWindowLongPtrW(panel.path,GWLP_ID,142+i);
savePreference(panelModeKeys[i],panel.wide);
}
notifyFilesPreferences(window);
layout(window);
}
void layout(HWND window,bool activeOnly)
{
RECT rect{};
@@ -905,7 +1037,8 @@ void layout(HWND window,bool activeOnly)
int headingHeight=panels[i].wide?textHeight:0;
place(panels[i].heading,x+5,textHeight+10,std::max(0,end-x-13),headingHeight);
ShowWindow(panels[i].heading,!terminalVisible && panels[i].wide?SW_SHOWNA:SW_HIDE);
place(panels[i].list, x + 5, textHeight+10+headingHeight, std::max(0, end - x - 13),
place(panels[i].list, x + 5, textHeight+10+headingHeight,
std::max(0,end-x-8-scrollBarWidth(panels[i].list)),
std::max(0, panelBottom-textHeight-10-headingHeight));
}
place(menuBar,0,0,width,textHeight+4);
@@ -1014,6 +1147,12 @@ void activatePanel(int index)
layout(GetParent(panels[index].list),true);
}
bool plainPanelTab()
{
return !((GetKeyState(VK_CONTROL)|GetKeyState(VK_SHIFT)|GetKeyState(VK_MENU)|
GetKeyState(VK_LWIN)|GetKeyState(VK_RWIN))&0x8000);
}
std::wstring terminalInputText()
{
std::wstring value(GetWindowTextLengthW(terminalInput)+1,L'\0');
@@ -1079,7 +1218,7 @@ void showFramedList(HWND list,HWND frame,int x,int y,int width,int height,int in
{
constexpr UINT flags=SWP_NOACTIVATE|SWP_SHOWWINDOW;
SetWindowPos(frame,HWND_TOP,x-inset,y-inset,width+2*inset,height+2*inset,flags);
SetWindowPos(list,HWND_TOP,x,y,width,height,flags);
SetWindowPos(list,HWND_TOP,x,y,std::max(1,width-scrollBarWidth(list)),height,flags);
}
void appendPowerShellCompletions(const CompletionQuery &query,const Json &reply,
@@ -1144,7 +1283,7 @@ void showCompletion(HWND owner,const CompletionQuery &query,const Json &reply={}
ReleaseDC(completionList,dc);
}
if(static_cast<size_t>(rows)<completionItems.size())
desiredWidth+=GetSystemMetricsForDpi(SM_CXVSCROLL,GetDpiForWindow(owner));
desiredWidth+=scrollBarWidth(completionList);
const int width=std::min(desiredWidth,static_cast<int>(edit.right-edit.left)-2*inset);
if(rows<1 || width<1) { hideCompletion(); return; }
SendMessageW(completionList,LB_RESETCONTENT,0,0);
@@ -1623,7 +1762,7 @@ LRESULT CALLBACK terminalInputKeys(HWND input,UINT message,WPARAM wp,LPARAM lp,U
}
if(message==WM_KEYDOWN && !terminalVisible && wp==VK_TAB)
{
activatePanel(1-active);
if(plainPanelTab()) activatePanel(1-active);
return 0;
}
if(message==WM_KEYDOWN && !terminalVisible &&
@@ -1895,10 +2034,15 @@ bool applyDirectoryScan(Panel &panel,Panel::ScanRequest request,Panel::ScanResul
void startDirectoryScan(Panel &panel)
{
panel.scanStop=std::stop_source{};
const auto owner=GetParent(panel.list);
std::packaged_task<std::unique_ptr<Panel::ScanResult>()> task(
[request=*panel.scanRequest,stop=panel.scanStop.get_token()] {return scanDirectory(request,stop);});
auto future=task.get_future();
std::thread(std::move(task)).detach();
std::thread([task=std::move(task),owner]() mutable
{
task();
PostMessageW(owner,directoryScanReady,0,0);
}).detach();
panel.scan=std::move(future);
panel.scanSuperseded=false;
}
@@ -2289,7 +2433,7 @@ LRESULT CALLBACK pickerKeys(HWND window, UINT msg, WPARAM wp, LPARAM lp, UINT_PT
SendMessageW(GetParent(window),WM_COMMAND,MAKEWPARAM(130+next,BN_CLICKED),0);
return 0;
}
return scrollList(window,msg,wp,lp);
return DefSubclassProc(window,msg,wp,lp);
}
void queryDrivePeers()
@@ -2372,11 +2516,12 @@ void layoutDrivePicker(int selected,bool focus)
auto layout=BeginDeferWindowPos(2);
if(layout) layout=DeferWindowPos(layout,pickerFrame,HWND_TOP,
x-inset,y-vertical,width+2*inset,height+2*vertical,flags);
if(layout) layout=DeferWindowPos(layout,picker,HWND_TOP,x,y,width,height,flags);
if(layout) layout=DeferWindowPos(layout,picker,HWND_TOP,x,y,
std::max(1,width-scrollBarWidth(picker)),height,flags);
if(!layout || !EndDeferWindowPos(layout))
{
SetWindowPos(pickerFrame,HWND_TOP,x-inset,y-vertical,width+2*inset,height+2*vertical,flags);
SetWindowPos(picker,HWND_TOP,x,y,width,height,flags);
SetWindowPos(picker,HWND_TOP,x,y,std::max(1,width-scrollBarWidth(picker)),height,flags);
}
RedrawWindow(pickerFrame,nullptr,nullptr,RDW_INVALIDATE|RDW_UPDATENOW);
SendMessageW(picker,LB_SETCURSEL,selected,0);
@@ -2993,14 +3138,14 @@ void paintDialogButton(const DRAWITEMSTRUCT &item,COLORREF surface,COLORREF fore
INT_PTR paintCopyDialog(HWND dialog, UINT message, WPARAM wp, LPARAM lp,
const wchar_t *caption, bool warning, std::initializer_list<int> dividers, bool useDialogPalette=false,
HWND scrollListControl=nullptr)
HWND scrollControl=nullptr,bool scrollEdit=false)
{
const auto foreground=useDialogPalette?colors[Text]:warning?RGB(255,255,255):RGB(0,0,0);
const auto surface=useDialogPalette?colors[Dialog]:warning?RGB(128,0,0):RGB(192,192,192);
const auto brush=useDialogPalette?teal:warning?warningBrush:static_cast<HBRUSH>(GetStockObject(LTGRAY_BRUSH));
if(message==WM_CTLCOLORDLG) return reinterpret_cast<INT_PTR>(brush);
if(message==WM_CTLCOLORSTATIC || message==WM_CTLCOLOREDIT || message==WM_CTLCOLORBTN ||
(useDialogPalette && message==WM_CTLCOLORLISTBOX))
(message==WM_CTLCOLORLISTBOX && (useDialogPalette || reinterpret_cast<HWND>(lp)==scrollControl)))
{
const auto dc=reinterpret_cast<HDC>(wp);
const bool edit=message==WM_CTLCOLOREDIT ||
@@ -3026,7 +3171,7 @@ INT_PTR paintCopyDialog(HWND dialog, UINT message, WPARAM wp, LPARAM lp,
FillRect(dc,&divider,black);
}
paintDialogFrameCaptions(dc,client,bounds,caption,brush,foreground,mono);
if(scrollListControl) paintScrollPosition(dialog,dc,scrollListControl,surface);
if(scrollControl) paintScrollPosition(dialog,dc,scrollControl,surface,scrollEdit);
EndPaint(dialog,&paint);
return TRUE;
}
@@ -3805,13 +3950,13 @@ void layoutFilesNotice(HWND dialog)
SetWindowPos(GetDlgItem(dialog,id),nullptr,inset,y,contentWidth,height,SWP_NOZORDER|SWP_NOACTIVATE);
};
constexpr LRESULT maxLines=8;
ShowScrollBar(field,SB_VERT,FALSE);
place(100,top,maxLines*lineHeight);
const auto lines=SendMessageW(field,EM_GETLINECOUNT,0,0);
const bool overflow=lines>maxLines;
const auto height=static_cast<int>(std::clamp<LRESULT>(lines,1,maxLines))*lineHeight;
place(100,top,height);
ShowScrollBar(field,SB_VERT,overflow);
if(overflow) SetWindowPos(field,nullptr,inset,top,
std::max(1L,contentWidth-scrollBarWidth(field)),height,SWP_NOZORDER|SWP_NOACTIVATE);
const auto style=GetWindowLongPtrW(field,GWL_STYLE);
SetWindowLongPtrW(field,GWL_STYLE,overflow?style|WS_TABSTOP:style&~WS_TABSTOP);
if(!overflow) SendMessageW(field,EM_LINESCROLL,0,-SendMessageW(field,EM_GETFIRSTVISIBLELINE,0,0));
@@ -3838,6 +3983,7 @@ INT_PTR CALLBACK filesNoticeDialog(HWND window,UINT message,WPARAM wp,LPARAM lp)
const auto field=GetDlgItem(window,100);
SendMessageW(field,EM_SETMARGINS,EC_LEFTMARGIN|EC_RIGHTMARGIN,0);
SetWindowTextW(field,notice.text);
installScrollBar(field,window,noticeScrollBar);
if(notice.options.remember)
{
const auto checkbox=GetDlgItem(window,101);
@@ -3884,7 +4030,7 @@ INT_PTR CALLBACK filesNoticeDialog(HWND window,UINT message,WPARAM wp,LPARAM lp)
SetBkColor(dc,warning?RGB(128,0,0):RGB(192,192,192));
return reinterpret_cast<INT_PTR>(warning?warningBrush:GetStockObject(LTGRAY_BRUSH));
}
if(const auto painted=paintCopyDialog(window,message,wp,lp,notice->title.c_str(),warning,{102},palette))
if(const auto painted=paintCopyDialog(window,message,wp,lp,notice->title.c_str(),warning,{102},palette,GetDlgItem(window,100),true))
return painted;
const auto command=LOWORD(wp);
if(message==WM_COMMAND && (command==IDOK || command==IDCANCEL || command==IDYES || command==IDNO ||
@@ -5084,8 +5230,9 @@ void makeFolder(HWND owner,Panel &panel)
selectPanelPath(panel,request.created);
}
LRESULT CALLBACK panelKeys(HWND window, UINT message, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR index)
LRESULT CALLBACK panelKeys(HWND window, UINT message, WPARAM wp, LPARAM lp, UINT_PTR, DWORD_PTR)
{
const auto index=GetDlgCtrlID(window)-102;
if(message==WM_LBUTTONDOWN || message==WM_LBUTTONDBLCLK ||
(message==WM_MOUSEMOVE && (wp&MK_LBUTTON) && GetCapture()==window))
{
@@ -5159,7 +5306,15 @@ LRESULT CALLBACK panelKeys(HWND window, UINT message, WPARAM wp, LPARAM lp, UINT
}
if (message == WM_KEYDOWN)
{
if(wp==VK_TAB) { activatePanel(static_cast<int>(1-index)); SetFocus(terminalInput); return 0; }
if(wp==VK_TAB)
{
if(plainPanelTab())
{
activatePanel(1-index);
SetFocus(terminalInput);
}
return 0;
}
if (wp == VK_RETURN) { enter(panels[index]); return 0; }
if (wp == VK_F2)
{
@@ -5194,7 +5349,7 @@ LRESULT CALLBACK panelKeys(HWND window, UINT message, WPARAM wp, LPARAM lp, UINT
const bool movesCursor=message==WM_KEYDOWN &&
(wp==VK_UP || wp==VK_DOWN || wp==VK_PRIOR || wp==VK_NEXT || wp==VK_HOME || wp==VK_END);
const auto previous=movesCursor?SendMessageW(window,LB_GETCURSEL,0,0):LB_ERR;
auto result=scrollList(window, message, wp, lp);
auto result=DefSubclassProc(window,message,wp,lp);
if(movesCursor) invalidatePanelCursorChange(window,previous);
if(message==WM_LBUTTONUP && GetFocus()==window) restoreCommandFocus();
if(message==WM_PAINT && panels[index].wide)
@@ -5227,8 +5382,7 @@ bool loadFilesPreferences(HWND window)
std::min(preference(dialogRowTextKey,defaultDialogFramePadding.rowText),maxDialogRowTextPadding)};
loadFileStyles();
loadFolderShortcuts();
panels[0].wide=preference(L"LeftWide",defaultWide)!=0;
panels[1].wide=preference(L"RightWide",defaultWide)!=0;
for(int i=0;i<2;++i) panels[i].wide=preference(panelModeKeys[i],defaultWide)!=0;
sizeWidth=static_cast<int>(std::clamp(preference(L"SizeWidth",defaultSizeWidth),6UL,16UL));
alignExtensions=preference(L"AlignExtensions",defaultAlignExtensions)!=0;
showDetails=preference(L"ShowDetails",defaultShowDetails)!=0;
@@ -5322,7 +5476,9 @@ void openMenu(HWND window, int index)
const int x=std::clamp(static_cast<int>(anchor.left)+inset,inset,
std::max(inset,static_cast<int>(client.right)-width-inset));
const int y=anchor.bottom+5;
const int height=static_cast<int>(commandActions.size())*static_cast<int>(SendMessageW(picker,LB_GETITEMHEIGHT,0,0));
const int rowHeight=static_cast<int>(SendMessageW(picker,LB_GETITEMHEIGHT,0,0));
const int maxRows=std::max(1,(static_cast<int>(client.bottom)-y-inset)/rowHeight);
const int height=std::min(static_cast<int>(commandActions.size()),maxRows)*rowHeight;
showFramedList(picker,pickerFrame,x,y,width,height,inset);
SendMessageW(picker,LB_SETCURSEL,0,0);
SetFocus(picker);
@@ -5519,6 +5675,9 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
drivePeerReplyReceived=true;
return TRUE;
}
case directoryScanReady:
if(!FilesModalDialog::activeFor(window)) collectDirectoryScans();
return 0;
case WM_TIMER:
if(wp==driveQueryTimer) {pollDriveQueries(window);return 0;}
if(wp==terminalTimer)
@@ -5569,6 +5728,7 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
pickerFrame=CreateWindowW(L"STATIC",L"",WS_CHILD|WS_CLIPSIBLINGS|SS_OWNERDRAW,
0,0,0,0,window,reinterpret_cast<HMENU>(122),instance,nullptr);
SetWindowSubclass(picker,pickerKeys,1,0);
installScrollBar(picker,pickerFrame);
SendMessageW(picker,LB_SETITEMHEIGHT,0,textHeight);
status = CreateWindowW(L"STATIC", L"", WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SS_PATHELLIPSIS,
0, 0, 0, 0, window, reinterpret_cast<HMENU>(144), instance, nullptr);
@@ -5581,12 +5741,13 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
terminalOutput=CreateWindowW(L"STATIC",L"",WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
0,0,0,0,window,reinterpret_cast<HMENU>(145),instance,nullptr);
completionList=CreateWindowW(L"LISTBOX",L"Command suggestions",
WS_CHILD|WS_CLIPSIBLINGS|WS_VSCROLL|LBS_OWNERDRAWFIXED|LBS_HASSTRINGS|LBS_NOINTEGRALHEIGHT,
WS_CHILD|WS_CLIPSIBLINGS|LBS_OWNERDRAWFIXED|LBS_HASSTRINGS|LBS_NOINTEGRALHEIGHT,
0,0,0,0,window,reinterpret_cast<HMENU>(149),instance,nullptr);
completionFrame=CreateWindowW(L"STATIC",L"",WS_CHILD|WS_CLIPSIBLINGS|SS_OWNERDRAW,
0,0,0,0,window,nullptr,instance,nullptr);
if(!completionList || !completionFrame) return -1;
SetWindowSubclass(completionList,completionClick,1,0);
installScrollBar(completionList,completionFrame);
terminalBackground=CreateSolidBrush(RGB(24,24,24));
if(!terminalInput || !terminalOutput || !terminalPrompt || !terminalBackground) return -1;
for(const auto control:{terminalInput,terminalOutput,terminalPrompt})
@@ -5621,7 +5782,8 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
const auto root=fs::path(system).root_path();
openOn(panel,saved.is_absolute()?saved:root,false,{},savedPanelPath(panelCursorKeys[i]),
saved.is_absolute() && saved!=root?root:fs::path{});
SetWindowSubclass(panel.list, panelKeys, 1, i);
SetWindowSubclass(panel.list, panelKeys, 1, 0);
installScrollBar(panel.list,window,firstPanelScrollBar+i);
}
SetFocus(panels[0].list);
return 0;
@@ -5702,7 +5864,7 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
GetWindowRect(panel.list,&box);
MapWindowPoints(nullptr,window,reinterpret_cast<POINT*>(&box),2);
const LONG columnX=std::max(box.left,box.right-(sizeWidth+2)*static_cast<LONG>(cellWidth));
box.right+=5;
box.right+=scrollBarWidth(panel.list);
InflateRect(&box,2,2);
box.left-=2;
RECT pathBounds{};
@@ -5844,6 +6006,8 @@ LRESULT CALLBACK filesWindow(HWND window, UINT message, WPARAM wp, LPARAM lp)
}
paintDialogFrameCaptions(item.hDC,item.rcItem,box,L"Change drive",teal,colors[Text],mono);
}
const auto list=item.hwndItem==pickerFrame?picker:completionList;
paintScrollPosition(item.hwndItem,item.hDC,list,colors[Dialog]);
DeleteObject(border);
return TRUE;
}
@@ -6315,12 +6479,14 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int show)
const bool shift=(GetKeyState(VK_SHIFT)&0x8000)!=0;
if(ctrl && !shift &&
(message.wParam=='F' || message.wParam=='C' || message.wParam=='R' ||
(message.wParam=='U' && !terminalVisible) ||
message.wParam==VK_RETURN || message.wParam==VK_INSERT))
{
if(!(message.lParam & (1LL<<30)))
{
if(message.wParam=='F') insertCurrentPanelPath();
else if(message.wParam=='R') refreshPanel(panels[active]);
else if(message.wParam=='U') swapPanels(window);
else if(message.wParam==VK_RETURN) insertCurrentPanelPath(true);
else if(message.wParam==VK_INSERT) copyCommandLineOrPanelNames(window);
else SendMessageW(terminalInput,WM_COPY,0,0);
@@ -6343,11 +6509,12 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE, PWSTR, int show)
continue;
if((message.message==WM_LBUTTONDOWN || message.message==WM_RBUTTONDOWN ||
message.message==WM_NCLBUTTONDOWN) && message.hwnd!=menuBar && message.hwnd!=picker &&
message.hwnd!=pickerFrame &&
std::find(std::begin(menuItems),std::end(menuItems),message.hwnd)==std::end(menuItems))
{
if(message.hwnd!=completionList) hideCompletion();
if(message.hwnd!=completionList && message.hwnd!=completionFrame) hideCompletion();
showMenu(false);
if(message.hwnd!=picker) hidePicker();
hidePicker();
}
if((message.message==WM_CHAR || message.message==WM_SYSCHAR) && IsWindowVisible(menuBar))
{
+99
View File
@@ -0,0 +1,99 @@
#pragma once
#include <windows.h>
#include <algorithm>
namespace ks::files
{
inline int scrollBarWidth(HWND window) {return std::max(7,MulDiv(12,GetDpiForWindow(window),96));}
inline int scrollArrowHeight(RECT bounds)
{
return std::min(bounds.right-bounds.left,(bounds.bottom-bounds.top)/3);
}
struct ScrollPosition
{
int count, visible, top;
int last() const {return std::max(0,count-visible);}
RECT thumb(RECT track) const
{
const auto arrow=scrollArrowHeight(track);
track.top+=arrow;
track.bottom-=arrow;
const int height=track.bottom-track.top;
if(height<=0 || !last()) return {};
const int size=std::clamp(MulDiv(height,visible,count),std::min(height,arrow),height);
track.top+=MulDiv(std::clamp(top,0,last()),height-size,last());
track.bottom=track.top+size;
return track;
}
int click(RECT track,int y) const
{
const auto arrow=scrollArrowHeight(track);
const auto grip=thumb(track);
const int delta=y<track.top+arrow?-1:y>=track.bottom-arrow?1:
y<grip.top?-visible:y>=grip.bottom?visible:0;
return std::clamp(top+delta,0,last());
}
int drag(RECT track,int y,int offset) const
{
const auto grip=thumb(track);
const auto arrow=scrollArrowHeight(track);
const auto travel=track.bottom-track.top-2*arrow-(grip.bottom-grip.top);
return travel>0?std::clamp(MulDiv(y-track.top-arrow-offset,last(),travel),0,last()):top;
}
};
inline void paintScrollBar(HDC dc,RECT track,ScrollPosition position,COLORREF background)
{
const auto brush=static_cast<HBRUSH>(GetStockObject(DC_BRUSH));
SetDCBrushColor(dc,background);
FillRect(dc,&track,brush);
if(!position.last()) return;
const auto lighter=[&](int divisor){return RGB(GetRValue(background)+(257-GetRValue(background))/divisor,
GetGValue(background)+(257-GetGValue(background))/divisor,
GetBValue(background)+(257-GetBValue(background))/divisor);};
const auto ink=lighter(4),dots=lighter(7);
const int height=scrollArrowHeight(track);
struct
{
BITMAPINFOHEADER header{sizeof(BITMAPINFOHEADER),4,4,1,32,BI_RGB};
DWORD pixels[16]{};
} tile;
for(int y=0;y<4;++y)
for(int x=0;x<4;++x)
{
const auto color=y%2==0 && x%2==y/2?dots:background;
// DIB pixels are stored bottom-up in BGR order.
tile.pixels[(3-y)*4+x]=RGB(GetBValue(color),GetGValue(color),GetRValue(color));
}
if(const auto pattern=CreateDIBPatternBrushPt(&tile,DIB_RGB_COLORS))
{
const RECT channel{track.left,track.top+height,track.right,track.bottom-height};
POINT origin{};
SetBrushOrgEx(dc,channel.left,channel.top,&origin);
FillRect(dc,&channel,pattern);
SetBrushOrgEx(dc,origin.x,origin.y,nullptr);
DeleteObject(pattern);
}
SetDCBrushColor(dc,ink);
const auto thumb=position.thumb(track);
FillRect(dc,&thumb,brush);
const int middle=(track.left+track.right)/2;
const int radius=std::max(0,(height-3)/2);
for(int row=0;row<=radius;++row)
{
const int y=track.top+(height-radius-1)/2+row;
const int mirrored=track.bottom-1-(y-track.top);
const RECT up{middle-row,y,middle+row+1,y+1};
const RECT down{middle-row,mirrored,middle+row+1,mirrored+1};
FillRect(dc,&up,brush);
FillRect(dc,&down,brush);
}
}
}
+27 -22
View File
@@ -2,6 +2,7 @@
#include "files_text_preferences.h"
#include "files_menu_paint.h"
#include "files_menu_navigation.h"
#include "files_scrollbar.h"
#include "files_history_date.h"
#include "files_text_document.h"
#include "files_text_language.h"
@@ -317,10 +318,17 @@ struct FarPopup
FarDropDownPalette palette;
HFONT font{};
int rowHeight{},inset{},visible{},top{},current{},result=-1;
int dragOffset=-1;
bool done{};
int rowTop() const { return inset+1+rowHeight/2; }
int bottomMargin() const { return inset+1+rowHeight/4; }
ScrollPosition scrollPosition() const {return {static_cast<int>(rows.size()),visible,top};}
RECT scrollTrack(HWND window,RECT bounds) const
{
const LONG right=bounds.right-inset-1;
return {std::max(bounds.left,right-scrollBarWidth(window)),rowTop(),right,rowTop()+visible*rowHeight};
}
void select(int row)
{
@@ -370,8 +378,9 @@ struct FarPopup
SetTextColor(dc,palette.text);
SelectObject(dc,font);
const LONG rowLeft=frame.left+inset;
const LONG scrollWidth=static_cast<int>(rows.size())>visible?rowHeight/2:0;
const LONG rowRight=scrollWidth?bounds.right-scrollWidth:frame.right-1;
const auto position=scrollPosition();
const auto track=scrollTrack(window,bounds);
const LONG rowRight=position.last()?track.left:frame.right-1;
LONG y=rowTop();
for(int offset=0;offset<visible;++offset,y+=rowHeight)
{
@@ -400,22 +409,7 @@ struct FarPopup
DrawTextW(dc,entry.text.data(),static_cast<int>(entry.text.size()),&box,
DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX|DT_END_ELLIPSIS|(entry.index<0?DT_CENTER:DT_LEFT));
}
if(scrollWidth)
{
RECT up{rowRight,rowTop(),bounds.right,rowTop()+rowHeight};
RECT down{rowRight,y-rowHeight,bounds.right,y};
DrawTextW(dc,L"▲",1,&up,DT_SINGLELINE|DT_CENTER|DT_VCENTER);
DrawTextW(dc,L"▼",1,&down,DT_SINGLELINE|DT_CENTER|DT_VCENTER);
RECT track{up.left,up.bottom,up.right,down.top};
for(LONG line=track.top;line<track.bottom;line+=2)
for(LONG x=track.left+(line%4==0?0:1);x<track.right;x+=2)
SetPixelV(dc,x,line,palette.text);
const auto travel=std::max(0L,track.bottom-track.top-rowHeight);
const auto thumbY=track.top+MulDiv(top,travel,static_cast<int>(rows.size())-visible);
RECT thumb{track.left,thumbY,track.right,std::min(track.bottom,thumbY+rowHeight)};
SetDCBrushColor(dc,palette.text);
FillRect(dc,&thumb,brush);
}
if(position.last()) paintScrollBar(dc,track,position,palette.surface);
}
};
@@ -482,17 +476,28 @@ LRESULT CALLBACK farPopupWindow(HWND window,UINT message,WPARAM wp,LPARAM lp)
RECT bounds{};
GetClientRect(window,&bounds);
const POINT point{GET_X_LPARAM(lp),GET_Y_LPARAM(lp)};
const auto position=state->scrollPosition();
const auto track=state->scrollTrack(window,bounds);
if(state->dragOffset>=0)
{
if(message==WM_MOUSEMOVE) state->top=position.drag(track,point.y,state->dragOffset);
if(message==WM_LBUTTONUP) state->dragOffset=-1;
InvalidateRect(window,nullptr,FALSE);
return 0;
}
if(!PtInRect(&bounds,point))
{
if(message==WM_LBUTTONDOWN) state->done=true;
return 0;
}
const auto offset=(point.y-state->rowTop())/state->rowHeight;
const bool scroll=static_cast<int>(state->rows.size())>state->visible &&
point.x>=bounds.right-state->rowHeight/2;
const bool scroll=position.last() && PtInRect(&track,point);
if(scroll && message==WM_LBUTTONDOWN)
state->top=std::clamp(state->top+(offset<state->visible/2?-1:1),0,
static_cast<int>(state->rows.size())-state->visible);
{
const auto thumb=position.thumb(track);
if(PtInRect(&thumb,point)) state->dragOffset=point.y-thumb.top;
else state->top=position.click(track,point.y);
}
if(!scroll && point.y>=state->rowTop() && offset<state->visible)
{
const auto row=state->top+offset;
+1 -1
View File
@@ -2,7 +2,7 @@
#include "platform.h"
namespace ks
{
inline constexpr wchar_t AppVersion[] = L"0.6.110";
inline constexpr wchar_t AppVersion[] = L"0.6.111";
inline constexpr UINT UpdateMessage = WM_APP + 7;
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;
+105 -2
View File
@@ -10,6 +10,8 @@ using System.Runtime.InteropServices;
public static class FilesShortcutWindow {
[StructLayout(LayoutKind.Sequential)]
public struct Rect { public int Left, Top, Right, Bottom; }
[StructLayout(LayoutKind.Sequential)]
public struct Point { public int X, Y; }
[DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
[DllImport("user32.dll")] static extern bool SetForegroundWindow(IntPtr window);
[DllImport("user32.dll")] static extern void keybd_event(byte key, byte scan, uint flags, UIntPtr extra);
@@ -17,6 +19,11 @@ public static class FilesShortcutWindow {
[DllImport("user32.dll")] public static extern IntPtr GetDlgItem(IntPtr window, int id);
[DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr window);
[DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr window, out Rect rect);
[DllImport("user32.dll")] public static extern uint GetDpiForWindow(IntPtr window);
[DllImport("user32.dll")] public static extern IntPtr SetThreadDpiAwarenessContext(IntPtr context);
[DllImport("user32.dll")] public static extern bool ScreenToClient(IntPtr window, ref Point point);
[DllImport("user32.dll", EntryPoint="SendMessageW")]
public static extern IntPtr Send(IntPtr window, uint message, IntPtr w, IntPtr l);
[DllImport("user32.dll", CharSet=CharSet.Unicode)]
public static extern IntPtr SendMessage(IntPtr window, uint msg, IntPtr w, StringBuilder text);
public static bool Activate(IntPtr window) {
@@ -55,6 +62,7 @@ foreach ($name in $names) {
if ($name -in $key.GetValueNames()) { $saved[$name] = @($key.GetValue($name), $key.GetValueKind($name)) }
}
$folder = [IO.Directory]::CreateTempSubdirectory('ks-files-shortcuts-').FullName
$previousDpi = [FilesShortcutWindow]::SetThreadDpiAwarenessContext([IntPtr](-4))
try {
$groups = [object[]]::new(10)
for ($digit = 0; $digit -lt 10; $digit++) { $groups[$digit] = @() }
@@ -62,6 +70,9 @@ try {
$path = [IO.Directory]::CreateDirectory((Join-Path $folder $entry[1])).FullName
$groups[$entry[0]] += @{ path = $path; peer = ''; name = ''; title = $entry[1] }
}
$groups[9] = @(1..200 | ForEach-Object {
@{ path = (Join-Path $folder "Folder $_"); peer = ''; name = ''; title = "Folder $_" }
})
$key.SetValue('FolderShortcuts', [Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject $groups -Depth 4)), 'Binary')
foreach ($name in 'LeftWide', 'RightWide') { $key.SetValue($name, 1, 'DWord') }
foreach ($name in 'LeftPath', 'RightPath') { $key.SetValue($name, $folder, 'String') }
@@ -103,13 +114,105 @@ try {
$keyboard.SendKeys('^4')
Wait-Until { (Read-Text $leftPath) -eq (Join-Path $folder 'Four') }
if (![FilesShortcutWindow]::IsWindowVisible($heading)) { throw 'Ctrl+4 changed panel mode.' }
$keyboard.SendKeys('^{TAB}')
$keyboard.SendKeys('^{F1}')
Wait-Until {
![FilesShortcutWindow]::IsWindowVisible($heading) -or
![FilesShortcutWindow]::IsWindowVisible($rightHeading)
}
if (![FilesShortcutWindow]::IsWindowVisible($rightHeading)) {
throw 'Ctrl+Tab changed the active panel.'
}
$keyboard.SendKeys('{TAB}')
$keyboard.SendKeys('^{F1}')
Wait-Until { ![FilesShortcutWindow]::IsWindowVisible($rightHeading) }
$keyboard.SendKeys('^{F2}')
Wait-Until { [FilesShortcutWindow]::IsWindowVisible($rightHeading) }
$keyboard.SendKeys('{TAB}')
Wait-Until { ![FilesShortcutWindow]::IsWindowVisible($heading) }
if (![FilesShortcutWindow]::IsWindowVisible($rightHeading)) { throw 'Ctrl+F1 changed the inactive panel.' }
$rightPath = [FilesShortcutWindow]::GetDlgItem($window, 143)
$leftList = [FilesShortcutWindow]::GetDlgItem($window, 102)
$rightList = [FilesShortcutWindow]::GetDlgItem($window, 103)
$keyboard.SendKeys('^u')
Wait-Until {
(Read-Text ([FilesShortcutWindow]::GetDlgItem($window, 142))) -eq $folder -and
(Read-Text ([FilesShortcutWindow]::GetDlgItem($window, 143))) -eq (Join-Path $folder 'Four') -and
[FilesShortcutWindow]::IsWindowVisible($rightHeading)
}
$movedLeft = [FilesShortcutWindow+Rect]::new()
$movedRight = [FilesShortcutWindow+Rect]::new()
if (![FilesShortcutWindow]::GetWindowRect($rightList, [ref]$movedLeft) -or
![FilesShortcutWindow]::GetWindowRect($leftList, [ref]$movedRight) -or
$movedLeft.Right -gt $movedRight.Left -or
[FilesShortcutWindow]::IsWindowVisible($heading)) {
throw 'Ctrl+U did not move the visible panel lists with their modes.'
}
$keyboard.SendKeys('^3')
Wait-Until { (Read-Text $leftPath) -eq (Join-Path $folder 'Three') }
if ((Read-Text $rightPath) -ne $folder) { throw 'Ctrl+U did not preserve the active panel.' }
$keyboard.SendKeys('^u')
Wait-Until { [FilesShortcutWindow]::GetDlgItem($window, 142) -eq $leftPath }
$keyboard.SendKeys('^{F2}')
Wait-Until { [FilesShortcutWindow]::IsWindowVisible($heading) }
Write-Output 'Verified Ctrl+8 popup rows, Ctrl+4 navigation and Ctrl+F1/F2 panel modes.'
$keyboard.SendKeys('^9')
Wait-Until { (Read-ShortcutDialog) -ne [IntPtr]::Zero }
$dialog = Read-ShortcutDialog
$list = [FilesShortcutWindow]::GetDlgItem($dialog, 310)
Add-Type -AssemblyName System.Drawing
$bounds = [FilesShortcutWindow+Rect]::new()
if (![FilesShortcutWindow]::GetWindowRect($list, [ref]$bounds)) { throw 'Missing overflow list.' }
Start-Sleep -Milliseconds 150
$barWidth = [int][Math]::Round(12 * [FilesShortcutWindow]::GetDpiForWindow($list) / 96)
$bitmap = [Drawing.Bitmap]::new($barWidth, ($bounds.Bottom - $bounds.Top))
try {
$graphics = [Drawing.Graphics]::FromImage($bitmap)
try { $graphics.CopyFromScreen($bounds.Right, $bounds.Top, 0, 0, $bitmap.Size) }
finally { $graphics.Dispose() }
$background = $bitmap.GetPixel(0, 0)
$thumb = $bitmap.GetPixel(0, $barWidth + 1)
$trackColors = @(0..4 | ForEach-Object {
$x = $_
0..7 | ForEach-Object { $bitmap.GetPixel($x, [int]($bitmap.Height / 2) + $_).ToArgb() }
} | Sort-Object -Unique)
$hasArrow = {
param($y)
$center = [int][Math]::Floor($barWidth / 2)
@(0..($barWidth - 1) | Where-Object {
$bitmap.GetPixel($center, $y + $_).ToArgb() -eq $thumb.ToArgb()
}).Count -gt 0
}
if ($thumb.GetBrightness() -le $background.GetBrightness() -or $trackColors.Count -ne 2 -or
!(& $hasArrow 0) -or !(& $hasArrow ($bitmap.Height - $barWidth))) {
throw "Unexpected scrollbar pixels. Background $background, thumb $thumb, track colors $($trackColors.Count), arrows $(& $hasArrow 0)/$(& $hasArrow ($bitmap.Height - $barWidth))."
}
} finally { $bitmap.Dispose() }
$arrow = [FilesShortcutWindow+Point]::new()
$arrow.X = $bounds.Right + [int]($barWidth / 2)
$arrow.Y = $bounds.Bottom - [int]($barWidth / 2)
if (![FilesShortcutWindow]::ScreenToClient($dialog, [ref]$arrow)) { throw 'Cannot locate the down arrow.' }
$arrowPoint = [IntPtr](($arrow.Y -shl 16) -bor $arrow.X)
[void][FilesShortcutWindow]::Send($dialog, 0x0201, [IntPtr]1, $arrowPoint)
if ([FilesShortcutWindow]::Send($list, 0x018E, [IntPtr]::Zero, [IntPtr]::Zero).ToInt32() -ne 1) {
throw 'The down arrow should scroll the list by one row.'
}
$grip = [FilesShortcutWindow+Point]::new()
$grip.X = $bounds.Right + [int]($barWidth / 2)
$grip.Y = $bounds.Top + $barWidth + 4
if (![FilesShortcutWindow]::ScreenToClient($dialog, [ref]$grip)) { throw 'Cannot locate the thumb.' }
$gripPoint = [IntPtr](($grip.Y -shl 16) -bor $grip.X)
$dragPoint = [IntPtr]((($grip.Y + 3 * $barWidth) -shl 16) -bor $grip.X)
[void][FilesShortcutWindow]::Send($dialog, 0x0201, [IntPtr]1, $gripPoint)
[void][FilesShortcutWindow]::Send($dialog, 0x0200, [IntPtr]1, $dragPoint)
[void][FilesShortcutWindow]::Send($dialog, 0x0202, [IntPtr]::Zero, $dragPoint)
if ([FilesShortcutWindow]::Send($list, 0x018E, [IntPtr]::Zero, [IntPtr]::Zero).ToInt32() -le 1) {
throw 'Dragging the scrollbar thumb should advance the list.'
}
$keyboard.SendKeys('{ESC}')
Write-Output 'Verified folder shortcuts, panel swapping, and the rendered overflow scrollbar.'
} finally {
if ($previousDpi) { [void][FilesShortcutWindow]::SetThreadDpiAwarenessContext($previousDpi) }
if ($process -and !$process.HasExited) {
$keyboard.SendKeys('{ESC}')
if (!$process.CloseMainWindow() -or !$process.WaitForExit(2500)) { $process.Kill(); $process.WaitForExit() }