microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-10 00:48:23 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/llm

Browse Source
This commit is contained in:
Console Service Bot 2025-11-26 02:31:33 +00:00
commit bd5da6144d
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
consolegit2gitfilters.json
View File

@ -26,7 +26,12 @@
"/doc/user-docs/", "/doc/user-docs/",
"/src/tools/ansi-color/", "/src/tools/ansi-color/",
"/src/tools/ColorTool/", "/src/tools/ColorTool/",
"/src/tools/scratch/",
"/src/tools/ConsoleBench/",
"/src/tools/schemes-fragment/",
"/scratch/", "/scratch/",
"/tools/ReleaseEngineering/",
"/policies/",
"Scratch.sln", "Scratch.sln",
], ],
"SuffixFilters": [ "SuffixFilters": [
@ -44,6 +49,11 @@
".rec", ".rec",
".err", ".err",
"XamlStyler.json", "XamlStyler.json",
".xlsx" ".xlsx",
".vcxproj",
".vcxproj.filters",
".Build.props",
".Build.targets",
"OpenConsole.slnx"
] ]
} }

2
src/cascadia/WindowsTerminal/IslandWindow.cpp
View File

@ -624,7 +624,7 @@ void IslandWindow::_OnGetMinMaxInfo(const WPARAM /*wParam*/, const LPARAM lParam
const auto scale = GetCurrentDpiScale(); const auto scale = GetCurrentDpiScale();
const winrt::Windows::Foundation::Point real{ relative.x / scale, relative.y / scale }; const winrt::Windows::Foundation::Point real{ relative.x / scale, relative.y / scale };
winrt::Microsoft::Terminal::Core::Point wheelDelta{ 0, static_cast<int32_t>(HIWORD(wparam)) }; winrt::Microsoft::Terminal::Core::Point wheelDelta{ 0, std::bit_cast<int16_t>(HIWORD(wparam)) };
if (message == WM_MOUSEHWHEEL) if (message == WM_MOUSEHWHEEL)
{ {
std::swap(wheelDelta.X, wheelDelta.Y); std::swap(wheelDelta.X, wheelDelta.Y);

2
src/dep/dirs
View File

@ -1,2 +0,0 @@
DIRS=\
fmt \

1
src/host/sources.inc
View File

@ -81,6 +81,7 @@ SOURCES = \
..\writeData.cpp \ ..\writeData.cpp \
..\renderData.cpp \ ..\renderData.cpp \
..\renderFontDefaults.cpp \ ..\renderFontDefaults.cpp \
..\AccessibilityNotifier.cpp \
..\ConsoleArguments.cpp \ ..\ConsoleArguments.cpp \

4
src/interactivity/onecore/ConsoleControl.cpp
View File

@ -12,6 +12,10 @@ using namespace Microsoft::Console::Interactivity::OneCore;
#pragma region IConsoleControl Members #pragma region IConsoleControl Members
void ConsoleControl::Control(ControlType /*command*/, PVOID /*ptr*/, DWORD /*len*/) noexcept
{
}
void ConsoleControl::NotifyWinEvent(DWORD /*event*/, HWND /*hwnd*/, LONG /*idObject*/, LONG /*idChild*/) noexcept void ConsoleControl::NotifyWinEvent(DWORD /*event*/, HWND /*hwnd*/, LONG /*idObject*/, LONG /*idChild*/) noexcept
{ {
} }

1
src/interactivity/onecore/ConsoleControl.hpp
View File

@ -24,6 +24,7 @@ namespace Microsoft::Console::Interactivity::OneCore
{ {
public: public:
// IConsoleControl Members // IConsoleControl Members
void Control(ControlType command, PVOID ptr, DWORD len) noexcept override;
void NotifyWinEvent(DWORD event, HWND hwnd, LONG idObject, LONG idChild) noexcept override; void NotifyWinEvent(DWORD event, HWND hwnd, LONG idObject, LONG idChild) noexcept override;
void NotifyConsoleApplication(_In_ DWORD dwProcessId) noexcept override; void NotifyConsoleApplication(_In_ DWORD dwProcessId) noexcept override;
void SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground) noexcept override; void SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground) noexcept override;