admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/BookerLiu/GeekDesk into 2.5.12

Browse Source
This commit is contained in:
BookerLiu
2022-07-27 17:06:21 +08:00
parent a50d88f2c2 7360412c97
commit a682f27223
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Control/UserControls/PannelCard/LeftCardControl.xaml.cs
View File

@@ -333,6 +333,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
appData.AppConfig.SelectedMenuIcons = null; appData.AppConfig.SelectedMenuIcons = null;
RunTimeStatus.SHOW_MENU_PASSWORDBOX = true; RunTimeStatus.SHOW_MENU_PASSWORDBOX = true;
MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码"; MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码";
MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.INPUT;
MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible; MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible;
} }
else else

12
Control/Windows/PixelColorPickerWindow.xaml.cs
View File

@@ -7,10 +7,14 @@ using System.Runtime.InteropServices;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Controls.Primitives; using System.Windows.Controls.Primitives;
using System.Windows.Forms;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Interop; using System.Windows.Interop;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using Cursors = System.Windows.Input.Cursors;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MouseEventArgs = System.Windows.Input.MouseEventArgs;
namespace GeekDesk.Control.Windows namespace GeekDesk.Control.Windows
{ {
@@ -28,10 +32,14 @@ namespace GeekDesk.Control.Windows
private readonly ColorPicker colorPicker; private readonly ColorPicker colorPicker;
[System.Runtime.InteropServices.DllImport("user32.dll")]
private static extern bool SetProcessDPIAware();
public PixelColorPickerWindow(ColorPicker colorPicker) public PixelColorPickerWindow(ColorPicker colorPicker)
{ {
InitializeComponent(); InitializeComponent();
this.colorPicker = colorPicker; this.colorPicker = colorPicker;
SetProcessDPIAware();
ColorPickerWindow_Init(); ColorPickerWindow_Init();
} }
@@ -51,8 +59,8 @@ namespace GeekDesk.Control.Windows
this.Topmost = true; this.Topmost = true;
bgBitmap = new System.Drawing.Bitmap( bgBitmap = new System.Drawing.Bitmap(
(int)SystemParameters.VirtualScreenWidth, Screen.AllScreens[0].Bounds.Width,
(int)SystemParameters.VirtualScreenHeight, Screen.AllScreens[0].Bounds.Height,
System.Drawing.Imaging.PixelFormat.Format32bppArgb System.Drawing.Imaging.PixelFormat.Format32bppArgb
); );