mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
switch to use main window's Show method
This commit is contained in:
parent
c94a04b3e1
commit
091b4afe4e
9 changed files with 8 additions and 15 deletions
|
|
@ -176,7 +176,7 @@ namespace Flow.Launcher
|
||||||
|
|
||||||
public void OnSecondAppStarted()
|
public void OnSecondAppStarted()
|
||||||
{
|
{
|
||||||
Current.MainWindow.Visibility = Visibility.Visible;
|
Current.MainWindow.Show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
using Flow.Launcher.Core.Resource;
|
using Flow.Launcher.Core.Resource;
|
||||||
using Flow.Launcher.Helper;
|
using Flow.Launcher.Helper;
|
||||||
using Flow.Launcher.Infrastructure.Hotkey;
|
|
||||||
using Flow.Launcher.Infrastructure.UserSettings;
|
using Flow.Launcher.Infrastructure.UserSettings;
|
||||||
using System;
|
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
|
@ -91,10 +89,9 @@ namespace Flow.Launcher
|
||||||
private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
|
private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
App.API.ChangeQuery(tbAction.Text);
|
App.API.ChangeQuery(tbAction.Text);
|
||||||
Application.Current.MainWindow.Visibility = Visibility.Visible;
|
Application.Current.MainWindow.Show();
|
||||||
Application.Current.MainWindow.Opacity = 1;
|
Application.Current.MainWindow.Opacity = 1;
|
||||||
Application.Current.MainWindow.Focus();
|
Application.Current.MainWindow.Focus();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
|
private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Threading.Tasks.Dataflow;
|
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
|
@ -21,9 +20,6 @@ using Flow.Launcher.Infrastructure.Logger;
|
||||||
using Microsoft.VisualStudio.Threading;
|
using Microsoft.VisualStudio.Threading;
|
||||||
using System.Threading.Channels;
|
using System.Threading.Channels;
|
||||||
using ISavable = Flow.Launcher.Plugin.ISavable;
|
using ISavable = Flow.Launcher.Plugin.ISavable;
|
||||||
using System.Windows.Threading;
|
|
||||||
using NHotkey;
|
|
||||||
using Windows.Web.Syndication;
|
|
||||||
|
|
||||||
|
|
||||||
namespace Flow.Launcher.ViewModel
|
namespace Flow.Launcher.ViewModel
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.WindowsIndex
|
||||||
}
|
}
|
||||||
|
|
||||||
var mainWindow = Application.Current.MainWindow;
|
var mainWindow = Application.Current.MainWindow;
|
||||||
mainWindow.Visibility = Visibility.Visible;
|
mainWindow.Show();
|
||||||
mainWindow.Focus();
|
mainWindow.Focus();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"Name": "Explorer",
|
"Name": "Explorer",
|
||||||
"Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
|
"Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
|
||||||
"Author": "Jeremy Wu",
|
"Author": "Jeremy Wu",
|
||||||
"Version": "1.10.0",
|
"Version": "1.10.1",
|
||||||
"Language": "csharp",
|
"Language": "csharp",
|
||||||
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
||||||
"ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",
|
"ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
|
||||||
$"{Context.CurrentPluginMetadata.ActionKeywords.FirstOrDefault()} {Settings.HotkeyUpdate} {plugin.Name}");
|
$"{Context.CurrentPluginMetadata.ActionKeywords.FirstOrDefault()} {Settings.HotkeyUpdate} {plugin.Name}");
|
||||||
|
|
||||||
var mainWindow = Application.Current.MainWindow;
|
var mainWindow = Application.Current.MainWindow;
|
||||||
mainWindow.Visibility = Visibility.Visible;
|
mainWindow.Show();
|
||||||
mainWindow.Focus();
|
mainWindow.Focus();
|
||||||
|
|
||||||
shouldHideWindow = false;
|
shouldHideWindow = false;
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
"Name": "Plugins Manager",
|
"Name": "Plugins Manager",
|
||||||
"Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
|
"Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
|
||||||
"Author": "Jeremy Wu",
|
"Author": "Jeremy Wu",
|
||||||
"Version": "1.9.0",
|
"Version": "1.9.1",
|
||||||
"Language": "csharp",
|
"Language": "csharp",
|
||||||
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
||||||
"ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",
|
"ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",
|
||||||
|
|
|
||||||
|
|
@ -329,7 +329,7 @@ namespace Flow.Launcher.Plugin.Shell
|
||||||
|
|
||||||
// show the main window and set focus to the query box
|
// show the main window and set focus to the query box
|
||||||
Window mainWindow = Application.Current.MainWindow;
|
Window mainWindow = Application.Current.MainWindow;
|
||||||
mainWindow.Visibility = Visibility.Visible;
|
mainWindow.Show();
|
||||||
mainWindow.Focus();
|
mainWindow.Focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"Name": "Shell",
|
"Name": "Shell",
|
||||||
"Description": "Provide executing commands from Flow Launcher",
|
"Description": "Provide executing commands from Flow Launcher",
|
||||||
"Author": "qianlifeng",
|
"Author": "qianlifeng",
|
||||||
"Version": "1.4.5",
|
"Version": "1.4.6",
|
||||||
"Language": "csharp",
|
"Language": "csharp",
|
||||||
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
||||||
"ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
|
"ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue