mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-01-05 20:06:59 +01:00
Compare commits
6 Commits
jay/DarkMo
...
shawn/test
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8755aacd0b | ||
|
|
e59ea36ccf | ||
|
|
2f40aab220 | ||
|
|
33459b718b | ||
|
|
7146da92ea | ||
|
|
bbe248ca90 |
@@ -33,7 +33,7 @@ parameters:
|
|||||||
default: true
|
default: true
|
||||||
- name: winAppSDKVersionNumber
|
- name: winAppSDKVersionNumber
|
||||||
type: string
|
type: string
|
||||||
default: 1.6
|
default: 1.7
|
||||||
- name: useExperimentalVersion
|
- name: useExperimentalVersion
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
@@ -47,4 +47,4 @@ extends:
|
|||||||
useVSPreview: ${{ parameters.useVSPreview }}
|
useVSPreview: ${{ parameters.useVSPreview }}
|
||||||
useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
|
useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
|
||||||
winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
|
winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
|
||||||
useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
|
useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
|
||||||
@@ -27,6 +27,9 @@ steps:
|
|||||||
buildType: 'specific'
|
buildType: 'specific'
|
||||||
project: '55e8140e-57ac-4e5f-8f9c-c7c15b51929d'
|
project: '55e8140e-57ac-4e5f-8f9c-c7c15b51929d'
|
||||||
definition: '104083'
|
definition: '104083'
|
||||||
|
specificBuildWithTriggering: false
|
||||||
|
allowPartiallySucceededBuilds: true
|
||||||
|
allowFailedBuilds: true
|
||||||
buildVersionToDownload: 'latestFromBranch'
|
buildVersionToDownload: 'latestFromBranch'
|
||||||
branchName: 'refs/heads/release/${{ parameters.versionNumber }}-stable'
|
branchName: 'refs/heads/release/${{ parameters.versionNumber }}-stable'
|
||||||
artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
|
artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ namespace ColorPicker.Helpers
|
|||||||
|
|
||||||
public bool HandleEnterPressed()
|
public bool HandleEnterPressed()
|
||||||
{
|
{
|
||||||
if (!IsColorPickerVisible())
|
if (!_colorPickerShown)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -241,14 +241,13 @@ namespace ColorPicker.Helpers
|
|||||||
|
|
||||||
public bool HandleEscPressed()
|
public bool HandleEscPressed()
|
||||||
{
|
{
|
||||||
if (!BlockEscapeKeyClosingColorPickerEditor)
|
if (!BlockEscapeKeyClosingColorPickerEditor
|
||||||
|
&& (_colorPickerShown || (_colorEditorWindow != null && _colorEditorWindow.IsActive)))
|
||||||
{
|
{
|
||||||
return EndUserSession();
|
return EndUserSession();
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
return false;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void MoveCursor(int xOffset, int yOffset)
|
internal void MoveCursor(int xOffset, int yOffset)
|
||||||
|
|||||||
@@ -70,17 +70,10 @@ namespace ColorPicker.Keyboard
|
|||||||
var virtualCode = e.KeyboardData.VirtualCode;
|
var virtualCode = e.KeyboardData.VirtualCode;
|
||||||
|
|
||||||
// ESC pressed
|
// ESC pressed
|
||||||
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape)
|
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape) && e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown)
|
||||||
&& e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
if (_appStateHandler.IsColorPickerVisible()
|
e.Handled = _appStateHandler.HandleEscPressed();
|
||||||
|| !AppStateHandler.BlockEscapeKeyClosingColorPickerEditor
|
return;
|
||||||
)
|
|
||||||
{
|
|
||||||
e.Handled = _appStateHandler.EndUserSession();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((virtualCode == KeyInterop.VirtualKeyFromKey(Key.Space) || virtualCode == KeyInterop.VirtualKeyFromKey(Key.Enter)) && (e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown))
|
if ((virtualCode == KeyInterop.VirtualKeyFromKey(Key.Space) || virtualCode == KeyInterop.VirtualKeyFromKey(Key.Enter)) && (e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown))
|
||||||
|
|||||||
Reference in New Issue
Block a user