样式微调, 修复重新打开中间呼出功能失效
This commit is contained in:
@@ -88,6 +88,7 @@
|
|||||||
</hc:Card.ContextMenu>
|
</hc:Card.ContextMenu>
|
||||||
<WrapPanel Orientation="Horizontal">
|
<WrapPanel Orientation="Horizontal">
|
||||||
<ListBox x:Name="MenuListBox"
|
<ListBox x:Name="MenuListBox"
|
||||||
|
Padding="2,3,0,2"
|
||||||
ItemsSource="{Binding MenuList}"
|
ItemsSource="{Binding MenuList}"
|
||||||
Tag="{Binding AppConfig.MenuCardWidth}"
|
Tag="{Binding AppConfig.MenuCardWidth}"
|
||||||
BorderThickness="0" Foreground="{x:Null}"
|
BorderThickness="0" Foreground="{x:Null}"
|
||||||
|
|||||||
@@ -50,9 +50,13 @@
|
|||||||
<MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
|
<MenuItem Header="添加URL项目" Click="AddUrlIcon"/>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</hc:Card.ContextMenu>
|
</hc:Card.ContextMenu>
|
||||||
<WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling" VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.IsContainerVirtualizable="True">
|
<WrapPanel Orientation="Horizontal" VirtualizingPanel.VirtualizationMode="Recycling"
|
||||||
|
VirtualizingPanel.IsVirtualizing="True"
|
||||||
|
VirtualizingPanel.IsContainerVirtualizable="True"
|
||||||
|
>
|
||||||
<ListBox x:Name="IconListBox" ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=TwoWay}"
|
<ListBox x:Name="IconListBox" ItemsSource="{Binding AppConfig.SelectedMenuIcons, Mode=TwoWay}"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
|
Padding="0,10,0,0"
|
||||||
>
|
>
|
||||||
<ListBox.Background>
|
<ListBox.Background>
|
||||||
<SolidColorBrush Opacity="0"/>
|
<SolidColorBrush Opacity="0"/>
|
||||||
|
|||||||
@@ -482,11 +482,14 @@ namespace GeekDesk
|
|||||||
/// <param name="sender"></param>
|
/// <param name="sender"></param>
|
||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void ReStartApp(object sender, RoutedEventArgs e)
|
private void ReStartApp(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (appData.AppConfig.MouseMiddleShow)
|
||||||
{
|
{
|
||||||
MouseHookThread.Dispose();
|
MouseHookThread.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
Process p = new Process();
|
Process p = new Process();
|
||||||
p.StartInfo.FileName = Constants.APP_DIR + Constants.MY_NAME + ".exe";
|
p.StartInfo.FileName = Constants.APP_DIR + "GeekDesk.exe";
|
||||||
p.StartInfo.WorkingDirectory = Constants.APP_DIR;
|
p.StartInfo.WorkingDirectory = Constants.APP_DIR;
|
||||||
p.Start();
|
p.Start();
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace GeekDesk.Thread
|
|||||||
public class MouseHookThread
|
public class MouseHookThread
|
||||||
{
|
{
|
||||||
private static AppConfig appConfig = MainWindow.appData.AppConfig;
|
private static AppConfig appConfig = MainWindow.appData.AppConfig;
|
||||||
private static IKeyboardMouseEvents m_GlobalHook = Hook.GlobalEvents();
|
private static IKeyboardMouseEvents m_GlobalHook = null;
|
||||||
private static Dispatcher dispatcher;
|
private static Dispatcher dispatcher;
|
||||||
|
|
||||||
|
|
||||||
@@ -24,6 +24,7 @@ namespace GeekDesk.Thread
|
|||||||
{
|
{
|
||||||
//使用dispatcher来单独监听UI线程 防止程序卡顿
|
//使用dispatcher来单独监听UI线程 防止程序卡顿
|
||||||
dispatcher = DispatcherBuild.Build();
|
dispatcher = DispatcherBuild.Build();
|
||||||
|
m_GlobalHook = Hook.GlobalEvents();
|
||||||
dispatcher.Invoke((Action)(() =>
|
dispatcher.Invoke((Action)(() =>
|
||||||
{
|
{
|
||||||
m_GlobalHook.MouseDownExt += M_GlobalHook_MouseDownExt;
|
m_GlobalHook.MouseDownExt += M_GlobalHook_MouseDownExt;
|
||||||
|
|||||||
Reference in New Issue
Block a user