Release v0.6.54: adjustable pencil smoothing and unsaved settings state

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.24)
-project(KSwitcher VERSION 0.6.51 LANGUAGES CXX RC)
+project(KSwitcher VERSION 0.6.54 LANGUAGES CXX RC)
 if(NOT WIN32)
   message(FATAL_ERROR "KSwitcher uses native Windows APIs")
 endif()

README.md

@@ -19,6 +19,11 @@ Double-click the tray icon to open Settings, the bold default menu item.
 Closing Settings with unsaved changes (including accepted auto-correction or OCR options)
 asks whether to save, discard changes, or keep editing. Unchanged settings close without a prompt.
 If saving fails, the window stays open with your edits intact.
+Settings displays **No unsaved changes** with **Save** disabled until an edit is made.
+**Unsaved changes — click Save to apply** appears for pending edits, including accepted
+chat-language, auto-correction and OCR changes. Cancelling a child dialog or restoring
+the original values clears its pending changes. Snippets saved in their own window
+remain saved independently; the Settings indicator reflects any other pending edits.
 Menus support access keys: press the underlined letter while the menu is open (for example,
 S for Settings or X for Exit in the tray menu). In forms, press Alt+the underlined letter
 to activate a button, toggle a checkbox or focus a labeled field. Dialog underline visibility
@@ -202,6 +207,22 @@ snapping and shape constraints are unchanged.
 Both drawn and recognized triangles have three independent vertex handles instead of bounding-box
 resize handles. Drag any vertex to reshape the triangle while keeping the other two fixed, even
 after rotation. Vertex edits support undo/redo, and the rotation and thickness handles remain available.
+**Arc (U)** draws an open half ellipse inside the dragged rectangle. Use the corner handles
+to resize it and the round handle to rotate it (Shift snaps to 15 degrees). Arcs support
+color, thickness, line style, moving, cloning, undo/redo and PNG export.
+
+**Smoothing (0–100%)** on the screenshot toolbar adjusts pencil paths. With a pencil
+stroke selected it affects that stroke; otherwise it sets the default for new strokes
+(initially 25%). **Apply to all strokes** applies the displayed amount to all pencil
+strokes in the current image and sets the default for new ones. Shapes, text and
+highlights are unchanged. Zero restores the original path; higher values reduce more
+jitter. The original samples are retained through moving, endpoint editing and cloning,
+so lowering the amount does not accumulate distortion. Each slider drag or bulk change
+is one undo step, and PNG export uses the displayed geometry. Very short strokes remain
+unchanged. Shift-constrained and linked strokes start without automatic smoothing;
+you can explicitly adjust them afterwards. Shape/straight-line recognition is separate
+and does not turn recognized shapes back into pencil strokes.
+
 **Trapezoid (B)** on the toolbar creates a trapezoid with parallel bases. Pencil recognition also
 fits nearly parallel, unequal bases into a clean trapezoid. Trapezoids support bounding-box resizing,
 rotation, styling and undo/redo; Ctrl+Z after recognition restores the original pencil stroke.
@@ -297,8 +318,7 @@ Identically named chats in one application share a profile; renamed chats need a
 profile. Telegram unread counters are ignored. Teams currently recognizes the desktop
 `Chat | name | Microsoft Teams` title format; other Teams title formats are not supported.
 Experimental Viber profiles introduced in v0.6.49 are disabled in v0.6.50 because repeated OCR caused delays. There is no background Viber OCR, recognition during language switching, or recognition when opening profiles. Saved Viber profiles are retained and marked inactive; Windows switching and Next layout use their normal/global behavior in Viber. Clipboard and image OCR are unchanged.
-Profiles stay on this PC (excluded from cloud sync), and are included in manual settings
-export/import. Available from v0.6.48.
+From v0.6.53, chat profiles (application, visible chat name and ordered language IDs) are included in settings synchronization and manual export/import. Update every synchronizing PC to v0.6.53 or newer first: older clients reject this shared field. Profiles for different chats merge independently; conflicting edits or deletion versus editing of one chat require a choice. Missing Windows layouts stay saved and are skipped during switching, with global-cycle fallback if none are installed. Keep this PC's layouts preserves the global cycle and shortcuts while chat profiles still synchronize. Downloading a pre-v0.6.53 profile preserves existing chat profiles. Chat matching is unchanged; Viber profiles remain inactive.
 
 **Українською.** Налаштування розділено на вкладки General, Languages, Shortcuts, Clipboard
 і Tools. Перехід між ними зберігає незбережені зміни; Save, Cancel, Import і Export доступні

Release/README.md

@@ -1,22 +1,22 @@
 # Latest Windows release
 
-## v0.6.51 — 2026-11-06
+## v0.6.54 — 2026-11-06
 
 ## Changes
-- Add Telegram Web K chat language profiles in Google Chrome. Open a chat at `https://web.telegram.org/k/`, then **Settings → Languages → Languages for a chat...** and select **Telegram Web: name**. Choose languages, then **Use languages → Save**. Applies to Alt+Shift, Win+Space, reverse Win+Shift+Space and Next layout.
-- Read the trusted Telegram address and chat header through Chrome accessibility. Refresh on foreground/focus and address/header events, without OCR, a polling timer or a browser extension. Web profiles are separate from Telegram Desktop profiles; identical chat names across accounts/browser profiles share a web profile. Web A and other browsers are not advertised as supported. Telegram Desktop and Teams remain unchanged; Viber OCR remains disabled.
-- Add application-specific snippets. In **Tools → Snippets**, enable **Only in these applications**, enter comma-separated executable names or select an open application and choose **Add app**. Unchecked means everywhere. Matching ignores case and the optional `.exe` suffix. Chrome scope applies to the whole browser.
-- Prefer an application-specific snippet over a global snippet with the same trigger. Allow the same trigger in disjoint application scopes and reject overlapping scopes. Keep existing snippets global. Preserve scopes in manual import/export and synchronization, with scope-aware merge conflicts. Validate the target application before insertion.
-- Center **Add app** against its application selector.
+- Add **Smoothing (0–100%)** to the screenshot editor toolbar. Adjust the selected pencil stroke, or set the default for new strokes when no pencil stroke is selected (initially 25%). **Apply to all strokes** updates all pencil strokes in the image and the default. Text, highlights and geometric shapes are unchanged.
+- Retain original pencil samples: zero restores the original path, and reducing smoothing restores detail without accumulating distortion. Moving, endpoint editing, cloning, undo/redo and PNG export preserve the chosen geometry. Each slider drag or bulk change is one undo step. Very short strokes remain unchanged; Shift-constrained and linked strokes start unsmoothed but can be adjusted explicitly. Shape recognition remains separate.
+- Show **No unsaved changes** in Settings with **Save** disabled until edits are pending. Show **Unsaved changes — click Save to apply** for pending edits, including accepted chat-language, OCR and automatic-correction preferences. Cancelling a child dialog or restoring the original values updates the state immediately. Separately saved snippets do not falsely mark Settings as unsaved.
+- Avoid creating empty personal-dictionary entries when accepting unchanged automatic-correction options, preventing a false unsaved-state indication.
+- Retain chat-language synchronization from v0.6.53 and **Arc (U)** from v0.6.52.
 
 ## Validation
-Passed 674 chat-profile/snippet UI checks, 568 input checks (including app-specific precedence and global fallback), 108 sync checks, 332 native checks, complete dictionary equivalence (140,939 words), wheel, StayHere, Utilities, screenshot UI/save/registration, 54 updater checks and updater progress checks. Inspected the snippet editor at 250% scaling. Live Chrome checks read a Telegram chat name directly and observed cache activation/invalidation. Release binaries, package manifest, published assets and update selection are checked during publication.
+Passed 774 settings/chat-profile checks, 568 input checks, 332 native checks, 126 sync checks, dictionary equivalence (140,939 words), wheel, StayHere, Utilities, screenshot UI/save/registration, 54 updater checks and updater progress checks. Smoothing checks cover defaults, per-stroke and bulk edits, reversible geometry, movement/cloning/endpoints, undo grouping and exact PNG restoration at zero. Settings checks cover clean/dirty/reverted/invalid states and accepted/cancelled child changes. Inspected actual editor and Settings renderings, including Settings at 250% scaling. Published assets, checksums, executable versions, updater selection and bilingual Wiki pages are verified during publication.
 
 ## Upgrade and compatibility
 Choose **Update** in the tray menu. Legacy v0.3.0–v0.4.1 clients first receive the v0.4.2 compatibility bridge, then the current full release. v0.2.3 and earlier require manual installation.
 For manual installation, exit KSwitcher, close its configurator and screenshot editors, and extract the entire ZIP into its installation folder. Keep personal `data/`, customized dictionaries and your own tools. Keep the three KSwitcher executables together; StayHere runs independently.
 
-**Update every synchronizing PC to v0.6.51 or newer before sharing application-specific snippets. Older versions do not understand application restrictions and may treat scoped snippets as global.** Keep a backup before downgrading. Settings with Telegram Web profiles require v0.6.51 or newer. Chat profiles remain local, included in manual export/import and excluded from cloud synchronization.
+**Update every synchronizing PC to v0.6.51 or newer before sharing application-specific snippets. Older versions do not understand application restrictions and may treat scoped snippets as global.** Keep a backup before downgrading. Settings with Telegram Web profiles require v0.6.51 or newer. Chat profiles now synchronize from v0.6.53. Update every synchronizing PC to v0.6.53 or newer before syncing: older clients reject the chat-profile field. Synchronization stores application names, visible chat names and language IDs on your configured OpenBao server. No message contents are included.
 
 Download **KSwitcher-win-x64.zip** with **SHA256SUMS.txt**. The package contains no personal settings, credentials or clipboard history.
 

Release/SHA256SUMS.txt

@@ -1 +1 @@
-0ee6426bf1715ee3156a1f8dbb2d213a9e09a49b2fcfec553d6049dc6a868877  KSwitcher-win-x64.zip
+e7a0d76f89d7d15123378390e1b549000404c4be2463160de95f9c1626687a59  KSwitcher-win-x64.zip

resources/app.rc

@@ -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,51,0
- PRODUCTVERSION 0,6,51,0
+ FILEVERSION 0,6,54,0
+ PRODUCTVERSION 0,6,54,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.51"
+   VALUE "FileVersion", "0.6.54"
   END
  END
  BLOCK "VarFileInfo"

src/screenshot.cpp

@@ -54,7 +54,7 @@ bool confirmScreenshotClose(HWND owner)
     // If Windows cannot display the confirmation, keep the screenshot open.
     return SUCCEEDED(result) && button==IDYES;
 }
-constexpr int ToolIds[]{27,10,11,22,23,24,25,36,37,21,19,26,20,12,18,13};
+constexpr int ToolIds[]{27,10,11,22,23,24,25,36,37,38,21,19,26,20,12,18,13};
 struct Surface
 {
     HDC dc = CreateCompatibleDC(nullptr);
@@ -124,7 +124,7 @@ bool chooseTextFont(HWND owner,Mark &m)
     m.fontWeight=font.lfWeight; m.fontItalic=font.lfItalic!=0;
     return true;
 }
-constexpr int CursorTools[]{10,11,22,23,24,25,36,37,19};
+constexpr int CursorTools[]{10,11,22,23,24,25,36,37,38,19};
 HCURSOR makeToolCursor(int tool,int size)
 {
     // Monochrome AND/XOR cursor: white outline keeps the glyph visible on dark images.
@@ -148,6 +148,7 @@ HCURSOR makeToolCursor(int tool,int size)
         case 22: line(18,29,29,18); break;
         case 23: Rectangle(dc,x(17),y(18),x(30),y(29)); break;
         case 24: Ellipse(dc,x(17),y(17),x(30),y(30)); break;
+        case 38: Arc(dc,x(16),y(18),x(31),y(38),x(31),y(28),x(16),y(28)); break;
         case 25: Ellipse(dc,x(16),y(20),x(31),y(28)); break;
         case 36: { POINT p[]{{x(23),y(17)},{x(31),y(30)},{x(16),y(30)},{x(23),y(17)}}; Polyline(dc,p,4); break; }
         case 37: { POINT p[]{{x(20),y(18)},{x(27),y(18)},{x(31),y(30)},{x(16),y(30)},{x(20),y(18)}}; Polyline(dc,p,5); break; }
@@ -177,6 +178,8 @@ struct Capture
     Mark textDefaults{};
     ScreenshotShape shape=ScreenshotShape::None;
     LineStyle lineStyle=LineStyle::Solid;
+    int smoothing=25;
+    bool smoothingDrag=false;
     LineEnds arrowEnds=LineEnds::End, freehandEnds=LineEnds::None;
     COLORREF currentColor=RGB(225,42,50);
     COLORREF customColors[16]{};
@@ -268,6 +271,7 @@ void updateStatus(Capture &c)
     else if(c.textTool) text=L"Text (T): click the image to type | Double-click existing text to edit";
     else if(c.highlight) text=L"Highlight (H): drag to paint | Ctrl+drag = paint over an object | V = pointer";
     else if(c.freehand) text=L"Freehand (F): auto-smooth / shapes; Ctrl+Z restores original | Shift = 45-degree steps | Ctrl = draw over objects";
+    else if(c.shape==ScreenshotShape::Arc) text=L"Arc (U): drag to draw a half ellipse | Handles = resize / rotate | V = pointer";
     else if(c.arrow) text=L"Drag to draw | Ctrl+drag over objects = linked connector | V = pointer";
     else text=L"Number (N): click to add | V = select and edit | Ctrl+C = copy screenshot";
     text=L"Zoom: "+std::to_wstring(int(std::lround(100.0*(c.view.right-c.view.left)/c.image->width)))+
@@ -409,6 +413,14 @@ std::vector<POINT> shapeOutline(const Mark &m)
         auto r=region(m.from,m.to);
         if(m.shape==ScreenshotShape::Rectangle)
             points={{r.left,r.top},{r.right,r.top},{r.right,r.bottom},{r.left,r.bottom},{r.left,r.top}};
+        else if(m.shape==ScreenshotShape::Arc) {
+            // An open half ellipse spanning the drag rectangle, with no closing chord.
+            for(int i=0;i<=90;++i) {
+                double a=i*3.141592653589793/90;
+                points.push_back({LONG(std::lround((r.left+r.right)/2.0-(r.right-r.left)/2.0*std::cos(a))),
+                                  LONG(std::lround(r.bottom-(r.bottom-r.top)*std::sin(a)))});
+            }
+        }
         else if(m.shape==ScreenshotShape::Triangle)
             points={{(r.left+r.right)/2,r.top},{r.right,r.bottom},{r.left,r.bottom},{(r.left+r.right)/2,r.top}};
         else if(m.shape==ScreenshotShape::Trapezoid)
@@ -550,7 +562,7 @@ void drawMarks(HDC dc, const std::vector<Mark> &marks, const Mark *preview = nul
             if(m.shape!=ScreenshotShape::None) {
                 auto hollow=SelectObject(dc,GetStockObject(HOLLOW_BRUSH));
                 auto r=region(m.from,m.to);
-                if(!m.points.empty() || m.rotation!=0 || m.shape==ScreenshotShape::Triangle || m.shape==ScreenshotShape::Trapezoid) {
+                if(!m.points.empty() || m.rotation!=0 || m.shape==ScreenshotShape::Triangle || m.shape==ScreenshotShape::Trapezoid || m.shape==ScreenshotShape::Arc) {
                     auto points=shapeOutline(m); Polyline(dc,points.data(),int(points.size()));
                 }
                 else if(m.shape==ScreenshotShape::Rectangle) Rectangle(dc,r.left,r.top,r.right+1,r.bottom+1);
@@ -620,6 +632,13 @@ bool selectedLine(const Capture &c)
 }
 void syncLineOptions(HWND w,const Capture &c)
 {
+    bool pencil=c.selected>=0 && c.marks[c.selected].freehand;
+    int amount=pencil?c.marks[c.selected].smoothing:c.smoothing;
+    SendDlgItemMessageW(w,41,TBM_SETPOS,TRUE,amount);
+    auto smoothingText=L"Smoothing: "+std::to_wstring(amount)+L"%";
+    SetDlgItemTextW(w,42,smoothingText.c_str());
+    SetDlgItemTextW(w,43,pencil?L"Selected stroke":L"New pencil strokes");
+    EnableWindow(GetDlgItem(w,44),std::any_of(c.marks.begin(),c.marks.end(),[](const Mark &m){return m.freehand;}));
     EnableWindow(GetDlgItem(w,34),c.textTool || (c.selected>=0 && (c.marks[c.selected].isText() || !c.marks[c.selected].label.empty())));
     EnableWindow(GetDlgItem(w,35),c.selected>=0 && c.marks[c.selected].isLine());
     bool selected=selectedLine(c),enabled=selected || c.arrow || c.freehand;
@@ -668,7 +687,7 @@ void layout(HWND w, Capture &c)
     RECT statusRect{}; GetWindowRect(status,&statusRect);
     c.statusHeight=statusRect.bottom-statusRect.top;
     r.bottom-=c.statusHeight;
-    const int positions[]{8,44,80,116,152,188,224,260,296,332,368,404,440,488,524,572};
+    const int positions[]{8,44,80,116,152,188,224,260,296,332,368,404,440,476,524,560,608};
     static_assert(std::size(positions)==std::size(ToolIds));
     for (size_t i = 0; i < std::size(ToolIds); ++i)
     {
@@ -677,10 +696,14 @@ void layout(HWND w, Capture &c)
                    MulDiv(32,dpi,96),MulDiv(32,dpi,96),TRUE);
     }
     SendDlgItemMessageW(w,28,WM_SETFONT,(WPARAM)c.font,TRUE);
-    MoveWindow(GetDlgItem(w,28),MulDiv(612,dpi,96),MulDiv(6,dpi,96),
+    MoveWindow(GetDlgItem(w,28),MulDiv(648,dpi,96),MulDiv(6,dpi,96),
                MulDiv(78,dpi,96),MulDiv(32,dpi,96),TRUE);
-    c.panelHeight=c.unit+MulDiv(40,dpi,96);
-    for(int id:{30,31,32,33,34,35}) SendDlgItemMessageW(w,id,WM_SETFONT,(WPARAM)c.font,TRUE);
+    c.panelHeight=c.unit+MulDiv(80,dpi,96);
+    for(int id:{30,31,32,33,34,35,41,42,43,44}) SendDlgItemMessageW(w,id,WM_SETFONT,(WPARAM)c.font,TRUE);
+    MoveWindow(GetDlgItem(w,42),MulDiv(12,dpi,96),c.unit+MulDiv(44,dpi,96),MulDiv(128,dpi,96),MulDiv(24,dpi,96),TRUE);
+    MoveWindow(GetDlgItem(w,41),MulDiv(142,dpi,96),c.unit+MulDiv(40,dpi,96),MulDiv(200,dpi,96),MulDiv(30,dpi,96),TRUE);
+    MoveWindow(GetDlgItem(w,43),MulDiv(350,dpi,96),c.unit+MulDiv(44,dpi,96),MulDiv(150,dpi,96),MulDiv(24,dpi,96),TRUE);
+    MoveWindow(GetDlgItem(w,44),MulDiv(516,dpi,96),c.unit+MulDiv(40,dpi,96),MulDiv(210,dpi,96),MulDiv(30,dpi,96),TRUE);
     MoveWindow(GetDlgItem(w,32),MulDiv(12,dpi,96),c.unit+MulDiv(6,dpi,96),MulDiv(64,dpi,96),MulDiv(24,dpi,96),TRUE);
     MoveWindow(GetDlgItem(w,30),MulDiv(80,dpi,96),c.unit+MulDiv(2,dpi,96),MulDiv(150,dpi,96),MulDiv(180,dpi,96),TRUE);
     MoveWindow(GetDlgItem(w,33),MulDiv(248,dpi,96),c.unit+MulDiv(6,dpi,96),MulDiv(40,dpi,96),MulDiv(24,dpi,96),TRUE);
@@ -771,7 +794,7 @@ HCURSOR toolCursor(const Capture &c)
     if(c.pointer) return LoadCursorW(nullptr,IDC_ARROW);
     if(c.textTool) return LoadCursorW(nullptr,IDC_IBEAM);
     if(c.freehand && c.pencilCursor) return c.pencilCursor;
-    int tool=c.highlight?19:c.straight?22:c.shape==ScreenshotShape::Trapezoid?37:c.shape==ScreenshotShape::Triangle?36:c.shape!=ScreenshotShape::None?22+int(c.shape):c.arrow?11:10;
+    int tool=c.highlight?19:c.straight?22:c.shape==ScreenshotShape::Arc?38:c.shape==ScreenshotShape::Trapezoid?37:c.shape==ScreenshotShape::Triangle?36:c.shape!=ScreenshotShape::None?22+int(c.shape):c.arrow?11:10;
     for(size_t i=0;i<std::size(CursorTools);++i)
         if(CursorTools[i]==tool && c.drawingCursors[i]) return c.drawingCursors[i];
     return LoadCursorW(nullptr,IDC_CROSS);
@@ -883,7 +906,7 @@ void drawTool(const DRAWITEMSTRUCT &item, const Capture &c)
     bool active=(item.CtlID==27 && c.pointer)||(item.CtlID==10 && !c.pointer && !c.arrow && !c.highlight && !c.freehand && !c.textTool)||(item.CtlID==11 && c.arrow && !c.straight && c.shape==ScreenshotShape::None)||
                 (item.CtlID==19 && c.highlight)||(item.CtlID==21 && c.freehand)||
                 (item.CtlID==22 && c.straight)||(item.CtlID>=23 && item.CtlID<=25 && int(c.shape)==int(item.CtlID)-22)||(item.CtlID==26 && c.textTool)||
-                (item.CtlID==36 && c.shape==ScreenshotShape::Triangle)||(item.CtlID==37 && c.shape==ScreenshotShape::Trapezoid);
+                (item.CtlID==36 && c.shape==ScreenshotShape::Triangle)||(item.CtlID==37 && c.shape==ScreenshotShape::Trapezoid)||(item.CtlID==38 && c.shape==ScreenshotShape::Arc);
     bool disabled=item.itemState&ODS_DISABLED;
     POINT mouse; GetCursorPos(&mouse); ScreenToClient(item.hwndItem,&mouse);
     bool hover=PtInRect(&r,mouse) && !disabled;
@@ -897,13 +920,14 @@ void drawTool(const DRAWITEMSTRUCT &item, const Capture &c)
     RoundRect(dc,r.left,r.top,r.right,r.bottom,corner,corner);
     SelectObject(dc,oldPen); SelectObject(dc,oldBrush); DeleteObject(pen); DeleteObject(brush);
     int iconIndex=item.CtlID==35?13:item.CtlID==34?14:item.CtlID>=22?int(item.CtlID)-13:item.CtlID==18?5:item.CtlID==19?6:item.CtlID==20?7:item.CtlID==21?8:item.CtlID-10;
-    auto icon=(item.CtlID==36 || item.CtlID==37)?nullptr:item.CtlID==27?(HICON)LoadCursorW(nullptr,IDC_ARROW):c.toolIcons[disabled?2:active?1:0][iconIndex];
-    if(item.CtlID==36 || item.CtlID==37) {
+    auto icon=(item.CtlID==36 || item.CtlID==37 || item.CtlID==38)?nullptr:item.CtlID==27?(HICON)LoadCursorW(nullptr,IDC_ARROW):c.toolIcons[disabled?2:active?1:0][iconIndex];
+    if(item.CtlID==36 || item.CtlID==37 || item.CtlID==38) {
         int cx=(r.left+r.right)/2,cy=(r.top+r.bottom)/2,s=c.iconSize/2;
         auto trianglePen=CreatePen(PS_SOLID,std::max(1,MulDiv(2,GetDpiForWindow(item.hwndItem),96)),
                                   disabled?RGB(148,163,184):active?RGB(37,99,235):RGB(51,65,85));
         auto previous=SelectObject(dc,trianglePen);
-        if(item.CtlID==36) { POINT vertices[]{{cx,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx,cy-s}}; Polyline(dc,vertices,4); }
+        if(item.CtlID==38) Arc(dc,cx-s,cy-s,cx+s,cy+3*s,cx+s,cy+s,cx-s,cy+s);
+        else if(item.CtlID==36) { POINT vertices[]{{cx,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx,cy-s}}; Polyline(dc,vertices,4); }
         else { POINT vertices[]{{cx-s/2,cy-s},{cx+s/2,cy-s},{cx+s,cy+s},{cx-s,cy+s},{cx-s/2,cy-s}}; Polyline(dc,vertices,5); }
         SelectObject(dc,previous); DeleteObject(trianglePen);
     }
@@ -1025,7 +1049,7 @@ void edit(HWND w, Capture &c)
     InitCommonControlsEx(&statusControls);
     CreateWindowExW(0,STATUSCLASSNAMEW,L"",WS_CHILD|WS_VISIBLE|SBARS_TOOLTIPS,
         0,0,0,0,w,(HMENU)50,c.app.instance,nullptr);
-    const wchar_t *labels[]{L"Pointer (V): select and edit objects", L"Number (N)", L"Arrow (A); Ctrl+drag between objects to link", L"Straight line (L); Ctrl+drag between objects to link", L"Rectangle (R)", L"Circle (O)", L"Ellipse (E)", L"Triangle (G): drag to draw; drag each vertex to reshape", L"Trapezoid (B): drag to draw", L"Freehand line (F); Shift for 45-degree steps; move >50 px off line to turn; Ctrl to draw over objects", L"Highlight (H); Ctrl+drag to paint over an object",
+    const wchar_t *labels[]{L"Pointer (V): select and edit objects", L"Number (N)", L"Arrow (A); Ctrl+drag between objects to link", L"Straight line (L); Ctrl+drag between objects to link", L"Rectangle (R)", L"Circle (O)", L"Ellipse (E)", L"Triangle (G): drag to draw; drag each vertex to reshape", L"Trapezoid (B): drag to draw", L"Arc (U): drag to draw a half ellipse; use handles to resize or rotate", L"Freehand line (F); Shift for 45-degree steps; move >50 px off line to turn; Ctrl to draw over objects", L"Highlight (H); Ctrl+drag to paint over an object",
         L"Text (T); double-click or F2 to edit", L"Color — selected object and new objects", L"Undo (Ctrl+Z)", L"Redo (Ctrl+Y / Ctrl+Shift+Z)", L"Copy (Ctrl+C)"};
     static_assert(std::size(labels)==std::size(ToolIds));
     auto saveButton=CreateWindowW(L"BUTTON",L"Save...",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_PUSHBUTTON,
@@ -1061,6 +1085,14 @@ void edit(HWND w, Capture &c)
     SetWindowSubclass(labelButton,toolHover,1,0);
     fontTip.uId=(UINT_PTR)labelButton; fontTip.lpszText=const_cast<wchar_t *>(L"Arrow label (F2 / double-click); drag label to reposition");
     SendMessageW(tips,TTM_ADDTOOLW,0,(LPARAM)&fontTip);
+    INITCOMMONCONTROLSEX sliders{sizeof(sliders),ICC_BAR_CLASSES}; InitCommonControlsEx(&sliders);
+    CreateWindowW(TRACKBAR_CLASSW,L"Pencil smoothing",WS_CHILD|WS_VISIBLE|WS_TABSTOP|TBS_NOTICKS,
+                  0,0,0,0,w,(HMENU)41,c.app.instance,nullptr);
+    SendDlgItemMessageW(w,41,TBM_SETRANGE,TRUE,MAKELPARAM(0,100));
+    SendDlgItemMessageW(w,41,TBM_SETPAGESIZE,0,10);
+    for(int id:{42,43}) CreateWindowW(L"STATIC",L"",WS_CHILD|WS_VISIBLE,0,0,0,0,w,(HMENU)(INT_PTR)id,c.app.instance,nullptr);
+    CreateWindowW(L"BUTTON",L"Apply to all strokes",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_PUSHBUTTON,
+                  0,0,0,0,w,(HMENU)44,c.app.instance,nullptr);
     c.syncHistory();
     auto work = monitor.rcWork;
     SetWindowPos(w,HWND_NOTOPMOST,work.left+20,work.top+20,
@@ -1120,7 +1152,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             }
             break;
         case WM_DRAWITEM:
-            if((wp>=10 && wp<=13) || (wp>=18 && wp<=27) || wp==34 || wp==35 || wp==36 || wp==37) { drawTool(*reinterpret_cast<DRAWITEMSTRUCT *>(lp),*c); return TRUE; }
+            if((wp>=10 && wp<=13) || (wp>=18 && wp<=27) || wp==34 || wp==35 || wp==36 || wp==37 || wp==38) { drawTool(*reinterpret_cast<DRAWITEMSTRUCT *>(lp),*c); return TRUE; }
             break;
         case WM_CTLCOLORSTATIC:
             SetBkColor((HDC)wp,RGB(255,255,255)); SetTextColor((HDC)wp,RGB(51,65,85));
@@ -1129,6 +1161,21 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
         case WM_SETCURSOR:
             if ((HWND)wp==w && LOWORD(lp)==HTCLIENT) { captureCursor(w,*c); return TRUE; }
             break;
+        case WM_HSCROLL:
+            if((HWND)lp==GetDlgItem(w,41) && !c->dragging) {
+                int amount=int(SendDlgItemMessageW(w,41,TBM_GETPOS,0,0));
+                bool pencil=c->selected>=0 && c->marks[c->selected].freehand;
+                if(pencil && c->marks[c->selected].smoothing!=amount) {
+                    if(!c->smoothingDrag) c->remember(c->marks);
+                    setScreenshotSmoothing(c->marks[c->selected],amount);
+                    resolveScreenshotLinks(c->marks);
+                    c->smoothingDrag=LOWORD(wp)==TB_THUMBTRACK;
+                } else if(!pencil) c->smoothing=amount;
+                if(LOWORD(wp)!=TB_THUMBTRACK) c->smoothingDrag=false;
+                syncLineOptions(w,*c); InvalidateRect(w,nullptr,FALSE);
+                return 0;
+            }
+            break;
         case WM_COMMAND:
             if(LOWORD(wp)==40) {
                 if(c->inlineText && HIWORD(wp)==EN_CHANGE) { readInlineText(*c); positionInlineText(*c); }
@@ -1136,6 +1183,17 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 return 0;
             }
             if (c->dragging) return 0;
+            if(LOWORD(wp)==44) {
+                int amount=int(SendDlgItemMessageW(w,41,TBM_GETPOS,0,0));
+                c->smoothing=amount;
+                if(std::any_of(c->marks.begin(),c->marks.end(),[&](const Mark &m){return m.freehand && m.smoothing!=amount;})) {
+                    c->remember(c->marks);
+                    for(auto &mark:c->marks) if(mark.freehand) setScreenshotSmoothing(mark,amount);
+                    resolveScreenshotLinks(c->marks);
+                }
+                c->smoothingDrag=false; syncLineOptions(w,*c); InvalidateRect(w,nullptr,FALSE);
+                return 0;
+            }
             if(LOWORD(wp)==35) {
                 finishInlineText(w,*c,true);
                 if(c->selected>=0 && c->marks[c->selected].isLine()) beginMarkText(w,*c,c->selected);
@@ -1214,13 +1272,13 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 if(changed) { c->copied=false; c->selected=-1; c->selectedLabel=false; c->wheelDelta=0; c->wheelTarget=-1; }
                 c->syncHistory();
             }
-            if (LOWORD(wp)==10 || LOWORD(wp)==11 || LOWORD(wp)==19 || LOWORD(wp)==36 || LOWORD(wp)==37 || (LOWORD(wp)>=21 && LOWORD(wp)<=27))
+            if (LOWORD(wp)==10 || LOWORD(wp)==11 || LOWORD(wp)==19 || LOWORD(wp)==36 || LOWORD(wp)==37 || LOWORD(wp)==38 || (LOWORD(wp)>=21 && LOWORD(wp)<=27))
             {
                 c->pointer=LOWORD(wp)==27;
-                c->arrow = LOWORD(wp)==11 || LOWORD(wp)==36 || LOWORD(wp)==37 || (LOWORD(wp)>=22 && LOWORD(wp)<=25);
+                c->arrow = LOWORD(wp)==11 || LOWORD(wp)==36 || LOWORD(wp)==37 || LOWORD(wp)==38 || (LOWORD(wp)>=22 && LOWORD(wp)<=25);
                 c->straight=LOWORD(wp)==22;
                 c->textTool=LOWORD(wp)==26;
-                c->shape=LOWORD(wp)==37?ScreenshotShape::Trapezoid:LOWORD(wp)==36?ScreenshotShape::Triangle:LOWORD(wp)>=23 && LOWORD(wp)<=25?ScreenshotShape(LOWORD(wp)-22):ScreenshotShape::None;
+                c->shape=LOWORD(wp)==38?ScreenshotShape::Arc:LOWORD(wp)==37?ScreenshotShape::Trapezoid:LOWORD(wp)==36?ScreenshotShape::Triangle:LOWORD(wp)>=23 && LOWORD(wp)<=25?ScreenshotShape(LOWORD(wp)-22):ScreenshotShape::None;
                 c->selected=-1; c->selectedLabel=false;
                 c->highlight=LOWORD(wp)==19;
                 c->freehand=LOWORD(wp)==21;
@@ -1233,6 +1291,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 for(int id=22;id<=27;++id) InvalidateRect(GetDlgItem(w,id),nullptr,FALSE);
                 InvalidateRect(GetDlgItem(w,36),nullptr,FALSE);
                 InvalidateRect(GetDlgItem(w,37),nullptr,FALSE);
+                InvalidateRect(GetDlgItem(w,38),nullptr,FALSE);
             }
 
             SetFocus(w); captureCursor(w,*c); InvalidateRect(w,nullptr,FALSE); return 0;
@@ -1293,6 +1352,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                     if(wp=='E') SendMessageW(w,WM_COMMAND,25,0);
                     if(wp=='G') SendMessageW(w,WM_COMMAND,36,0);
                     if(wp=='B') SendMessageW(w,WM_COMMAND,37,0);
+                    if(wp=='U') SendMessageW(w,WM_COMMAND,38,0);
                 }
                 if (wp=='N' || wp=='A') SendMessageW(w,WM_COMMAND,wp=='N'?10:11,0);
                 if(wp=='H') SendMessageW(w,WM_COMMAND,19,0);
@@ -1530,6 +1590,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                         c->remember(c->marks); c->marks.push_back(std::move(c->stroke));
                         if(c->freehand) {
                             auto &mark=c->marks.back();
+                            mark.rawPoints=mark.points;
                             linkScreenshotEndpoint(mark,true,c->start,c->marks,6);
                             linkScreenshotEndpoint(mark,false,c->end,c->marks,6);
                             resolveScreenshotLinks(c->marks);
@@ -1540,10 +1601,18 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                             ScreenshotShape recognized{};
                             bool straightLine=false;
                             auto improved=improveScreenshotStroke(c->marks.back().points,&recognized,&straightLine);
+                            if(recognized==ScreenshotShape::None && !straightLine) {
+                                improved=smoothScreenshotStroke(c->marks.back().rawPoints,c->smoothing);
+                                const auto &raw=c->marks.back().rawPoints;
+                                if(improved.size()==raw.size() && std::equal(improved.begin(),improved.end(),raw.begin(),
+                                   [](POINT a,POINT b){return a.x==b.x && a.y==b.y;})) improved.clear();
+                            }
                             if(!improved.empty()) {
                                 c->remember(c->marks);
                                 auto &mark=c->marks.back();
-                                mark.points=std::move(improved);
+                                if(recognized==ScreenshotShape::None && !straightLine) {
+                                    setScreenshotSmoothing(mark,c->smoothing);
+                                } else { mark.points=std::move(improved); mark.rawPoints.clear(); }
                                 mark.from=mark.points.front(); mark.to=mark.points.back();
                                 if(straightLine) { mark.points.clear(); mark.freehand=false; }
                                 if(recognized!=ScreenshotShape::None) {
@@ -1563,7 +1632,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                         c->marks.back().style=c->lineStyle; c->marks.back().ends=c->straight || c->shape!=ScreenshotShape::None?LineEnds::None:c->arrowEnds;
                         c->marks.back().shape=c->shape;
                         auto &mark=c->marks.back();
-                        if(mark.shape==ScreenshotShape::Triangle || mark.shape==ScreenshotShape::Trapezoid) mark.points=shapeOutline(mark);
+                        if(mark.shape==ScreenshotShape::Triangle || mark.shape==ScreenshotShape::Trapezoid || mark.shape==ScreenshotShape::Arc) mark.points=shapeOutline(mark);
                         linkScreenshotEndpoint(mark,true,c->start,c->marks,6);
                         linkScreenshotEndpoint(mark,false,c->end,c->marks,6);
                         resolveScreenshotLinks(c->marks);
@@ -1586,7 +1655,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             if (c->editing)
             {
                 auto limits = reinterpret_cast<MINMAXINFO *>(lp);
-                limits->ptMinTrackSize = {MulDiv(730,GetDpiForWindow(w),96),MulDiv(240,GetDpiForWindow(w),96)};
+                limits->ptMinTrackSize = {MulDiv(766,GetDpiForWindow(w),96),MulDiv(240,GetDpiForWindow(w),96)};
                 return 0;
             }
             break;
@@ -1901,7 +1970,14 @@ void resolveScreenshotLinks(std::vector<ScreenshotMark> &marks)
             POINT start=from?from->from:m.from, end=to?to->from:m.to;
             if(from) m.from=rim(*from,end,true);
             if(to) m.to=rim(*to,start,false);
-            if(m.freehand && !m.points.empty()) { m.points.front()=m.from; m.points.back()=m.to; }
+            if(m.freehand && !m.points.empty()) {
+                m.points.front()=m.from; m.points.back()=m.to;
+                if(!m.rawPoints.empty() && (m.rawPoints.front().x!=m.from.x || m.rawPoints.front().y!=m.from.y ||
+                   m.rawPoints.back().x!=m.to.x || m.rawPoints.back().y!=m.to.y)) {
+                    m.rawPoints.front()=m.from; m.rawPoints.back()=m.to;
+                    setScreenshotSmoothing(m,m.smoothing);
+                }
+            }
         }
         state[index]=2;
     };
@@ -2055,10 +2131,15 @@ ScreenshotMark dragScreenshotMark(const ScreenshotMark &original, MarkPart part,
             return low<=high?std::clamp(delta,low,high):0L;
         };
         auto bounds=markBounds(m);
+        for(auto p:m.rawPoints) {
+            bounds.left=std::min(bounds.left,p.x); bounds.right=std::max(bounds.right,p.x);
+            bounds.top=std::min(bounds.top,p.y); bounds.bottom=std::max(bounds.bottom,p.y);
+        }
         LONG dx=shift(position.x-origin.x,bounds.left,bounds.right,width);
         LONG dy=shift(position.y-origin.y,bounds.top,bounds.bottom,height);
         m.from.x+=dx; m.to.x+=dx; m.from.y+=dy; m.to.y+=dy;
         for(auto &point:m.points) { point.x+=dx; point.y+=dy; }
+        for(auto &point:m.rawPoints) { point.x+=dx; point.y+=dy; }
     }
     else if(part==MarkPart::Start || part==MarkPart::End)
     {
@@ -2083,6 +2164,10 @@ ScreenshotMark dragScreenshotMark(const ScreenshotMark &original, MarkPart part,
             }
         }
         if(m.freehand && !m.points.empty()) (part==MarkPart::Start?m.points.front():m.points.back())=endpoint;
+        if(m.freehand && !m.rawPoints.empty()) {
+            (part==MarkPart::Start?m.rawPoints.front():m.rawPoints.back())=endpoint;
+            setScreenshotSmoothing(m,m.smoothing);
+        }
         if(m.shape!=ScreenshotShape::None && m.rotation!=0) {
             auto fixedBefore=rotateShapePoint(original,part==MarkPart::Start?original.to:original.from);
             auto fixedAfter=rotateShapePoint(m,part==MarkPart::Start?m.to:m.from);

src/screenshot.h

@@ -15,7 +15,7 @@ void showScreenshot(ScreenshotHost &);
 void showScreenshotEditor(ScreenshotHost &,const Clip &);
 enum class LineStyle { Solid, Dotted, Dashed, DashDot };
 enum class LineEnds { End, Start, Both, None };
-enum class ScreenshotShape { None, Rectangle, Circle, Ellipse, Triangle, Trapezoid };
+enum class ScreenshotShape { None, Rectangle, Circle, Ellipse, Triangle, Trapezoid, Arc };
 struct ScreenshotOffset { double x, y; };
 struct ScreenshotLink {
     unsigned long long target{};
@@ -39,6 +39,8 @@ struct ScreenshotMark {
     bool labelRotationManual=false;
     unsigned long long id{};
     ScreenshotLink fromLink, toLink;
+    std::vector<POINT> rawPoints; // Original pencil path for reversible smoothing.
+    int smoothing=0; // 0..100; applies only to freehand strokes.
     bool isText() const { return !text.empty(); }
     bool isHighlight() const { return !points.empty() && !freehand && shape==ScreenshotShape::None; }
     bool isLine() const { return !number && !isText() && !isHighlight() && shape==ScreenshotShape::None; }

src/stroke_improvement.h

@@ -38,6 +38,42 @@ inline double cross(Point a, Point b, Point c) { return (b.x-a.x)*(c.y-a.y)-(b.y
 }
 
 namespace ks {
+// Filter by distance along the path, not mouse-event count. Always start from
+// the original path so lowering the amount restores detail without drift.
+inline std::vector<POINT> smoothScreenshotStroke(const std::vector<POINT> &input, int amount) {
+    amount=std::clamp(amount,0,100);
+    if(!amount || input.size()<5) return input;
+    using namespace stroke_detail;
+    std::vector<Point> raw;
+    for(auto p:input) if(raw.empty() || distance(raw.back(),{double(p.x),double(p.y)})>0)
+        raw.push_back({double(p.x),double(p.y)});
+    double total=length(raw);
+    if(raw.size()<5 || total<16) return input;
+    auto points=sample(raw,size_t(std::clamp(std::ceil(total/2)+1,3.0,4096.0)));
+    double step=total/(points.size()-1),radius=0.5+32*std::pow(amount/100.0,2);
+    int reach=std::max(1,int(std::ceil(radius/step)));
+    std::vector<POINT> result;
+    for(size_t i=0;i<points.size();++i) {
+        Point sum{}; double weights=0;
+        for(int j=std::max(0,int(i)-reach);j<=std::min(int(points.size())-1,int(i)+reach);++j) {
+            double d=(j-double(i))*step,weight=std::exp(-2*d*d/(radius*radius));
+            sum.x+=points[j].x*weight; sum.y+=points[j].y*weight; weights+=weight;
+        }
+        double blend=std::min(1.0,std::min(i,points.size()-1-i)*step/radius);
+        POINT p{LONG(std::lround(points[i].x+blend*(sum.x/weights-points[i].x))),
+                LONG(std::lround(points[i].y+blend*(sum.y/weights-points[i].y)))};
+        if(result.empty() || p.x!=result.back().x || p.y!=result.back().y) result.push_back(p);
+    }
+    result.front()=input.front(); result.back()=input.back();
+    return result;
+}
+inline void setScreenshotSmoothing(ScreenshotMark &mark,int amount) {
+    if(!mark.freehand || mark.shape!=ScreenshotShape::None || mark.points.empty()) return;
+    if(mark.rawPoints.empty()) mark.rawPoints=mark.points;
+    mark.smoothing=std::clamp(amount,0,100);
+    mark.points=smoothScreenshotStroke(mark.rawPoints,mark.smoothing);
+    mark.from=mark.points.front(); mark.to=mark.points.back();
+}
 // Returns a replacement path; an empty result means no visible improvement.
 // Report recognized geometry separately from a smoothed freehand path.
 inline std::vector<POINT> improveScreenshotStroke(const std::vector<POINT> &input, ScreenshotShape *shape=nullptr,

src/sync.cpp

@@ -219,8 +219,7 @@ Bytes sharedSyncSettings(const Settings &s)
         return a.at("layoutId").get<std::string>() < b.at("layoutId").get<std::string>();
     });
     for (auto key : {"startWithSystem", "autostartAsAdministrator", "tesseractPath", "useTesseract",
-        "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock",
-        "chatCycles"}) j.erase(key); // Chat names and matching rules stay on this PC.
+        "historyEnabled", "maxItems", "maxTotalMegabytes", "maxImageMegabytes", "writeLog", "preventScreenLock"}) j.erase(key);
     return bytes(canonicalProfile(j));
 }
 Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const std::vector<Layout> &layouts, bool keepLocalLayouts)
@@ -230,6 +229,9 @@ Settings restoreSyncSettings(const Bytes &shared, const Settings &local, const s
     if (!j.contains("autoCorrectReplace")) j["autoCorrectReplace"] = false;
     if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false;
     if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object();
+    // Profiles uploaded before v0.6.53 do not participate in chat synchronization.
+    // An explicit empty object from a newer client does mean remove all profiles.
+    if (!j.contains("chatCycles")) j["chatCycles"] = original.at("chatCycles");
     auto allowed = parse(sharedSyncSettings(local));
     if (!j.is_object() || j.value("format", "") != "kswitcher-settings" || j.value("schemaVersion", 0) != 1)
         throw std::runtime_error("Unsupported synchronized settings format.");
@@ -295,7 +297,9 @@ SyncResult synchronize(SyncProvider &provider, const Bytes &base, const Bytes &l
     if (action == SyncAction::Automatic) merged = mergeSyncProfile(mergeBase, mergeLocal, remote.settings, choices);
     else
     {
-        auto selected = bytes(normalizeProfile(parse(action == SyncAction::Download ? remote.settings : mergeLocal)));
+        auto profile = parse(action == SyncAction::Download ? remote.settings : mergeLocal);
+        if (!profile.contains("chatCycles")) profile["chatCycles"] = parse(local).value("chatCycles", Json::object());
+        auto selected = bytes(normalizeProfile(profile));
         merged = {selected, selected, selected, {}};
     }
     if (validate) { validate(merged.local); validate(merged.remote); }

src/sync_merge.inl

@@ -8,6 +8,7 @@ Json normalizeProfile(Json j)
     if (!j.contains("autoCorrectTypos")) j["autoCorrectTypos"] = false;
     if (!j.contains("autoCorrectReplacements")) j["autoCorrectReplacements"] = Json::object();
     if (!j.contains("snippetTombstones")) j["snippetTombstones"] = Json::array();
+    if (!j.contains("chatCycles")) j["chatCycles"] = Json::object();
     for (auto &sn : j.at("snippets"))
         if (!sn.contains("id")) sn["id"] = utf8(snippetId({wide(sn.at("trigger").get<std::string>()), L""}));
     return j;
@@ -53,6 +54,10 @@ Json flatProfile(Json j)
     for (auto it = replacements.begin(); it != replacements.end();)
         if (it.value().is_null()) it = replacements.erase(it);
         else ++it;
+    auto &chats = j["chatCycles"];
+    for (auto it = chats.begin(); it != chats.end();)
+        if (it.value().is_null()) it = chats.erase(it);
+        else ++it;
     Json snippets = Json::array(), deleted = Json::array();
     for (const auto &[id, item] : j.at("snippets").items())
     {
@@ -94,6 +99,7 @@ std::wstring fieldLabel(const std::string &key)
         {"translitHotkey", L"Transliteration shortcut"}, {"undoHotkey", L"Undo shortcut"},
         {"clipboardHotkey", L"Clipboard shortcut"}, {"screenshotHotkey", L"Screenshot shortcut"},
         {"layouts", L"Layout cycle order"}, {"layoutHotkeys", L"Layout shortcuts"},
+        {"chatCycles", L"Chat languages"},
         {"convertLastWord", L"Convert recent word"}, {"switchSystemLayout", L"Switch system layout"},
         {"autoCorrectMinLength", L"Minimum word length"}, {"autoCorrectMaxRank", L"Maximum word rank"},
         {"autoCorrectLayout", L"Automatic layout correction"}, {"autoCorrectLanguages", L"Dictionary languages"},
@@ -141,6 +147,11 @@ MergeNode mergeNode(const Json &b, const Json &l, const Json &r, const std::stri
                 auto item = get(l); if (item.is_null() || tombstone(item)) item = get(r);
                 childLabel = L"Snippet: " + wide(item.is_object() ? item.value("trigger", key) : key);
             }
+            if (path == "/chatCycles") {
+                auto name = key;
+                if (auto separator = name.find('\n'); separator != name.npos) name.replace(separator, 1, " / ");
+                childLabel = L"Chat languages: " + wide(name);
+            }
             auto child = mergeNode(get(b), get(l), get(r), path + "/" + pointerKey(key), childLabel, choices, conflicts, forced);
             // Keep nulls in the ancestor so deletion conflicts survive restarts.
             out.local[key] = child.local; out.remote[key] = child.remote; out.base[key] = child.base;
@@ -181,7 +192,12 @@ void collisionPaths(const Json &j, std::set<std::string> &paths)
 }
 SyncMerge mergeSyncProfile(const Bytes &base, const Bytes &local, const Bytes &remote, const std::vector<SyncChoice> &choices)
 {
-    auto l = treeProfile(parse(local)), r = treeProfile(parse(remote));
+    auto localProfile = parse(local), remoteProfile = parse(remote);
+    // Absence in an older client is not a deletion. Preserve the participating
+    // client's chat profiles until both copies understand this field.
+    if (!remoteProfile.contains("chatCycles")) remoteProfile["chatCycles"] = localProfile.value("chatCycles", Json::object());
+    if (!localProfile.contains("chatCycles")) localProfile["chatCycles"] = remoteProfile.at("chatCycles");
+    auto l = treeProfile(localProfile), r = treeProfile(remoteProfile);
     // With no common history, union independent entries; differing scalar values
     // remain on their respective devices until the user resolves the conflict.
     auto b = base.empty() ? Json::object() : treeProfile(parse(base));

src/ui.cpp

@@ -968,7 +968,9 @@ struct SettingsView
     int selection = -1;
     bool filling{};
     std::vector<std::vector<HWND>> pages;
+    bool ready{}, refreshing{};
 };
+void updateSettingsState(HWND w, SettingsView *v);
 void selectSettingsPage(HWND w, SettingsView *v)
 {
     int selected = TabCtrl_GetCurSel(GetDlgItem(w, 260));
@@ -1169,6 +1171,7 @@ void fillSettings(HWND w, SettingsView *v)
     v->selection = 0;
     fillLayouts(w, v);
     v->filling = false;
+    updateSettingsState(w, v);
 }
 int integer(HWND w, int id)
 {
@@ -1298,7 +1301,10 @@ LRESULT CALLBACK autoOptionsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 auto words = parseCommaList(text);
                 std::sort(words.begin(), words.end());
                 words.erase(std::unique(words.begin(), words.end()), words.end());
-                draft.autoWords[language] = std::move(words);
+                // Opening and accepting an untouched empty dictionary must not
+                // introduce a new entry and mark Settings as changed.
+                if (!words.empty() || draft.autoWords.contains(language))
+                    draft.autoWords[language] = std::move(words);
             }
             draft.autoExcluded = parseCommaList(value(w, 404));
             draft.autoPrefixChars = value(w, 408);
@@ -1535,6 +1541,27 @@ bool settingsChanged(HWND w, SettingsView *v)
         return true;
     }
 }
+void updateSettingsState(HWND w, SettingsView *v)
+{
+    if (!v || !v->ready || v->filling || v->refreshing) return;
+    v->refreshing = true;
+    bool changed = settingsChanged(w, v);
+    EnableWindow(GetDlgItem(w, IDOK), changed);
+    const wchar_t *text = changed ? L"Unsaved changes — click Save to apply." : L"No unsaved changes.";
+    if (value(w, 261) != text) value(w, 261, text);
+    v->refreshing = false;
+}
+// Refresh after commands have updated controls/drafts, including early returns.
+// Saving can destroy Settings, so retrieve its state only if it still exists.
+struct SettingsStateRefresh
+{
+    HWND window;
+    ~SettingsStateRefresh()
+    {
+        if (IsWindow(window))
+            updateSettingsState(window, reinterpret_cast<SettingsView *>(GetWindowLongPtrW(window, GWLP_USERDATA)));
+    }
+};
 void closeSettings(HWND w, SettingsView *v)
 {
     if (settingsChanged(w, v))
@@ -1583,6 +1610,12 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
     {
         switch (msg)
         {
+        case WM_ENABLE:
+            if (wp) updateSettingsState(w, v);
+            break;
+        case WM_ACTIVATE:
+            if (LOWORD(wp) != WA_INACTIVE) updateSettingsState(w, v);
+            break;
         case WM_NOTIFY:
             if (((NMHDR *)lp)->idFrom == 260 && ((NMHDR *)lp)->code == TCN_SELCHANGE)
             {
@@ -1592,6 +1625,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             break;
         case WM_COMMAND:
         {
+            SettingsStateRefresh refresh{w};
             int id = LOWORD(wp);
             if (id == 220 && HIWORD(wp) == LBN_SELCHANGE && !v->filling)
             {
@@ -1627,6 +1661,7 @@ LRESULT CALLBACK settingsProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
             }
             if (id == IDOK)
             {
+                if (!settingsChanged(w, v)) return 0;
                 if (v->app->busy)
                     throw std::runtime_error("Wait for the current text operation to finish");
                 v->app->applySettings(collectSettings(w, v));
@@ -1846,6 +1881,7 @@ LRESULT CALLBACK snippetProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
                 {
                     auto *parent = (SettingsView *)GetWindowLongPtrW(v->app->settingsWindow, GWLP_USERDATA);
                     parent->draft.snippets = s.snippets;
+                    updateSettingsState(v->app->settingsWindow, parent);
                 }
                 DestroyWindow(w);
                 return 0;
@@ -2069,11 +2105,14 @@ void showSettings(App &app, bool visible)
     checkbox(w, L"Write lo&g", 208, 24, 378, 210);
     page();
 
+    control(w, L"STATIC", L"No unsaved changes.", 0, 261, 18, 430, 684, 24);
     button(w, L"Impo&rt...", 250, 18, 466, 125);
     button(w, L"&Export...", 251, 155, 466, 125);
     button(w, L"&Save", IDOK, 490, 466, 100);
     button(w, L"&Cancel", IDCANCEL, 602, 466, 100);
     fillSettings(w, v);
+    v->ready = true;
+    updateSettingsState(w, v);
     TabCtrl_SetCurSel(tabs, 0);
     selectSettingsPage(w, v);
     if (visible)

src/update.h

@@ -2,7 +2,7 @@
 #include "platform.h"
 namespace ks
 {
-inline constexpr wchar_t AppVersion[] = L"0.6.51";
+inline constexpr wchar_t AppVersion[] = L"0.6.54";
 inline constexpr UINT UpdateMessage = WM_APP + 7;
 inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
 inline constexpr UINT UpdateNotificationRetryMs = 5 * 60 * 1000;

tests/chat_profiles.cpp

@@ -73,9 +73,9 @@ void contextChecks()
     require(ks::decodeSettings({}, installed).chatCycles.empty(), "old defaults without profiles");
     auto withoutProfiles = settings;
     withoutProfiles.chatCycles.clear();
-    require(ks::sharedSyncSettings(settings) == ks::sharedSyncSettings(withoutProfiles), "profiles excluded from sync");
-    auto restored = ks::restoreSyncSettings(ks::sharedSyncSettings(settings), settings, installed, false);
-    require(restored.chatCycles == settings.chatCycles, "sync preserves local profiles");
+    require(ks::sharedSyncSettings(settings) != ks::sharedSyncSettings(withoutProfiles), "profiles included in sync");
+    auto restored = ks::restoreSyncSettings(ks::sharedSyncSettings(settings), withoutProfiles, installed, false);
+    require(restored.chatCycles == settings.chatCycles, "sync transfers chat profiles to another PC");
     settings.chatCycles[key] = {settings.cycle[1]};
     require(ks::chatCycle(settings, key, installed).size() == 1, "one-language profile");
     settings.chatCycles[key] = {L"win:04070407"};
@@ -121,6 +121,52 @@ int main()
             app.settings.chatCycles[key] = {app.layouts[0].id};
             ks::showSettings(app);
             HWND parent = app.settingsWindow;
+            auto saveEnabled=[&] { return IsWindowEnabled(GetDlgItem(parent,IDOK))!=FALSE; };
+            auto status=[&] { wchar_t text[256]{}; GetDlgItemTextW(parent,261,text,256); return std::wstring(text); };
+            require(!saveEnabled() && status()==L"No unsaved changes.","new Settings shows clean state with Save disabled");
+            SendMessageW(parent,WM_COMMAND,IDOK,0);
+            require(IsWindow(parent),"Save command with no changes does not apply or close Settings");
+            bool originalLog=IsDlgButtonChecked(parent,208)==BST_CHECKED;
+            CheckDlgButton(parent,208,originalLog?BST_UNCHECKED:BST_CHECKED);
+            SendMessageW(parent,WM_COMMAND,MAKEWPARAM(208,BN_CLICKED),0);
+            require(saveEnabled() && status().find(L"Unsaved changes") == 0,"checkbox edit immediately marks Settings dirty");
+            CheckDlgButton(parent,208,originalLog?BST_CHECKED:BST_UNCHECKED);
+            SendMessageW(parent,WM_COMMAND,MAKEWPARAM(208,BN_CLICKED),0);
+            require(!saveEnabled(),"reverting checkbox disables Save again");
+            wchar_t originalLimit[32]{}; GetDlgItemTextW(parent,240,originalLimit,32);
+            SetDlgItemTextW(parent,240,L"invalid");
+            require(saveEnabled(),"invalid text remains an unsaved edit");
+            SetDlgItemTextW(parent,240,originalLimit);
+            require(!saveEnabled(),"restoring valid original text clears dirty state");
+            SendMessageW(parent,WM_COMMAND,257,0);
+            HWND ocr=FindWindowW(L"KSwitcher.OcrOptions",nullptr);
+            require(ocr!=nullptr,"OCR preferences open");
+            wchar_t languages[128]{}; GetDlgItemTextW(ocr,503,languages,128);
+            SetDlgItemTextW(ocr,503,L"eng");
+            SendMessageW(ocr,WM_COMMAND,IDCANCEL,0);
+            require(!saveEnabled(),"cancelled child changes leave Settings clean");
+            SendMessageW(parent,WM_COMMAND,257,0);
+            ocr=FindWindowW(L"KSwitcher.OcrOptions",nullptr);
+            SetDlgItemTextW(ocr,503,std::wstring(languages)==L"eng"?L"ukr":L"eng");
+            SendMessageW(ocr,WM_COMMAND,IDOK,0);
+            require(!IsWindow(ocr) && saveEnabled(),"accepted OCR edits enable parent Save");
+            SendMessageW(parent,WM_COMMAND,257,0);
+            ocr=FindWindowW(L"KSwitcher.OcrOptions",nullptr);
+            SetDlgItemTextW(ocr,503,languages);
+            SendMessageW(ocr,WM_COMMAND,IDOK,0);
+            require(!saveEnabled(),"reverting OCR draft in child clears parent dirty state");
+            SendMessageW(parent,WM_COMMAND,255,0);
+            HWND automatic=FindWindowW(L"KSwitcher.AutoOptions",nullptr);
+            require(automatic!=nullptr,"automatic correction preferences open");
+            bool replace=IsDlgButtonChecked(automatic,414)==BST_CHECKED;
+            CheckDlgButton(automatic,414,replace?BST_UNCHECKED:BST_CHECKED);
+            SendMessageW(automatic,WM_COMMAND,IDOK,0);
+            require(!IsWindow(automatic) && saveEnabled(),"accepted auto-correction edits enable Save");
+            SendMessageW(parent,WM_COMMAND,255,0);
+            automatic=FindWindowW(L"KSwitcher.AutoOptions",nullptr);
+            CheckDlgButton(automatic,414,replace?BST_CHECKED:BST_UNCHECKED);
+            SendMessageW(automatic,WM_COMMAND,IDOK,0);
+            require(!saveEnabled(),"reverting auto-correction draft disables Save");
             HWND tabs = GetDlgItem(parent, 260);
             require(tabs && TabCtrl_GetItemCount(tabs) == 5, "five settings categories");
             for (int page = 0; page < 5; ++page)
@@ -151,6 +197,7 @@ int main()
             TabCtrl_SetCurSel(tabs, 1);
             NMHDR notification{tabs, 260, TCN_SELCHANGE};
             SendMessageW(parent, WM_NOTIFY, 260, (LPARAM)&notification);
+            require(!saveEnabled(),"changing tabs leaves Settings clean");
             SendMessageW(parent, WM_COMMAND, 259, 0);
             HWND dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
             require(dialog && !IsWindowEnabled(parent), "chat dialog opens with disabled parent");
@@ -169,6 +216,7 @@ int main()
             SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
             SendMessageW(dialog, WM_COMMAND, IDCANCEL, 0);
             require(!IsWindow(dialog) && IsWindowEnabled(parent), "cancel closes dialog");
+            require(!saveEnabled(),"cancelled chat edits do not enable Save");
             SendMessageW(parent, WM_COMMAND, 259, 0);
             dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
             index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
@@ -178,20 +226,30 @@ int main()
             SendDlgItemMessageW(dialog, 711, LB_SETSEL, TRUE, -1);
             SendMessageW(dialog, WM_COMMAND, IDOK, 0);
             require(!IsWindow(dialog) && IsWindowEnabled(parent), "profile applies to settings draft");
+            require(saveEnabled() == (app.layouts.size()>1),"accepted chat edits refresh Save immediately");
             SendMessageW(parent, WM_COMMAND, IDOK, 0);
             require(!app.settingsWindow && app.settings.chatCycles.at(key).size() == app.layouts.size(), "settings saves selected languages");
             require(ks::loadSettings(root / L"settings.json", app.layouts).chatCycles == app.settings.chatCycles, "profile saved to disk");
             ks::showSettings(app);
             parent = app.settingsWindow;
+            require(!saveEnabled(),"reopened saved Settings is clean");
             SendMessageW(parent, WM_COMMAND, 259, 0);
             dialog = FindWindowW(L"KSwitcher.ChatLanguages", nullptr);
             index = (int)SendDlgItemMessageW(dialog, 710, LB_FINDSTRINGEXACT, -1, (LPARAM)L"Telegram: ! Fixture chat");
             SendDlgItemMessageW(dialog, 710, LB_SETCURSEL, index, 0);
             SendMessageW(dialog, WM_COMMAND, MAKEWPARAM(710, LBN_SELCHANGE), 0);
             SendMessageW(dialog, WM_COMMAND, 713, 0);
+            require(saveEnabled() && status().find(L"Unsaved changes")==0,"removing child profile immediately marks parent dirty");
+            RedrawWindow(parent,nullptr,nullptr,RDW_INVALIDATE|RDW_UPDATENOW|RDW_ALLCHILDREN);
+            GetClientRect(parent,&rect); dc=GetDC(parent);
+            clip=ks::screenshotClip(dc,rect.right,rect.bottom,{}); ReleaseDC(parent,dc);
+            ks::atomicWrite(std::filesystem::path(ks::executable()).parent_path()/L"settings-unsaved.png",
+                            ks::encodePng(ks::decodeImage(clip)));
             SendMessageW(parent, WM_COMMAND, IDOK, 0);
             require(!app.settings.chatCycles.contains(key), "remove profile restores default");
             app.settings.snippets = {{L";scope", L"Example", L"scope-fixture"}};
+            ks::showSettings(app); parent=app.settingsWindow;
+            require(!saveEnabled(),"Settings starts clean before separately saved snippet edit");
             ks::showSnippets(app);
             HWND snippets = app.snippetsWindow;
             SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
@@ -202,6 +260,8 @@ int main()
             SetDlgItemTextW(snippets,315,L"Notepad.exe, MS-Teams.EXE");
             SendMessageW(snippets,WM_COMMAND,IDOK,0);
             require(!app.snippetsWindow && app.settings.snippets[0].apps==std::vector<std::wstring>{L"notepad",L"ms-teams"}, "snippet editor saves selected applications");
+            require(!saveEnabled() && status()==L"No unsaved changes.","separately saved snippet edit leaves Settings clean");
+            SendMessageW(parent,WM_COMMAND,IDCANCEL,0);
             ks::showSnippets(app);snippets=app.snippetsWindow;
             SendDlgItemMessageW(snippets,301,LB_SETCURSEL,0,0);
             SendMessageW(snippets,WM_COMMAND,MAKEWPARAM(301,LBN_SELCHANGE),0);

tests/screenshot_ui.cpp

@@ -83,6 +83,53 @@ int main(int argc, char **argv)
         require(c.pencilCursor!=nullptr,"pencil drawing cursor loads");
         require(c.freehand && !c.pointer && ks::toolCursor(c)==c.pencilCursor,
                 "new screenshot editor starts with the pencil tool");
+        {
+            require(GetDlgItem(window,41) && GetDlgItem(window,44),"smoothing slider and Apply to all exist");
+            auto adjust=[&](int value,int code=TB_THUMBPOSITION) {
+                SendDlgItemMessageW(window,41,TBM_SETPOS,TRUE,value);
+                SendMessageW(window,WM_HSCROLL,MAKEWPARAM(code,0),(LPARAM)GetDlgItem(window,41));
+            };
+            adjust(70); require(c.smoothing==70 && c.marks.empty(),"no selection changes default smoothing");
+            ks::Mark pencil{{40,80},{240,80},0}; pencil.freehand=true;
+            for(int i=0;i<=100;++i) pencil.points.push_back({40+i*2,80+(i%2?5:0)});
+            ks::Mark rectangle{{40,130},{240,210},0}; rectangle.shape=ks::ScreenshotShape::Rectangle;
+            c.marks={pencil,pencil,rectangle}; c.selected=0;
+            auto rawImage=ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,c.marks)).bgra;
+            adjust(40,TB_THUMBTRACK); adjust(90,TB_THUMBTRACK); adjust(90,TB_ENDTRACK);
+            require(c.marks[0].smoothing==90 && c.marks[1].smoothing==0 && c.smoothing==70,
+                    "selected stroke smoothing leaves other objects and default alone");
+            SendMessageW(window,WM_COMMAND,12,0);
+            require(c.marks[0].smoothing==0,"one undo reverses an entire slider drag");
+            SendMessageW(window,WM_COMMAND,18,0);
+            require(c.marks[0].smoothing==90,"redo restores smoothing amount and path");
+            c.selected=0; ks::syncLineOptions(window,c);
+            SendMessageW(window,WM_COMMAND,44,0);
+            require(c.marks[0].smoothing==90 && c.marks[1].smoothing==90 && c.smoothing==90 &&
+                    c.marks[2].shape==ks::ScreenshotShape::Rectangle && c.marks[2].rawPoints.empty(),
+                    "Apply to all updates pencil strokes and default without changing shapes");
+            require(ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,c.marks)).bgra!=rawImage,
+                    "PNG export uses the smoothed geometry");
+            SendMessageW(window,WM_COMMAND,12,0);
+            require(c.marks[0].smoothing==90 && c.marks[1].smoothing==0,"bulk smoothing is one undo step");
+            c.selected=0; adjust(0);
+            require(c.marks[0].points.size()==pencil.points.size() && c.marks[0].points[1].y==85,
+                    "selected zero smoothing restores exact original path");
+            require(ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,c.marks)).bgra==rawImage,
+                    "restoring zero smoothing restores the exact original exported pixels");
+            c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{};
+            adjust(75);
+            auto mouse=[&](UINT message,POINT p) {
+                int x=c.view.left+MulDiv(p.x,c.view.right-c.view.left,c.image->width);
+                int y=c.view.top+MulDiv(p.y,c.view.bottom-c.view.top,c.image->height);
+                SendMessageW(window,message,message==WM_LBUTTONUP?0:MK_LBUTTON,MAKELPARAM(x,y));
+            };
+            mouse(WM_LBUTTONDOWN,{40,90});
+            for(int i=1;i<=100;++i) mouse(WM_MOUSEMOVE,{40+i*2,90+LONG(std::lround(35*std::sin(i*.04)+3*std::sin(i*1.7)))});
+            mouse(WM_LBUTTONUP,{240,64});
+            require(c.marks.size()==1 && c.marks[0].freehand && c.marks[0].smoothing==75 && !c.marks[0].rawPoints.empty(),
+                    "new curved pencil stroke uses toolbar default and retains original samples");
+            c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{}; c.smoothing=25;
+        }
         {
             require(GetDlgItem(window,36)!=nullptr,"triangle has a dedicated toolbar button");
             SendMessageW(window,WM_KEYDOWN,'G',0);
@@ -141,6 +188,38 @@ int main(int argc, char **argv)
             SendMessageW(window,WM_COMMAND,12,0); require(c.marks.empty(),"undo trapezoid creation");
             SendMessageW(window,WM_COMMAND,18,0); require(c.marks[0].shape==ks::ScreenshotShape::Trapezoid,"redo trapezoid creation");
             c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{};
+            require(GetDlgItem(window,38)!=nullptr,"arc has a dedicated toolbar button");
+            SendMessageW(window,WM_KEYDOWN,'U',0);
+            require(c.shape==ks::ScreenshotShape::Arc && c.arrow && !c.freehand,"U selects arc tool");
+            mouse(WM_LBUTTONDOWN,{60,70}); mouse(WM_LBUTTONUP,{240,180});
+            require(c.marks.size()==1 && c.marks[0].shape==ks::ScreenshotShape::Arc && !c.marks[0].isHighlight(),
+                    "arc tool creates an editable shape");
+            auto arc=c.marks[0];
+            require(ks::hitScreenshotMark(arc,{150,70},3)==ks::MarkPart::Body &&
+                    ks::hitScreenshotMark(arc,{150,180},3)==ks::MarkPart::None,
+                    "arc selects its curve but has no closing chord");
+            ks::Surface rendered(320,240); PatBlt(rendered.dc,0,0,320,240,WHITENESS);
+            ks::drawMarks(rendered.dc,{arc});
+            require(GetPixel(rendered.dc,150,70)==arc.color && GetPixel(rendered.dc,150,180)==RGB(255,255,255),
+                    "arc renders an open curve without a closing chord");
+            auto exported=ks::decodeImage(ks::screenshotClip(c.image->dc,320,240,{arc}));
+            auto channel=[&](int x,int y,int component){return exported.bgra[(y*exported.width+x)*4+component];};
+            require(channel(150,70,2)==GetRValue(arc.color) && channel(150,70,1)==GetGValue(arc.color) &&
+                    channel(150,180,0)==255 && channel(150,180,1)==255 && channel(150,180,2)==255,
+                    "PNG export preserves the arc and its open chord");
+            mouse(WM_LBUTTONDOWN,arc.to); mouse(WM_LBUTTONUP,{260,200});
+            require(c.marks[0].to.x==260 && c.marks[0].points.back().y==200,"arc resizes with its bounds");
+            auto arcGrip=ks::screenshotShapeRotationHandle(arc);
+            auto turned=ks::dragScreenshotMark(arc,ks::MarkPart::Rotation,arcGrip,{280,135},320,240);
+            require(turned.rotation!=0 && ks::hitScreenshotMark(turned,ks::rotateShapePoint(turned,{150,70}),3)==ks::MarkPart::Body,
+                    "rotated arc remains selectable");
+            std::vector<ks::Mark> linked{arc}; ks::Mark connector{{10,10},{150,70},0};
+            ks::linkScreenshotEndpoint(connector,false,{150,70},linked,4);
+            require(connector.toLink.target!=0,"connector can attach to the arc curve");
+            SendMessageW(window,WM_COMMAND,12,0); require(c.marks[0].to.x==240,"undo arc resize");
+            SendMessageW(window,WM_COMMAND,12,0); require(c.marks.empty(),"undo arc creation");
+            SendMessageW(window,WM_COMMAND,18,0); require(c.marks[0].shape==ks::ScreenshotShape::Arc,"redo arc creation");
+            c.marks.clear(); c.selected=-1; c.history=ks::ScreenshotHistory{};
             SendMessageW(window,WM_COMMAND,21,0);
         }
         {

tests/stroke_improvement.h

@@ -122,4 +122,31 @@ inline void testStrokeImprovement() {
     double deviation=0; for(auto p:smooth) deviation+=std::abs(p.y-100);
     require(deviation/smooth.size()<1.5 && smooth.front().y==jitter.front().y && smooth.back().y==jitter.back().y,
             "smoothing reduces jitter and preserves endpoints");
+    auto equal=[](const auto &a,const auto &b){return a.size()==b.size() && std::equal(a.begin(),a.end(),b.begin(),
+        [](POINT x,POINT y){return x.x==y.x && x.y==y.y;});};
+    require(equal(ks::smoothScreenshotStroke(jitter,0),jitter),"zero smoothing preserves exact mouse samples");
+    std::vector<POINT> waves;
+    for(int i=0;i<=200;++i) waves.push_back({30+i,100+LONG(std::lround(6*std::sin(i*.5)))});
+    auto roughness=[](const auto &p){double total=0; for(size_t i=1;i<p.size();++i) total+=std::abs(p[i].y-p[i-1].y); return total;};
+    auto low=ks::smoothScreenshotStroke(waves,25),high=ks::smoothScreenshotStroke(waves,100);
+    require(roughness(high)<roughness(low) && roughness(low)<roughness(waves),"higher smoothing removes more jitter");
+    require(high.front().x==waves.front().x && high.front().y==waves.front().y &&
+            high.back().x==waves.back().x && high.back().y==waves.back().y,"smoothing preserves both endpoints");
+    ks::ScreenshotMark mark{waves.front(),waves.back(),0}; mark.freehand=true; mark.points=waves;
+    ks::setScreenshotSmoothing(mark,100); ks::setScreenshotSmoothing(mark,25);
+    require(equal(mark.points,low),"lowering smoothing recomputes from original instead of accumulating filters");
+    ks::setScreenshotSmoothing(mark,0);
+    require(equal(mark.points,waves),"zero restores original after multiple adjustments");
+    ks::setScreenshotSmoothing(mark,100);
+    auto moved=ks::dragScreenshotMark(mark,ks::MarkPart::Body,{0,0},{10,15},500,500);
+    ks::setScreenshotSmoothing(moved,0);
+    require(moved.points[40].x==waves[40].x+10 && moved.points[40].y==waves[40].y+15,
+            "moving preserves the original path in moved coordinates");
+    auto resized=ks::dragScreenshotMark(mark,ks::MarkPart::End,mark.to,{260,130},500,500);
+    ks::setScreenshotSmoothing(resized,0);
+    require(resized.points.back().x==260 && resized.points.back().y==130,"endpoint editing survives smoothing changes");
+    auto duplicate=ks::cloneScreenshotMark(mark,{mark},500,500);
+    ks::setScreenshotSmoothing(duplicate,0);
+    require(duplicate.points[40].x==waves[40].x+16 && duplicate.points[40].y==waves[40].y+16,
+            "cloning retains independent original geometry");
 }

tests/sync.cpp

@@ -70,6 +70,79 @@ int main()
         reordered.directIds = {L"00000422", L"00000409"}; reordered.direct = {L"Ctrl+2", L"Ctrl+1"};
         require(sharedSyncSettings(ordered) == sharedSyncSettings(reordered), "layout enumeration does not cause sync churn");
         auto j = parse(base);
+        {
+            const std::wstring chat=L"telegram\nРобота / ~test";
+            const auto chatKey=utf8(chat);
+            Settings chats=local;
+            chats.chatCycles[chat]={L"win:00000422",L"win:00000409"};
+            chats.chatCycles[L"telegram-web\nРобота / ~test"]={L"win:00000409"};
+            chats.chatCycles[L"ms-teams\nTeam"]={L"win:00000422"};
+            chats.chatCycles[L"viber\nSaved inactive"]={L"win:00000409"};
+            auto shared=sharedSyncSettings(chats);
+            require(restoreSyncSettings(shared,local,{},true).chatCycles==chats.chatCycles,
+                    "sync transfers all chat applications, Unicode names and ordered layout IDs even when not installed");
+            auto legacy=j; legacy.erase("chatCycles");
+            require(restoreSyncSettings(bytes(legacy),chats,{},true).chatCycles==chats.chatCycles,
+                    "legacy profile without chat field preserves existing profiles");
+            require(restoreSyncSettings(base,chats,{},true).chatCycles.empty(),
+                    "explicit empty chat map clears synchronized profiles");
+            auto l=j,r=j;
+            l["chatCycles"][chatKey]=Json::array({"win:00000422","win:00000409"});
+            r["chatCycles"]["ms-teams\nOther"]=Json::array({"win:00000409"});
+            auto first=mergeSyncProfile({},bytes(l),bytes(r));
+            require(first.conflicts.empty() && parse(first.local)["chatCycles"].size()==2 && first.local==first.remote,
+                    "first sync unions profiles for different chats");
+            auto ancestor=first.local;
+            l=r=parse(ancestor);
+            l["chatCycles"][chatKey]=Json::array({"win:00000409","win:00000422"});
+            r["chatCycles"]["ms-teams\nOther"]=Json::array({"win:00000422"});
+            auto independent=mergeSyncProfile(ancestor,bytes(l),bytes(r));
+            require(independent.conflicts.empty() && parse(independent.local)["chatCycles"]==
+                    Json({{chatKey,l["chatCycles"][chatKey]},{"ms-teams\nOther",r["chatCycles"]["ms-teams\nOther"]}}),
+                    "independent chat edits merge without losing language order");
+            r["chatCycles"][chatKey]=Json::array({"win:00000422"});
+            auto conflict=mergeSyncProfile(ancestor,bytes(l),bytes(r));
+            require(conflict.conflicts.size()==1 && conflict.conflicts[0].key.find("~1")!=std::string::npos &&
+                    conflict.conflicts[0].label.find(L"Chat languages: telegram / ")==0,
+                    "same-chat edit conflict has readable name and escaped pointer");
+            auto again=mergeSyncProfile(conflict.base,conflict.local,conflict.remote);
+            require(again.conflicts.size()==1,"chat conflict survives persisted merge ancestor");
+            auto resolved=mergeSyncProfile(again.base,again.local,again.remote,{{again.conflicts[0],false}});
+            require(resolved.conflicts.empty() && parse(resolved.local)["chatCycles"][chatKey]==r["chatCycles"][chatKey],
+                    "choose remote languages for one chat");
+            l=r=parse(ancestor); l["chatCycles"].erase(chatKey);
+            auto removed=mergeSyncProfile(ancestor,bytes(l),bytes(r));
+            require(removed.conflicts.empty() && !restoreSyncSettings(removed.local,local,{},true).chatCycles.contains(chat),
+                    "chat deletion propagates and merged profile remains loadable");
+            r["chatCycles"][chatKey]=Json::array({"win:00000409"});
+            auto deletion=mergeSyncProfile(ancestor,bytes(l),bytes(r));
+            require(deletion.conflicts.size()==1,"chat deletion versus edit requires a choice");
+            auto erase=mergeSyncProfile(deletion.base,deletion.local,deletion.remote,{{deletion.conflicts[0],true}});
+            require(erase.conflicts.empty() && !parse(erase.remote)["chatCycles"].contains(chatKey),
+                    "choosing deletion removes chat without leaving null entries");
+            auto stale=mergeSyncProfile(ancestor,bytes(l),bytes(legacy));
+            require(stale.conflicts.empty() && parse(stale.local)["chatCycles"]==l["chatCycles"],
+                    "older remote missing chat field cannot delete or resurrect local chat profiles");
+            auto validate=[&](const Bytes &value){restoreSyncSettings(value,chats,{},true);};
+            FakeProvider provider; provider.remote={1,bytes(legacy)};
+            auto download=synchronize(provider,{},shared,SyncAction::Download,validate,{},true);
+            require(provider.writes==0 && restoreSyncSettings(download.settings,local,{},true).chatCycles==chats.chatCycles,
+                    "download from older server profile preserves chat settings");
+            provider.remote={1,base};
+            download=synchronize(provider,{},shared,SyncAction::Download,validate,{},true);
+            require(restoreSyncSettings(download.settings,local,{},true).chatCycles.empty(),
+                    "download explicit empty chat map removes local profiles");
+            provider.remote={1,bytes(legacy)};
+            auto upload=synchronize(provider,{},shared,SyncAction::Upload,validate,{},true);
+            require(provider.writes==1 && restoreSyncSettings(provider.remote.settings,local,{},true).chatCycles==chats.chatCycles,
+                    "upload publishes chat profiles while keeping PC layout settings separate");
+            auto invalid=j; invalid["chatCycles"][chatKey]=Json::array();
+            rejects([&]{restoreSyncSettings(bytes(invalid),local,{},true);},"reject empty synchronized chat cycle");
+            invalid["chatCycles"][chatKey]=Json::array({"not-a-layout"});
+            rejects([&]{restoreSyncSettings(bytes(invalid),local,{},true);},"reject invalid synchronized layout ID");
+            invalid["chatCycles"]=Json::object({{"unknown\nChat",Json::array({"win:00000409"})}});
+            rejects([&]{restoreSyncSettings(bytes(invalid),local,{},true);},"reject unknown synchronized chat application");
+        }
         {
             Settings scoped = local;
             scoped.snippets.push_back({L"test", L"Only Teams", L"teams-scope", {L"ms-teams"}});