@@ -30,14 +30,16 @@ LRESULT CALLBACK BoundsToolWndProc(HWND window, UINT message, WPARAM wparam, LPA
3030 auto toolState = GetWindowParam<BoundsToolState*>(window);
3131 if (!toolState)
3232 break ;
33- const POINT cursorPos = convert::FromSystemToRelativeForDirect2D (window, toolState->commonState ->cursorPosSystemSpace );
33+ const POINT cursorPos = convert::FromSystemToWindow (window, toolState->commonState ->cursorPosSystemSpace );
3434
3535 D2D_POINT_2F newRegionStart = { .x = static_cast <float >(cursorPos.x ), .y = static_cast <float >(cursorPos.y ) };
3636 toolState->perScreen [window].currentRegionStart = newRegionStart;
3737 break ;
3838 }
3939 case WM_CURSOR_LEFT_MONITOR:
4040 {
41+ for (; ShowCursor (true ) < 0 ;)
42+ ;
4143 auto toolState = GetWindowParam<BoundsToolState*>(window);
4244 if (!toolState)
4345 break ;
@@ -59,12 +61,12 @@ LRESULT CALLBACK BoundsToolWndProc(HWND window, UINT message, WPARAM wparam, LPA
5961
6062 if (const bool shiftPress = GetKeyState (VK_SHIFT) & 0x8000 ; shiftPress)
6163 {
62- const auto cursorPos = convert::FromSystemToRelativeForDirect2D (window, toolState->commonState ->cursorPosSystemSpace );
64+ const auto cursorPos = convert::FromSystemToWindow (window, toolState->commonState ->cursorPosSystemSpace );
6365
6466 D2D1_RECT_F rect;
6567 std::tie (rect.left , rect.right ) = std::minmax (static_cast <float >(cursorPos.x ), toolState->perScreen [window].currentRegionStart ->x );
6668 std::tie (rect.top , rect.bottom ) = std::minmax (static_cast <float >(cursorPos.y ), toolState->perScreen [window].currentRegionStart ->y );
67- toolState->perScreen [window].measurements .push_back (rect);
69+ toolState->perScreen [window].measurements .push_back (Measurement{ rect } );
6870 }
6971
7072 toolState->perScreen [window].currentRegionStart = std::nullopt;
@@ -97,45 +99,42 @@ LRESULT CALLBACK BoundsToolWndProc(HWND window, UINT message, WPARAM wparam, LPA
9799
98100namespace
99101{
100- void DrawMeasurement (const D2D1_RECT_F rect ,
102+ void DrawMeasurement (const Measurement& measurement ,
101103 const bool alignTextBoxToCenter,
102104 const CommonState& commonState,
103105 HWND window,
104- const D2DState& d2dState)
106+ const D2DState& d2dState,
107+ float mouseX,
108+ float mouseY)
105109 {
106110 const bool screenQuadrantAware = !alignTextBoxToCenter;
107- const auto prevMode = d2dState.rt ->GetAntialiasMode ();
108- d2dState.rt ->SetAntialiasMode (D2D1_ANTIALIAS_MODE_ALIASED);
109- d2dState.rt ->DrawRectangle (rect, d2dState.solidBrushes [Brush::line].get ());
110- d2dState.rt ->SetAntialiasMode (prevMode);
111+ d2dState.ToggleAliasedLinesMode (true );
112+ d2dState.dxgiWindowState .rt ->DrawRectangle (measurement.rect , d2dState.solidBrushes [Brush::line].get ());
113+ d2dState.ToggleAliasedLinesMode (false );
111114
112115 OverlayBoxText text;
113- const auto width = std::abs (rect.right - rect.left + 1 );
114- const auto height = std::abs (rect.top - rect.bottom + 1 );
115- const uint32_t textLen = swprintf_s (text.buffer .data (),
116- text.buffer .size (),
117- L" %.0f × %.0f"
118- width,
119- height);
120- std::optional<size_t > crossSymbolPos = wcschr (text.buffer .data (), L' ' buffer .data () + 1 ;
116+ const auto [crossSymbolPos, measureStringBufLen] =
117+ measurement.Print (text.buffer .data (),
118+ text.buffer .size (),
119+ true ,
120+ true ,
121+ commonState.units );
121122
122123 commonState.overlayBoxText .Access ([&](OverlayBoxText& v) {
123124 v = text;
124125 });
125126
126- float cornerX = rect.right ;
127- float cornerY = rect.bottom ;
128127 if (alignTextBoxToCenter)
129128 {
130- cornerX = rect.left + width / 2 ;
131- cornerY = rect.top + height / 2 ;
129+ mouseX = measurement. rect .left + measurement. Width (Measurement::Unit::Pixel) / 2 ;
130+ mouseY = measurement. rect .top + measurement. Height (Measurement::Unit::Pixel) / 2 ;
132131 }
133132
134133 d2dState.DrawTextBox (text.buffer .data (),
135- textLen ,
134+ measureStringBufLen ,
136135 crossSymbolPos,
137- cornerX ,
138- cornerY ,
136+ mouseX ,
137+ mouseY ,
139138 screenQuadrantAware,
140139 window);
141140 }
@@ -150,20 +149,21 @@ void DrawBoundsToolTick(const CommonState& commonState,
150149 if (it == end (toolState.perScreen ))
151150 return ;
152151
153- d2dState.rt ->Clear ();
152+ d2dState.dxgiWindowState . rt ->Clear ();
154153
155154 const auto & perScreen = it->second ;
156155 for (const auto & measure : perScreen.measurements )
157- DrawMeasurement (measure, true , commonState, window, d2dState);
156+ DrawMeasurement (measure, true , commonState, window, d2dState, measure. rect . right , measure. rect . bottom );
158157
159158 if (!perScreen.currentRegionStart .has_value ())
160159 return ;
161160
162- const auto cursorPos = convert::FromSystemToRelativeForDirect2D (window, commonState.cursorPosSystemSpace );
161+ const auto cursorPos = convert::FromSystemToWindow (window, commonState.cursorPosSystemSpace );
163162
164- const D2D1_RECT_F rect{ .left = perScreen.currentRegionStart ->x ,
165- .top = perScreen.currentRegionStart ->y ,
166- .right = static_cast <float >(cursorPos.x ),
167- .bottom = static_cast <float >(cursorPos.y ) };
168- DrawMeasurement (rect, false , commonState, window, d2dState);
163+ D2D1_RECT_F rect;
164+ const float cursorX = static_cast <float >(cursorPos.x );
165+ const float cursorY = static_cast <float >(cursorPos.y );
166+ std::tie (rect.left , rect.right ) = std::minmax (cursorX, perScreen.currentRegionStart ->x );
167+ std::tie (rect.top , rect.bottom ) = std::minmax (cursorY, perScreen.currentRegionStart ->y );
168+ DrawMeasurement (Measurement{ rect }, false , commonState, window, d2dState, cursorX, cursorY);
169169}
0 commit comments