Stop using D2D size/point for CursorRenderer

refs #507 - Clean up use of D2D1_{RECT,SIZE}_* except at D2D boundaries
OpenKneeboard · Mar 9, 2024 · 6d95df8 · 6d95df8
1 parent ff106c5
commit 6d95df8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/src/app/app-common/CursorRenderer.cpp b/src/app/app-common/CursorRenderer.cpp
@@ -33,10 +33,10 @@ CursorRenderer::~CursorRenderer() = default;
 
 void CursorRenderer::Render(
   ID2D1RenderTarget* ctx,
-  const D2D1_POINT_2F& point,
-  const D2D1_SIZE_F& scaleTo) {
-  const auto cursorRadius = scaleTo.height / CursorRadiusDivisor;
-  const auto cursorStroke = scaleTo.height / CursorStrokeDivisor;
+  const PixelPoint& point,
+  const PixelSize& scaleTo) {
+  const auto cursorRadius = scaleTo.Height<float>() / CursorRadiusDivisor;
+  const auto cursorStroke = scaleTo.Height<float>() / CursorStrokeDivisor;
 
   auto elipse = D2D1::Ellipse(point, cursorRadius, cursorRadius);
   ctx->DrawEllipse(elipse, mOuterBrush.get(), cursorStroke * 2);

diff --git a/src/app/app-common/KneeboardView.cpp b/src/app/app-common/KneeboardView.cpp
@@ -412,10 +412,10 @@ void KneeboardView::RenderWithChrome(
     auto d2d = rt->d2d();
     mCursorRenderer->Render(
       d2d,
-      {
+      Geometry2D::Point<float>(
         (mCursorCanvasPoint->x * size.mWidth) + rect.Left(),
-        (mCursorCanvasPoint->y * size.mHeight) + rect.Top(),
-      },
+        (mCursorCanvasPoint->y * size.mHeight) + rect.Top())
+        .Rounded<uint32_t>(),
       size);
   }
 }

diff --git a/src/app/app-common/include/OpenKneeboard/CursorRenderer.h b/src/app/app-common/include/OpenKneeboard/CursorRenderer.h
@@ -19,6 +19,8 @@
  */
 #pragma once
 
+#include <OpenKneeboard/Pixels.h>
+
 #include <OpenKneeboard/audited_ptr.h>
 
 #include <shims/winrt/base.h>
@@ -36,8 +38,8 @@ class CursorRenderer final {
 
   void Render(
     ID2D1RenderTarget* ctx,
-    const D2D1_POINT_2F& point,
-    const D2D1_SIZE_F& scaleTo);
+    const PixelPoint& point,
+    const PixelSize& scaleTo);
 
  private:
   winrt::com_ptr<ID2D1SolidColorBrush> mInnerBrush;

diff --git a/src/app/app-winui3/TabPage.xaml.cpp b/src/app/app-winui3/TabPage.xaml.cpp
@@ -535,14 +535,15 @@ void TabPage::PaintNow() noexcept {
       TraceLoggingValue(tab->GetPageCount(), "PageCount"));
     return;
   }
-  auto point = *maybePoint;
-  point.x *= metrics.mRenderSize.Width();
-  point.y *= metrics.mRenderSize.Height();
-  point.x += metrics.mRenderRect.Left();
-  point.y += metrics.mRenderRect.Top();
+  Geometry2D::Point<float> point {maybePoint->x, maybePoint->y};
+  point.mX *= metrics.mRenderSize.Width();
+  point.mY *= metrics.mRenderSize.Height();
+  point.mX += metrics.mRenderRect.Left();
+  point.mY += metrics.mRenderRect.Top();
   {
     auto d2d = mRenderTarget->d2d();
-    mCursorRenderer->Render(d2d, point, metrics.mRenderSize);
+    mCursorRenderer->Render(
+      d2d, point.Rounded<uint32_t>(), metrics.mRenderSize);
   }
   TraceLoggingWriteStop(
     activity,