Release v0.6.6: add pointer tool and isolate text rotation defaults
This commit is contained in:
@@ -90,8 +90,11 @@ broker can load them even when the profile directory is inaccessible to it.
|
||||
Notifications expire after 24 hours. Cache cleanup runs on capture/open; each cache is bounded to
|
||||
40 files and 256 MiB. Expired or evicted notifications cannot reopen their screenshot.
|
||||
In the editor, **Ctrl+C** or **Enter** copies the current result without closing the window.
|
||||
The editor starts with **Pointer (V)**: select objects, move them, and edit geometry, thickness and
|
||||
other properties using handles and controls. Clicking empty space clears selection; dragging empty
|
||||
space adds nothing. Choose a drawing tool to create objects, then return to **V** to edit them.
|
||||
To annotate: **N** places sequential numbered red markers with a click, and **A** draws
|
||||
red arrows by dragging from the tail to the tip. Click an existing marker or arrow to select it;
|
||||
red arrows by dragging from the tail to the tip. With **Pointer (V)**, click an existing marker or arrow to select it;
|
||||
drag its body to move it. Drag the square handle on a number's right edge to change its diameter
|
||||
(the text scales with it), or either endpoint handle of an arrow to change its length and direction.
|
||||
Select an arrow and drag the extra handle beside its midpoint perpendicular to the line to change
|
||||
@@ -102,8 +105,9 @@ and update linked arrows. **Ctrl+D** clones the selected object with a small off
|
||||
gets the smallest available positive number, just like a newly placed number: gaps left by deletion
|
||||
are filled first, without renumbering existing objects. A cloned arrow keeps its style but starts without endpoint links.
|
||||
Arrow and line endpoints can attach to numbered markers, rectangles, circles, ellipses, text blocks,
|
||||
and other arrows or strokes. Drop an endpoint onto the target; use **Ctrl+drag** to start a new
|
||||
connector over an existing object. Attached endpoints follow movement and resizing; text attachments
|
||||
and other arrows or strokes. In Arrow or Straight line mode, hold **Ctrl** and drag from one object
|
||||
to another to draw over them and automatically attach both endpoints. Without Ctrl, existing objects
|
||||
can still be selected and edited as before. With Pointer, drag an existing endpoint onto a target to attach it. Attached endpoints follow movement and resizing; text attachments
|
||||
also follow rotation. Arrow-to-arrow attachments retain their relative position along the target line.
|
||||
Clicking a connector or adding/editing its caption preserves its links. Moving the whole connector
|
||||
intentionally detaches its endpoints; moving one endpoint detaches only that end. Deleting a target
|
||||
@@ -136,6 +140,8 @@ The mouse wheel over text adjusts its font size. Text supports color, dragging,
|
||||
Delete and Undo/Redo. Arrow keys move the selected object by one source-image pixel;
|
||||
selecting an arrow caption moves only that caption. Repositioning a caption preserves its
|
||||
automatic angle; only dragging the rotation handle switches to a fixed angle.
|
||||
New standalone text starts horizontally, even after editing an angled arrow caption. Font styling
|
||||
is reused; rotation belongs to each individual object.
|
||||
Text has a rotation handle above its selection. Drag to rotate; hold Shift to snap to 15-degree steps.
|
||||
Double-click an arrow, press F2, or use the label icon to add/edit its caption. Captions follow
|
||||
the arrow when moved or resized; drag the caption to adjust its offset. By default, the caption
|
||||
|
||||
Binary file not shown.
+5
-9
@@ -1,18 +1,14 @@
|
||||
# Latest Windows release
|
||||
|
||||
## v0.6.5 — 2026-10-29
|
||||
## v0.6.6 — 2026-10-29
|
||||
|
||||
## Changes
|
||||
- Preserve endpoint links when selecting a connector or adding/editing its caption through double-click, F2 or the caption button. A click without movement no longer detaches the connector.
|
||||
- Attach arrow and line endpoints to rectangles, circles, ellipses, text blocks, other arrows/lines, and freehand/highlight strokes, in addition to numbered markers.
|
||||
- Keep attachments aligned as targets move or resize; text attachments also follow rotation. Arrow-to-arrow chains resolve in dependency order.
|
||||
- Preserve links through Undo/Redo. Deleted targets leave endpoints at their last position; clones start without links. Self-links and circular dependencies are rejected.
|
||||
|
||||
## Usage
|
||||
Drop a connector endpoint onto the target. Use **Ctrl+drag** to start a new connector over an existing object. Moving a whole connector detaches both of its endpoints; dragging one endpoint detaches only that end.
|
||||
- Add **Pointer (V)** as the initial editor tool. Select and move objects, edit geometry and thickness with handles, and clear selection by clicking empty space. Pointer never creates objects on empty space.
|
||||
- Preserve **Ctrl+drag** for drawing over existing objects and automatically linking connector endpoints. Add clearer Ctrl hints to the Arrow and Straight line buttons and status bar.
|
||||
- Fix new standalone text inheriting the angle of an arrow caption. New text reuses typography only and starts horizontally; editing existing rotated text preserves its own angle.
|
||||
|
||||
## Validation
|
||||
176 native checks, 440 input/layout checks at 240 DPI, screenshot editor UI integration, isolated notification registration, and 45 updater checks. Coverage includes caption editing, shape-arrow-arrow chains, movement, resize, text rotation, deletion, cloning, cycle rejection, and Undo/Redo.
|
||||
176 native checks, 440 input/layout checks at 240 DPI, screenshot editor UI integration, isolated notification registration, and 45 updater checks. UI coverage includes Pointer interactions, Ctrl drawing between markers/shapes/arrows, and standalone text after automatic or manually rotated arrow captions.
|
||||
|
||||
**Upgrade:** 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.
|
||||
|
||||
@@ -1 +1 @@
|
||||
bea45fdb33657fdfd5b065cdf10a3c358febdd5e895672dd106ec5ef2dd16c9a KSwitcher-win-x64.zip
|
||||
cb711ace317e60054f6498436f02bd66f10adebfe9362b8d1c106569cd27a600 KSwitcher-win-x64.zip
|
||||
|
||||
+3
-3
@@ -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,5,0
|
||||
PRODUCTVERSION 0,6,5,0
|
||||
FILEVERSION 0,6,6,0
|
||||
PRODUCTVERSION 0,6,6,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.5"
|
||||
VALUE "FileVersion", "0.6.6"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
+29
-16
@@ -53,7 +53,7 @@ bool confirmScreenshotClose(HWND owner)
|
||||
// If Windows cannot display the confirmation, keep the screenshot open.
|
||||
return SUCCEEDED(result) && button==IDYES;
|
||||
}
|
||||
constexpr int ToolIds[]{10,11,22,23,24,25,21,19,26,20,12,18,13};
|
||||
constexpr int ToolIds[]{27,10,11,22,23,24,25,21,19,26,20,12,18,13};
|
||||
struct Surface
|
||||
{
|
||||
HDC dc = CreateCompatibleDC(nullptr);
|
||||
@@ -131,7 +131,7 @@ struct Capture
|
||||
bool editing{}, dragging{}, arrow{}, owned{}, copied{};
|
||||
bool autoOpenEditor;
|
||||
bool highlight{};
|
||||
bool freehand=true;
|
||||
bool pointer=true, freehand=false;
|
||||
bool straight{}, textTool{};
|
||||
Mark textDefaults{};
|
||||
ScreenshotShape shape=ScreenshotShape::None;
|
||||
@@ -207,11 +207,12 @@ void updateStatus(Capture &c)
|
||||
else if(m.isText()) text=L"Text: arrows = 1 px | F2 = edit | Round handle = rotate; Shift = 15 degrees";
|
||||
else text=L"Arrows = 1 px | Del = delete | Ctrl+D = clone | Ctrl+Z / Ctrl+Y = undo / redo";
|
||||
}
|
||||
else if(c.pointer) text=L"Pointer (V): select and edit objects | Drag handles = geometry or thickness | Empty space clears selection";
|
||||
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 = draw over an object";
|
||||
else if(c.freehand) text=L"Freehand (F): drag to draw | Ctrl+drag = draw over an object";
|
||||
else if(c.arrow) text=L"Drag to draw | Ctrl+drag = draw over an object | F2 on a line = caption";
|
||||
else text=L"Number (N): click to add | Drag objects to move | Ctrl+C = copy screenshot";
|
||||
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): drag to draw | Ctrl+drag = draw over an object | 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";
|
||||
if(text!=c.statusText) {
|
||||
c.statusText=std::move(text);
|
||||
SendMessageW(status,SB_SETTEXTW,0,(LPARAM)c.statusText.c_str());
|
||||
@@ -252,6 +253,15 @@ void positionInlineText(Capture &c)
|
||||
int height=std::min(std::max(40,MulDiv(bounds.bottom-bounds.top,viewWidth,c.image->width)+24),std::max(32,int(client.bottom)-c.statusHeight-y));
|
||||
SetWindowPos(c.inlineText,nullptr,x-2,y-2,width,height,SWP_NOZORDER|SWP_NOACTIVATE);
|
||||
}
|
||||
Mark textStyleDefaults(const Mark &source)
|
||||
{
|
||||
// Reuse typography only, never an object's angle, position, identity or links.
|
||||
Mark style{};
|
||||
style.fontName=source.fontName; style.fontSize=source.fontSize;
|
||||
style.fontWeight=source.fontWeight; style.fontItalic=source.fontItalic;
|
||||
style.color=source.color;
|
||||
return style;
|
||||
}
|
||||
void finishInlineText(HWND w,Capture &c,bool commit)
|
||||
{
|
||||
if(!c.inlineText) return;
|
||||
@@ -274,7 +284,7 @@ void finishInlineText(HWND w,Capture &c,bool commit)
|
||||
} else if(!empty) {
|
||||
c.remember(c.marks); c.marks.push_back(c.textDraft); c.selected=int(c.marks.size())-1; c.selectedLabel=false;
|
||||
}
|
||||
if(!empty) c.textDefaults=c.textDraft;
|
||||
if(!empty) c.textDefaults=textStyleDefaults(c.textDraft);
|
||||
}
|
||||
if(commit) resolveScreenshotLinks(c.marks);
|
||||
c.textIndex=-1; c.editingLabel=false;
|
||||
@@ -539,7 +549,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,380,416,464};
|
||||
const int positions[]{8,44,80,116,152,188,224,260,296,332,368,416,452,500};
|
||||
static_assert(std::size(positions)==std::size(ToolIds));
|
||||
for (size_t i = 0; i < std::size(ToolIds); ++i)
|
||||
{
|
||||
@@ -610,7 +620,7 @@ std::pair<int,MarkPart> markAt(Capture &c, POINT p)
|
||||
}
|
||||
void captureCursor(HWND w, Capture &c)
|
||||
{
|
||||
LPCWSTR cursor=IDC_CROSS;
|
||||
LPCWSTR cursor=c.editing && c.pointer?IDC_ARROW:IDC_CROSS;
|
||||
if(c.editing)
|
||||
{
|
||||
POINT p; GetCursorPos(&p); ScreenToClient(w,&p);
|
||||
@@ -698,7 +708,7 @@ void drawTool(const DRAWITEMSTRUCT &item, const Capture &c)
|
||||
{
|
||||
auto dc=item.hDC;
|
||||
RECT r=item.rcItem;
|
||||
bool active=(item.CtlID==10 && !c.arrow && !c.highlight && !c.freehand && !c.textTool)||(item.CtlID==11 && c.arrow && !c.straight && c.shape==ScreenshotShape::None)||
|
||||
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);
|
||||
bool disabled=item.itemState&ODS_DISABLED;
|
||||
@@ -714,7 +724,7 @@ 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=c.toolIcons[disabled?2:active?1:0][iconIndex];
|
||||
auto icon=item.CtlID==27?(HICON)LoadCursorW(nullptr,IDC_ARROW):c.toolIcons[disabled?2:active?1:0][iconIndex];
|
||||
if(icon) DrawIconEx(dc,(r.right-c.iconSize)/2,(r.bottom-c.iconSize)/2,icon,c.iconSize,c.iconSize,0,nullptr,DI_NORMAL);
|
||||
if(item.CtlID==20) {
|
||||
auto color=c.selected>=0?c.marks[c.selected].color:c.currentColor;
|
||||
@@ -775,7 +785,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"Number (N)", L"Arrow (A)", L"Straight line (L)", L"Rectangle (R)", L"Circle (O)", L"Ellipse (E)", L"Freehand line (F); Ctrl+drag to draw over an object", 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"Freehand line (F); Ctrl+drag to draw over an object", 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 tips=CreateWindowExW(WS_EX_TOPMOST,TOOLTIPS_CLASSW,nullptr,WS_POPUP|TTS_ALWAYSTIP|TTS_NOPREFIX,
|
||||
@@ -867,7 +877,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
||||
}
|
||||
break;
|
||||
case WM_DRAWITEM:
|
||||
if((wp>=10 && wp<=13) || (wp>=18 && wp<=26) || wp==34 || wp==35) { drawTool(*reinterpret_cast<DRAWITEMSTRUCT *>(lp),*c); return TRUE; }
|
||||
if((wp>=10 && wp<=13) || (wp>=18 && wp<=27) || wp==34 || wp==35) { 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));
|
||||
@@ -894,7 +904,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
||||
auto draft=c->marks[c->selected];
|
||||
if(chooseTextFont(w,draft)) {
|
||||
c->remember(c->marks); c->marks[c->selected]=draft;
|
||||
c->textDefaults=draft.isLine()?screenshotArrowLabel(draft):draft;
|
||||
c->textDefaults=textStyleDefaults(draft);
|
||||
resolveScreenshotLinks(c->marks);
|
||||
}
|
||||
} else chooseTextFont(w,c->textDefaults);
|
||||
@@ -958,8 +968,9 @@ 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)>=21 && LOWORD(wp)<=26))
|
||||
if (LOWORD(wp)==10 || LOWORD(wp)==11 || LOWORD(wp)==19 || (LOWORD(wp)>=21 && LOWORD(wp)<=27))
|
||||
{
|
||||
c->pointer=LOWORD(wp)==27;
|
||||
c->arrow = LOWORD(wp)==11 || (LOWORD(wp)>=22 && LOWORD(wp)<=25);
|
||||
c->straight=LOWORD(wp)==22;
|
||||
c->textTool=LOWORD(wp)==26;
|
||||
@@ -973,7 +984,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
||||
InvalidateRect(GetDlgItem(w,11),nullptr,FALSE);
|
||||
InvalidateRect(GetDlgItem(w,19),nullptr,FALSE);
|
||||
InvalidateRect(GetDlgItem(w,21),nullptr,FALSE);
|
||||
for(int id=22;id<=26;++id) InvalidateRect(GetDlgItem(w,id),nullptr,FALSE);
|
||||
for(int id=22;id<=27;++id) InvalidateRect(GetDlgItem(w,id),nullptr,FALSE);
|
||||
}
|
||||
|
||||
SetFocus(w); InvalidateRect(w,nullptr,FALSE); return 0;
|
||||
@@ -1009,6 +1020,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
||||
InvalidateRect(w,nullptr,FALSE);
|
||||
}
|
||||
if(!(GetKeyState(VK_CONTROL)&0x8000)) {
|
||||
if(wp=='V') SendMessageW(w,WM_COMMAND,27,0);
|
||||
if(wp=='T') SendMessageW(w,WM_COMMAND,26,0);
|
||||
if(wp=='L') SendMessageW(w,WM_COMMAND,22,0);
|
||||
if(wp=='R') SendMessageW(w,WM_COMMAND,23,0);
|
||||
@@ -1068,6 +1080,7 @@ LRESULT CALLBACK captureProc(HWND w, UINT msg, WPARAM wp, LPARAM lp)
|
||||
InvalidateRect(w,nullptr,FALSE); return 0;
|
||||
}
|
||||
c->selected=-1; c->selectedLabel=false;
|
||||
if(c->pointer) { InvalidateRect(w,nullptr,FALSE); updateStatus(*c); return 0; }
|
||||
}
|
||||
if(c->editing && c->textTool) {
|
||||
Mark draft=c->textDefaults; draft.text.clear(); draft.from=draft.to=p; draft.color=c->currentColor;
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
#include "platform.h"
|
||||
namespace ks
|
||||
{
|
||||
inline constexpr wchar_t AppVersion[] = L"0.6.5";
|
||||
inline constexpr wchar_t AppVersion[] = L"0.6.6";
|
||||
inline constexpr UINT UpdateMessage = WM_APP + 7;
|
||||
inline constexpr UINT UpdateCheckIntervalMs = 6 * 60 * 60 * 1000;
|
||||
struct UpdateResult
|
||||
|
||||
+70
-2
@@ -36,11 +36,11 @@ int main()
|
||||
RECT client{}; GetClientRect(window,&client);
|
||||
require(c.view.bottom<=client.bottom-c.statusHeight,"image does not overlap status bar");
|
||||
ks::updateStatus(c);
|
||||
require(c.statusText.find(L"Freehand")!=std::wstring::npos,"default tool hint is shown");
|
||||
require(c.statusText.find(L"Pointer")!=std::wstring::npos,"default tool hint is shown");
|
||||
SendMessageW(GetDlgItem(window,13),WM_MOUSEMOVE,0,0);
|
||||
require(c.statusText.find(L"Ctrl+C")!=std::wstring::npos,"button hover shows action shortcut");
|
||||
SendMessageW(GetDlgItem(window,13),WM_MOUSELEAVE,0,0);
|
||||
require(c.statusText.find(L"Freehand")!=std::wstring::npos,"button leave restores contextual hint");
|
||||
require(c.statusText.find(L"Pointer")!=std::wstring::npos,"button leave restores contextual hint");
|
||||
for(int id:ks::ToolIds) require(GetDlgItem(window,id)!=nullptr,"all toolbar buttons created");
|
||||
require(GetDlgItem(window,34)!=nullptr && c.toolIcons[0][14]!=nullptr,"font icon created and loaded");
|
||||
ks::Mark text{{20,20},{20,20},0}; text.fontSize=18;
|
||||
@@ -144,6 +144,74 @@ int main()
|
||||
auto outside=c.marks[2].to; outside.x-=4;
|
||||
require(ks::markAt(c,outside)==std::pair{2,ks::MarkPart::End},"endpoint remains draggable outside badge");
|
||||
}
|
||||
{
|
||||
auto mouse=[&](UINT message,POINT p) {
|
||||
LONG x=c.view.left+MulDiv(p.x,c.view.right-c.view.left,c.image->width);
|
||||
LONG 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));
|
||||
};
|
||||
SendMessageW(window,WM_COMMAND,27,0); c.marks.clear();
|
||||
mouse(WM_LBUTTONDOWN,{40,160}); mouse(WM_MOUSEMOVE,{100,190}); mouse(WM_LBUTTONUP,{100,190});
|
||||
require(c.marks.empty() && !c.dragging && c.selected==-1,"pointer drag on empty canvas never adds an object");
|
||||
for(int tool : {11,22}) for(int target : {0,1,2}) {
|
||||
if(target==0) c.marks={{{55,160},{55,160},1},{{255,160},{255,160},2}};
|
||||
else {
|
||||
c.marks={{{30,140},{80,190},0},{{230,140},{280,190},0}};
|
||||
if(target==1) for(auto &mark:c.marks) mark.shape=ks::ScreenshotShape::Rectangle;
|
||||
else for(auto &mark:c.marks) mark.from.y=mark.to.y=160;
|
||||
}
|
||||
SendMessageW(window,WM_COMMAND,tool,0);
|
||||
BYTE savedKeys[256]{},drawingKeys[256]{};
|
||||
require(GetKeyboardState(savedKeys)!=FALSE,"read thread keyboard state");
|
||||
std::copy(savedKeys,savedKeys+256,drawingKeys); drawingKeys[VK_CONTROL]=0x80;
|
||||
require(SetKeyboardState(drawingKeys)!=FALSE,"set thread-local Ctrl for drawing test");
|
||||
mouse(WM_LBUTTONDOWN,{55,160}); mouse(WM_MOUSEMOVE,{255,160}); mouse(WM_LBUTTONUP,{255,160});
|
||||
SetKeyboardState(savedKeys);
|
||||
require(c.marks.size()==3,"drawing over existing objects creates a connector with Ctrl");
|
||||
auto &connector=c.marks[2];
|
||||
require(target==0?(connector.fromNumber==1 && connector.toNumber==2):
|
||||
(connector.fromLink.target==c.marks[0].id && connector.toLink.target==c.marks[1].id),
|
||||
"new arrow or line automatically attaches both endpoints to targets");
|
||||
require(connector.ends==(tool==11?c.arrowEnds:ks::LineEnds::None),"arrow and straight-line tools retain their end styles");
|
||||
auto before=connector.from;
|
||||
SendMessageW(window,WM_KEYDOWN,'V',0);
|
||||
require(c.pointer && !c.arrow && !c.freehand,"V selects pointer mode");
|
||||
POINT body=target==0?POINT{55,160}:target==1?POINT{30,175}:POINT{30,160};
|
||||
mouse(WM_LBUTTONDOWN,body); mouse(WM_MOUSEMOVE,{body.x,body.y-20}); mouse(WM_LBUTTONUP,{body.x,body.y-20});
|
||||
require(c.selected==0 && c.marks.size()==3 && c.marks[2].from.y<before.y,
|
||||
"pointer moves the target and the new connector follows without adding objects");
|
||||
mouse(WM_LBUTTONDOWN,{150,220}); mouse(WM_LBUTTONUP,{150,220});
|
||||
require(c.selected==-1 && c.marks.size()==3,"pointer click on empty space only clears selection");
|
||||
}
|
||||
}
|
||||
for(bool manualAngle : {false,true}) {
|
||||
c.marks={{{40,140},{180,60},0}}; c.selected=0;
|
||||
c.marks[0].fontSize=18; c.marks[0].fontWeight=FW_BOLD;
|
||||
c.marks[0].rotation=31; c.marks[0].labelRotationManual=manualAngle;
|
||||
SendMessageW(window,WM_COMMAND,35,0);
|
||||
SendMessageW(c.inlineText,EM_REPLACESEL,TRUE,(LPARAM)L"Sloped caption");
|
||||
ks::finishInlineText(window,c,true);
|
||||
auto captionAngle=ks::screenshotArrowLabel(c.marks[0]).rotation;
|
||||
require(captionAngle!=0,"caption retains its automatic or manual angle");
|
||||
SendMessageW(window,WM_COMMAND,26,0);
|
||||
LONG x=c.view.left+MulDiv(220,c.view.right-c.view.left,c.image->width);
|
||||
LONG y=c.view.top+MulDiv(190,c.view.bottom-c.view.top,c.image->height);
|
||||
SendMessageW(window,WM_LBUTTONDOWN,MK_LBUTTON,MAKELPARAM(x,y));
|
||||
require(c.inlineText && !c.editingLabel,"standalone text starts independently of caption");
|
||||
SendMessageW(c.inlineText,EM_REPLACESEL,TRUE,(LPARAM)L"Independent text");
|
||||
ks::finishInlineText(window,c,true);
|
||||
require(c.marks.size()==2 && c.marks[1].isText() && c.marks[1].rotation==0,
|
||||
"new standalone text does not inherit caption rotation");
|
||||
require(c.marks[1].fontSize==18 && c.marks[1].fontWeight==FW_BOLD,
|
||||
"new text still inherits font styling");
|
||||
require(ks::screenshotArrowLabel(c.marks[0]).rotation==captionAngle,"new text does not change caption angle");
|
||||
c.marks[1].rotation=22; c.selected=1;
|
||||
SendMessageW(window,WM_KEYDOWN,VK_F2,0);
|
||||
SendMessageW(c.inlineText,EM_REPLACESEL,TRUE,(LPARAM)L"Edited standalone text");
|
||||
ks::finishInlineText(window,c,true);
|
||||
require(c.marks[1].rotation==22,"editing existing rotated text preserves its own angle");
|
||||
SendMessageW(window,WM_COMMAND,27,0);
|
||||
}
|
||||
std::vector<ks::Mark> nudgeMarks;
|
||||
nudgeMarks.push_back({{60,60},{60,60},1});
|
||||
nudgeMarks.push_back({{60,60},{120,100},0});
|
||||
|
||||
Reference in New Issue
Block a user