hrynco/hrynco-kswitcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 41 Wiki Activity

Release v0.6.20: edit history images and share smooth wheel handling

Browse Source
This commit is contained in:
Anatolii Hrynchuk
2026-10-31 09:12:59 +02:00
parent 6603d28f68
commit 70ea9b10bc
22 changed files with 334 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/input.cpp
+6
View File
@@ -1,4 +1,5 @@
#include "app.h"
#include "ui_scroll.h"
#include "ui_geometry.h"
#include "screenshot.h"
#include <commctrl.h>
@@ -728,16 +729,21 @@ int main(int argc, char **argv) {
controlMoves=0;
ValidateRect(settings,nullptr);
SendMessageW(settings,WM_MOUSEWHEEL,MAKEWPARAM(0,WHEEL_DELTA),0);
SendMessageW(settings,WM_TIMER,ks::ScrollFrameTimer,0);
require(controlMoves==0 && !GetUpdateRect(settings,nullptr,FALSE),"wheel at top does not move controls or erase the window");
SendMessageW(settings,WM_MOUSEWHEEL,MAKEWPARAM(0,WORD(short(-WHEEL_DELTA/2))),0);
SendMessageW(settings,WM_TIMER,ks::ScrollFrameTimer,0);
require(controlMoves==0,"partial wheel step does not rearrange controls");
SendMessageW(settings,WM_MOUSEWHEEL,MAKEWPARAM(0,WORD(short(-WHEEL_DELTA/2))),0);
require(controlMoves==0,"wheel changes wait for the shared frame timer");
SendMessageW(settings,WM_TIMER,ks::ScrollFrameTimer,0);
require(controlMoves==1,"wheel scroll batches each control movement once");
SendMessageW(settings,WM_VSCROLL,SB_BOTTOM,0);
SendMessageW(settings,WM_HSCROLL,SB_RIGHT,0);
controlMoves=0;
SendMessageW(settings,WM_MOUSEWHEEL,MAKEWPARAM(0,-WHEEL_DELTA),0);
SendMessageW(settings,WM_MOUSEHWHEEL,MAKEWPARAM(0,WHEEL_DELTA),0);
SendMessageW(settings,WM_TIMER,ks::ScrollFrameTimer,0);
require(controlMoves==0,"wheel at bottom and right boundaries does not rearrange controls");
require((GetWindowLongPtrW(settings,GWL_STYLE)&WS_CLIPCHILDREN)!=0,"parent background excludes child controls");
RemoveWindowSubclass(trackedControl,countControlMoves,99);
tests/screenshot_ui.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ int main()
}
c.marks.clear(); SendMessageW(window,WM_COMMAND,27,0);
wchar_t windowTitle[128]{}; GetWindowTextW(window,windowTitle,128);
require(std::wstring(windowTitle)==L"KSwitcher — Screenshot #1","title includes editor index without usage hints");
require(std::wstring(windowTitle)==ks::localBuildTitle(L"KSwitcher — Screenshot #1"),"title includes editor index and local build marker without usage hints");
RECT client{}; GetClientRect(window,&client);
require(c.view.bottom<=client.bottom-c.statusHeight,"image does not overlap status bar");
ks::updateStatus(c);
tests/scroll.cpp
+66
View File
@@ -0,0 +1,66 @@
#include "ui_scroll.h"
#include <iostream>
namespace {
int forwarded{};
long long totalDelta{};
LRESULT CALLBACK observe(HWND w,UINT msg,WPARAM wp,LPARAM lp,UINT_PTR,DWORD_PTR)
{
if(msg==WM_MOUSEWHEEL) { ++forwarded; totalDelta+=GET_WHEEL_DELTA_WPARAM(wp); }
return DefSubclassProc(w,msg,wp,lp);
}
void require(bool ok,const char *message) { if(!ok) throw std::runtime_error(message); }
void wheel(HWND w,int delta) { SendMessageW(w,WM_MOUSEWHEEL,MAKEWPARAM(0,(WORD)(short)delta),0); }
void flush(HWND w) { SendMessageW(w,WM_TIMER,ks::ScrollFrameTimer,0); }
}
int main()
{
INITCOMMONCONTROLSEX init{sizeof(init),ICC_STANDARD_CLASSES|ICC_LISTVIEW_CLASSES};
InitCommonControlsEx(&init);
auto instance=GetModuleHandleW(nullptr);
auto parent=CreateWindowW(L"STATIC",L"Scroll regression",WS_OVERLAPPEDWINDOW,0,0,500,400,nullptr,nullptr,instance,nullptr);
try {
auto list=CreateWindowW(L"LISTBOX",L"",WS_CHILD|WS_VSCROLL,0,0,300,200,parent,nullptr,instance,nullptr);
for(int i=0;i<2000;++i) SendMessageW(list,LB_ADDSTRING,0,(LPARAM)L"row");
SendMessageW(list,LB_SETCURSEL,5,0);
SendMessageW(list,LB_SETTOPINDEX,0,0);
ks::enableWheelBatching(list,true);
for(int i=0;i<1000;++i) wheel(list,-120);
require(SendMessageW(list,LB_GETTOPINDEX,0,0)==0,"burst is deferred to one frame");
flush(list);
UINT lines{}; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0,&lines,0);
require(!lines || SendMessageW(list,LB_GETTOPINDEX,0,0)>0,"burst moves list");
require(SendMessageW(list,LB_GETCURSEL,0,0)==5,"scroll does not change selection");
for(int i=0;i<1000;++i) wheel(list,120);
flush(list);
require(SendMessageW(list,LB_GETTOPINDEX,0,0)==0,"reverse burst clamps at top");
wheel(list,-60); flush(list);
require(SendMessageW(list,LB_GETTOPINDEX,0,0)==0,"partial wheel step is retained");
wheel(list,-60); flush(list);
require(!lines || SendMessageW(list,LB_GETTOPINDEX,0,0)>0,"partial steps combine across frames");
DestroyWindow(list);
for(auto cls:{L"EDIT",WC_LISTVIEWW,L"COMBOBOX",L"STATIC"}) {
auto w=CreateWindowW(cls,L"",WS_CHILD|WS_VSCROLL,0,0,300,200,parent,nullptr,instance,nullptr);
require(w!=nullptr,"native scroll control created");
SetWindowSubclass(w,observe,1,0); ks::enableWheelBatching(w);
forwarded=0; totalDelta=0;
for(int i=0;i<100;++i) wheel(w,-120);
require(forwarded==0,"native wheel burst is batched");
flush(w);
require(forwarded==1 && totalDelta==-12000,"one native dispatch preserves burst distance");
wheel(w,60); flush(w);
require(forwarded==2 && totalDelta==-11940,"native partial steps are preserved");
forwarded=0; totalDelta=0;
for(int i=0;i<400;++i) wheel(w,-120);
flush(w); flush(w);
require(forwarded==2 && totalDelta==-48000,"large native burst is not truncated to 16 bits");
SendMessageW(w,WM_TIMER,ks::ScrollIdleTimer,0);
DestroyWindow(w);
}
DestroyWindow(parent);
std::cout<<"Passed shared wheel batching regressions (list, edit, table, combo, window)\n";
return 0;
} catch(const std::exception &e) {
DestroyWindow(parent); std::cerr<<e.what()<<'\n'; return 1;
}
}
tests/tests.cpp
+15
View File
@@ -1,4 +1,5 @@
#include "autocorrect.h"
#include "history_preview.h"
#include "ocr.h"
#include "richtext.h"
#include "storage.h"
@@ -22,6 +23,20 @@ void rejects(const std::function<void()> &f, const char *name)
bool thrown = false;
try
{
{
std::map<std::wstring,int> previews;
std::set<std::wstring> visible;
for(int i=0;i<40;++i) previews[std::to_wstring(i)]=i;
for(int i=0;i<8;++i) visible.insert(std::to_wstring(i));
ks::trimHistoryPreviews(previews,visible);
require(previews.size()==32,"preview cache stays bounded");
for(const auto &id:visible) require(previews.contains(id),"visible preview survives eviction");
for(int i=0;i<40;++i) { auto id=std::to_wstring(i); previews[id]=i; visible.insert(id); }
ks::trimHistoryPreviews(previews,visible);
require(previews.size()==40,"tall viewport does not thrash visible previews");
visible.clear(); ks::trimHistoryPreviews(previews,visible);
require(previews.size()==32,"cache shrinks after leaving tall viewport");
}
f();
}
catch (...)