Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 02:36:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* [Screen Ruler] end measure mode sessions on left click

* [Screen Ruler] move attribution to a separate section

* spelling
This commit is contained in:
Andrey Nekrasov
2022-08-30 15:39:21 +03:00
committed by GitHub
parent 311a4dbae9
commit 49a6359990
6 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/MeasureTool/MeasureToolCore/BoundsToolOverlayUI.cpp
View File

@@ -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;

1
src/modules/MeasureTool/MeasureToolCore/MeasureToolOverlayUI.cpp
View File

@@ -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))

4
src/modules/MeasureTool/MeasureToolCore/PerGlyphOpacityTextRender.h
View File

@@ -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,

11
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -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">

3
src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
View File

@@ -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>