Skip to content
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

Jump to bottom

Add tray icon when quake window is minimized #10179

Merged
merged 17 commits into from
Jul 8, 2021
Merged

Add tray icon when quake window is minimized #10179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
150efbb
initial
leonMSFT May 20, 2021
87238e1
give it a fresh look
leonMSFT May 20, 2021
b3ae922
scaffolding for MinimizeToTray action
leonMSFT May 20, 2021
7964b5a
scoping to quek only
leonMSFT May 24, 2021
eee447c
cleanup
leonMSFT May 25, 2021
a83686a
using the correct term
leonMSFT May 25, 2021
e8462e0
not sure if necessary, but try not to add every single time
leonMSFT May 25, 2021
b2b76ca
remove when no longer quake
leonMSFT May 25, 2021
ce22c0c
pr comments, spelling
leonMSFT May 26, 2021
8fa4718
ok ok ok fine
leonMSFT May 26, 2021
5f84958
run it back
leonMSFT May 28, 2021
2707769
merge conflicts
leonMSFT May 28, 2021
f432539
add a hwnd check
leonMSFT May 28, 2021
cf9cad0
Merge branch 'main' into dev/lelian/notifyicon/proto
leonMSFT Jun 28, 2021
ccdd920
pr comments
leonMSFT Jun 28, 2021
dfec7b5
loc
leonMSFT Jun 28, 2021
c47e3e5
wm_user, remove icon when closing
leonMSFT Jun 30, 2021
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
2 changes: 1 addition & 1 deletion src/cascadia/WinRTUtils/WinRTUtils.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- ========================= Headers ======================== -->
<ItemGroup>
<ClInclude Include="pch.h" />
<ClInclude Include="ScopedResourceLoader.h" />
<ClInclude Include="inc\ScopedResourceLoader.h" />
<ClInclude Include="inc\LibraryResources.h" />
<ClInclude Include="inc\ThrottledFunc.h" />
<ClInclude Include="inc\Utils.h" />
Expand Down
0 ...ascadia/WinRTUtils/ScopedResourceLoader.h → ...dia/WinRTUtils/inc/ScopedResourceLoader.h
View file
Open in desktop
File renamed without changes.
6 changes: 5 additions & 1 deletion src/cascadia/WindowsTerminal/AppHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include "VirtualDesktopUtils.h"
#include "icon.h"

#include <ScopedResourceLoader.h>

using namespace winrt::Windows::UI;
using namespace winrt::Windows::UI::Composition;
using namespace winrt::Windows::UI::Xaml;
Expand Down Expand Up @@ -996,8 +998,10 @@ void AppHost::_UpdateTrayIcon()

nid.uCallbackMessage = CM_NOTIFY_FROM_TRAY;

ScopedResourceLoader cascadiaLoader{ L"Resources" };

nid.hIcon = static_cast<HICON>(GetActiveAppIconHandle(ICON_SMALL));
StringCchCopy(nid.szTip, ARRAYSIZE(nid.szTip), L"Windows Terminal");
StringCchCopy(nid.szTip, ARRAYSIZE(nid.szTip), cascadiaLoader.GetLocalizedString(L"AppName").c_str());
nid.uFlags = NIF_MESSAGE | NIF_SHOWTIP | NIF_TIP | NIF_ICON;
Shell_NotifyIcon(NIM_ADD, &nid);
leonMSFT marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
8 changes: 8 additions & 0 deletions src/cascadia/WindowsTerminal/CustomWindowMessages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

#pragma once

// Custom window messages
#define CM_UPDATE_TITLE (WM_USER)
#define CM_NOTIFY_FROM_TRAY (WM_APP + 1)
leonMSFT marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj" />

<ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>

<!-- Manually add a reference to Core here. We need this so MDMERGE will know
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/WindowsTerminal/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Module Name:
#include <winrt/Windows.UI.Xaml.Controls.h>
#include <winrt/Windows.ui.xaml.media.h>
#include <winrt/Windows.ApplicationModel.h>
#include <winrt/Windows.ApplicationModel.Resources.Core.h>

#include <winrt/TerminalApp.h>
#include <winrt/Microsoft.Terminal.Settings.Model.h>
Expand Down