mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-08 20:27:36 +02:00
Fixing more warnings (#5189)
* classes need to be in new files * adding in new lines Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
@@ -2,45 +2,10 @@
|
|||||||
// The Microsoft Corporation licenses this file to you under the MIT license.
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
using Microsoft.Toolkit.Win32.UI.XamlHost;
|
using Microsoft.Toolkit.Win32.UI.XamlHost;
|
||||||
|
|
||||||
namespace Microsoft.PowerToys.Settings.UI
|
namespace Microsoft.PowerToys.Settings.UI
|
||||||
{
|
{
|
||||||
[ComImport]
|
|
||||||
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
|
||||||
[Guid("45D64A29-A63E-4CB6-B498-5781D298CB4F")]
|
|
||||||
internal interface ICoreWindowInterop
|
|
||||||
{
|
|
||||||
System.IntPtr WindowHandle { get; }
|
|
||||||
|
|
||||||
void MessageHandled(bool value);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static class Interop
|
|
||||||
{
|
|
||||||
public static ICoreWindowInterop GetInterop(this Windows.UI.Core.CoreWindow @this)
|
|
||||||
{
|
|
||||||
var unkIntPtr = Marshal.GetIUnknownForObject(@this);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var interopObj = Marshal.GetTypedObjectForIUnknown(unkIntPtr, typeof(ICoreWindowInterop)) as ICoreWindowInterop;
|
|
||||||
return interopObj;
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
Marshal.Release(unkIntPtr);
|
|
||||||
unkIntPtr = System.IntPtr.Zero;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
[DllImport("user32.dll")]
|
|
||||||
public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
|
|
||||||
|
|
||||||
public const int SW_HIDE = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public sealed partial class App : XamlApplication
|
public sealed partial class App : XamlApplication
|
||||||
{
|
{
|
||||||
public App()
|
public App()
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ using Windows.UI.Xaml.Media;
|
|||||||
using Windows.UI.Xaml.Navigation;
|
using Windows.UI.Xaml.Navigation;
|
||||||
|
|
||||||
// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
|
// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
|
||||||
|
|
||||||
namespace Microsoft.PowerToys.Settings.UI.Controls
|
namespace Microsoft.PowerToys.Settings.UI.Controls
|
||||||
{
|
{
|
||||||
public sealed partial class GroupTitleTextBlock : UserControl
|
public sealed partial class GroupTitleTextBlock : UserControl
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
// Copyright (c) Microsoft Corporation
|
||||||
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
||||||
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Microsoft.PowerToys.Settings.UI
|
||||||
|
{
|
||||||
|
[ComImport]
|
||||||
|
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||||
|
[Guid("45D64A29-A63E-4CB6-B498-5781D298CB4F")]
|
||||||
|
internal interface ICoreWindowInterop
|
||||||
|
{
|
||||||
|
System.IntPtr WindowHandle { get; }
|
||||||
|
|
||||||
|
void MessageHandled(bool value);
|
||||||
|
}
|
||||||
|
}
|
||||||
31
src/core/Microsoft.PowerToys.Settings.UI/Interop.cs
Normal file
31
src/core/Microsoft.PowerToys.Settings.UI/Interop.cs
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
// Copyright (c) Microsoft Corporation
|
||||||
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
||||||
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Microsoft.PowerToys.Settings.UI
|
||||||
|
{
|
||||||
|
internal static class Interop
|
||||||
|
{
|
||||||
|
public static ICoreWindowInterop GetInterop(this Windows.UI.Core.CoreWindow @this)
|
||||||
|
{
|
||||||
|
var unkIntPtr = Marshal.GetIUnknownForObject(@this);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var interopObj = Marshal.GetTypedObjectForIUnknown(unkIntPtr, typeof(ICoreWindowInterop)) as ICoreWindowInterop;
|
||||||
|
return interopObj;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Marshal.Release(unkIntPtr);
|
||||||
|
unkIntPtr = System.IntPtr.Zero;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[DllImport("user32.dll")]
|
||||||
|
public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
|
||||||
|
|
||||||
|
public const int SW_HIDE = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -109,6 +109,8 @@
|
|||||||
<Compile Include="Helpers\Observable.cs" />
|
<Compile Include="Helpers\Observable.cs" />
|
||||||
<Compile Include="Helpers\RelayCommand.cs" />
|
<Compile Include="Helpers\RelayCommand.cs" />
|
||||||
<Compile Include="Helpers\ResourceExtensions.cs" />
|
<Compile Include="Helpers\ResourceExtensions.cs" />
|
||||||
|
<Compile Include="ICoreWindowInterop.cs" />
|
||||||
|
<Compile Include="Interop.cs" />
|
||||||
<Compile Include="Services\ActivationService.cs" />
|
<Compile Include="Services\ActivationService.cs" />
|
||||||
<Compile Include="Services\NavigationService.cs" />
|
<Compile Include="Services\NavigationService.cs" />
|
||||||
<Compile Include="ViewModels\ColorPickerViewModel.cs" />
|
<Compile Include="ViewModels\ColorPickerViewModel.cs" />
|
||||||
|
|||||||
@@ -109,7 +109,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public bool EnabledOnContextMenu
|
public bool EnabledOnContextMenu
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user