Skip to content

Fix: Fixed Main-Window focus overpowering opening of property windows… #17740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Fixed Main-Window focus overpowering opening of property windows… #17740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
using System.Runtime.InteropServices;
using Windows.Win32;
using Windows.Win32.UI.Shell;
using Windows.Win32.Foundation;
using Windows.Win32.UI.WindowsAndMessaging;

namespace Files.App.Actions
{
Expand Down Expand Up @@ -53,12 +55,23 @@ private unsafe void ExecuteShellCommand(string itemPath)
info.nShow = 5; // SW_SHOW
info.fMask = 0x0000000C; // SEE_MASK_INVOKEIDLIST

// Prevent Main Window from coming to from when sidebar menu is opened.

MainWindow.Instance.SetCanWindowToFront(false);

fixed (char* cVerb = "properties", lpFile = itemPath)
{
info.lpVerb = cVerb;
info.lpFile = lpFile;

PInvoke.ShellExecuteEx(ref info);
try
{
PInvoke.ShellExecuteEx(ref info);
}
finally
{
MainWindow.Instance.SetCanWindowToFront(true);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb1ca000ef2f03f1afc7bde9ed4fb2987669c89a58b63919e67574696091f60f
6d8695f63ae17c1df079e8e207b3b8dec7ab5b34b17a79386c6bba77d8684027
7 changes: 6 additions & 1 deletion src/Files.App/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,12 @@ async Task PerformNavigationAsync(string payload, string selectItem = null)
if (rootFrame.Content is MainPage && MainPageViewModel.AppInstances.Any())
{
// Bring to foreground (#14730)
Win32Helper.BringToForegroundEx(new(WindowHandle));

// Exception for Menus opened from the sidebar.
if (CanWindowToFront)
{
Win32Helper.BringToForegroundEx(new(WindowHandle));
}

var existingTabIndex = MainPageViewModel.AppInstances
.Select((tabItem, idx) => new { tabItem, idx })
Expand Down