[Screen Ruler] Close on left click and attribution adjustment (#20163)

* [Screen Ruler] end measure mode sessions on left click * [Screen Ruler] move attribution to a separate section * spelling
microsoft · Aug 30, 2022 · 49a6359 · 49a6359
1 parent 311a4db
commit 49a6359
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -156,7 +156,6 @@ BITMAPFILEHEADER
 bitmapimage
 BITMAPINFO
 BITMAPINFOHEADER
-Bitmaps
 bitmask
 BITSPIXEL
 bla
@@ -202,13 +201,10 @@ BYPOSITION
 bytearray
 Caiguna
 CALG
-Calibri
 callbackptr
 Cangjie
 CANRENAME
-coord
 CAPTURECHANGED
-carret
 cassert
 CAtl
 cch
@@ -320,7 +316,7 @@ CONTEXTMENUHANDLER
 CONTROLL
 CONTROLPARENT
 Controlz
-Coords
+coord
 copiedcolorrepresentation
 cortana
 cotaskmem
@@ -386,9 +382,9 @@ CYVIRTUALSCREEN
 cziplib
 Dac
 dacl
-damienleroy
 DAffine
 DAFFINETRANSFORM
+damienleroy
 Danmarkshavn
 DARKPURPLE
 DARKTEAL
@@ -473,7 +469,6 @@ dllexport
 dllhost
 dllmain
 dlls
-Dmap
 DNLEN
 Dns
 doctype
@@ -504,8 +499,8 @@ dvr
 DVSD
 DVSL
 DVTARGETDEVICE
-DWINRT
 dwhkl
+DWINRT
 dwl
 dwm
 dwmapi
@@ -565,6 +560,7 @@ EResize
 ERole
 ERRORMESSAGE
 ERRORTITLE
+esarbanis
 ESettings
 esize
 esrp
@@ -698,7 +694,6 @@ HACCEL
 hangeul
 hanselman
 hardcoded
-hardcodet
 Hardlines
 HARDWAREINPUT
 hashcode
@@ -740,7 +735,6 @@ HIMAGELIST
 himl
 hinst
 hinstance
-hitted
 HIWORD
 HKCC
 HKCR
@@ -1131,7 +1125,6 @@ LOCATIONCHANGE
 logconsole
 logfile
 LOGFONT
-Logique
 LOGMSG
 logon
 LOGPIXELSX
@@ -1184,8 +1177,6 @@ lzw
 Maarten
 Macquarie
 Magadan
-mah
-mahapps
 Mainwindow
 majortype
 MAJORVERSION
@@ -1242,7 +1233,6 @@ mfplat
 Mfsensorgroup
 mftransform
 mic
-michkap
 microsoft
 Midl
 mii
@@ -1564,8 +1554,8 @@ Pohnpei
 popup
 POPUPWINDOW
 posix
-powercfg
 poweraccent
+powercfg
 powerlauncher
 POWEROCR
 powerpreview
@@ -1757,7 +1747,7 @@ roadmap
 robmensching
 Roboto
 rohanrdy
-Roolr
+roolr
 roslyn
 Rothera
 roundf
@@ -2283,7 +2273,6 @@ wcscpy
 wcslen
 wcsncmp
 wcsnicmp
-wcsstr
 wdp
 wdupenv
 weakme

diff --git a/src/modules/MeasureTool/MeasureToolCore/BoundsToolOverlayUI.cpp b/src/modules/MeasureTool/MeasureToolCore/BoundsToolOverlayUI.cpp
@@ -38,9 +38,6 @@ LRESULT CALLBACK BoundsToolWndProc(HWND window, UINT message, WPARAM wparam, LPA
     }
     case WM_CURSOR_LEFT_MONITOR:
     {
-        for (; ShowCursor(true) < 0;)
-            ;
-
         auto toolState = GetWindowParam<BoundsToolState*>(window);
         if (!toolState)
             break;

diff --git a/src/modules/MeasureTool/MeasureToolCore/MeasureToolOverlayUI.cpp b/src/modules/MeasureTool/MeasureToolCore/MeasureToolOverlayUI.cpp
@@ -103,6 +103,7 @@ LRESULT CALLBACK MeasureToolWndProc(HWND window, UINT message, WPARAM wparam, LP
                                                             SetClipBoardToText(text.buffer);
                                                         }); });
         }
+        PostMessageW(window, WM_CLOSE, {}, {});
         break;
     case WM_MOUSEWHEEL:
         if (auto state = GetWindowParam<Serialized<MeasureToolState>*>(window))

diff --git a/src/modules/MeasureTool/MeasureToolCore/PerGlyphOpacityTextRender.h b/src/modules/MeasureTool/MeasureToolCore/PerGlyphOpacityTextRender.h
@@ -16,10 +16,10 @@ struct OpacityEffect : winrt::implements<OpacityEffect, IDrawingEffect>
 
 struct PerGlyphOpacityTextRender : winrt::implements<PerGlyphOpacityTextRender, IDWriteTextRenderer>
 {
-    ID2D1Factory * _pD2DFactory = nullptr;
+    ID2D1Factory* _pD2DFactory = nullptr;
     ID2D1HwndRenderTarget* _rt = nullptr;
     ID2D1SolidColorBrush* _baseBrush = nullptr;
-    
+
     PerGlyphOpacityTextRender(
         wil::com_ptr<ID2D1Factory> pD2DFactory,
         wil::com_ptr<ID2D1HwndRenderTarget> rt,

diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -117,6 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Attribution_Roolr.Text" xml:space="preserve">
+    <value>Inspired by Roolr</value>
+    <comment>Roolr is a name of the tool.</comment>
+  </data>
   <data name="Shell_VideoConference.Content" xml:space="preserve">
     <value>Video Conference Mute</value>
     <comment>Navigation view item name for Video Conference</comment>
@@ -125,9 +129,12 @@
     <value>Screen Ruler</value>
     <comment>Product name: Navigation view item name for Screen Ruler</comment>
   </data>
+  <data name="MeasureTool.SecondaryLinksHeader" xml:space="preserve">
+    <value>Attribution</value>
+    <comment>giving credit to the projects this utility was based on</comment>
+  </data>
   <data name="MeasureTool.ModuleDescription" xml:space="preserve">
-    <value>Screen Ruler is a quick and easy way to measure pixels on your screen.
-Inspired by Roolr.</value>
+    <value>Screen Ruler is a quick and easy way to measure pixels on your screen.</value>
     <comment>"Screen Ruler" is the name of the utility</comment>
   </data>
   <data name="MeasureTool.ModuleTitle" xml:space="preserve">

diff --git a/src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
@@ -84,5 +84,8 @@
         <controls:SettingsPageControl.PrimaryLinks>
             <controls:PageLink x:Uid="LearnMore_MeasureTool" Link="https://aka.ms/PowerToysOverview_MeasureTool"/>
         </controls:SettingsPageControl.PrimaryLinks>
+        <controls:SettingsPageControl.SecondaryLinks>
+            <controls:PageLink x:Uid="Attribution_Roolr" Link="https://github.com/esarbanis/roolr"/>
+        </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>