get rid of this file

microsoft · Mar 19, 2024 · fd8b083 · fd8b083
1 parent 6789ec0
commit fd8b083
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 34 deletions.
diff --git a/src/cascadia/TerminalApp/IPaneContent.idl b/src/cascadia/TerminalApp/IPaneContent.idl
@@ -13,7 +13,7 @@ namespace TerminalApp
     {
         Windows.UI.Xaml.FrameworkElement GetRoot();
 
-        Windows.Foundation.Size MinSize { get; };
+        Windows.Foundation.Size MinimumSize { get; };
 
         String Title { get; };
         UInt64 TaskbarState { get; };
@@ -47,6 +47,6 @@ namespace TerminalApp
     interface ISnappable
     {
         Single SnapDownToGrid(PaneSnapDirection direction, Single sizeToSnap);
-        Windows.Foundation.Size GridSize { get; };
+        Windows.Foundation.Size GridUnitSize { get; };
     };
 }
diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp
@@ -4,8 +4,6 @@
 #include "pch.h"
 #include "Pane.h"
 
-#include "BellEventArgs.g.cpp"
-
 #include "AppLogic.h"
 
 #include "Utils.h"
@@ -2642,7 +2640,7 @@ Pane::SnapSizeResult Pane::_CalcSnappedDimension(const bool widthOrHeight, const
         }
         else
         {
-            const auto cellSize = snappable.GridSize();
+            const auto cellSize = snappable.GridUnitSize();
             const auto higher = lower + (direction == PaneSnapDirection::Width ?
                                              cellSize.Width :
                                              cellSize.Height);
@@ -2703,13 +2701,11 @@ void Pane::_AdvanceSnappedDimension(const bool widthOrHeight, LayoutSizeNode& si
                 // be, say, half a character, or fixed 10 pixels), so snap it upward. It might
                 // however be already snapped, so add 1 to make sure it really increases
                 // (not strictly necessary but to avoid surprises).
-                sizeNode.size = _CalcSnappedDimension(widthOrHeight,
-                                                      sizeNode.size + 1)
-                                    .higher;
+                sizeNode.size = _CalcSnappedDimension(widthOrHeight, sizeNode.size + 1).higher;
             }
             else
             {
-                const auto cellSize = snappable.GridSize();
+                const auto cellSize = snappable.GridUnitSize();
                 sizeNode.size += widthOrHeight ? cellSize.Width : cellSize.Height;
             }
         }
@@ -2825,7 +2821,7 @@ Size Pane::_GetMinSize() const
 {
     if (_IsLeaf())
     {
-        auto controlSize = _content.MinSize();
+        auto controlSize = _content.MinimumSize();
         auto newWidth = controlSize.Width;
         auto newHeight = controlSize.Height;
 

diff --git a/src/cascadia/TerminalApp/Pane.h b/src/cascadia/TerminalApp/Pane.h
@@ -22,7 +22,6 @@
 
 #include "TaskbarState.h"
 #include "TerminalPaneContent.h"
-#include "BellEventArgs.g.h"
 
 // fwdecl unittest classes
 namespace TerminalAppLocalTests
@@ -60,18 +59,6 @@ struct PaneResources
     winrt::Windows::UI::Xaml::Media::SolidColorBrush broadcastBorderBrush{ nullptr };
 };
 
-namespace winrt::TerminalApp::implementation
-{
-    struct BellEventArgs : public BellEventArgsT<BellEventArgs>
-    {
-    public:
-        BellEventArgs(bool flashTaskbar) :
-            FlashTaskbar(flashTaskbar) {}
-
-        til::property<bool> FlashTaskbar;
-    };
-};
-
 class Pane : public std::enable_shared_from_this<Pane>
 {
 public:

diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -131,9 +131,6 @@
     </ClInclude>
     <ClInclude Include="FilteredCommand.h" />
     <ClInclude Include="Pane.h" />
-    <ClInclude Include="PaneArgs.h">
-      <DependentUpon>IPaneContent.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="ColorHelper.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ShortcutActionDispatch.h">
@@ -236,9 +233,6 @@
     </ClCompile>
     <ClCompile Include="FilteredCommand.cpp" />
     <ClCompile Include="Pane.cpp" />
-    <ClCompile Include="PaneArgs.cpp">
-      <DependentUpon>IPaneContent.idl</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Pane.LayoutSizeNode.cpp" />
     <ClCompile Include="ColorHelper.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.cpp b/src/cascadia/TerminalApp/TerminalPaneContent.cpp
@@ -3,9 +3,10 @@
 
 #include "pch.h"
 #include "TerminalPaneContent.h"
-#include "PaneArgs.h"
 #include "TerminalPaneContent.g.cpp"
 
+#include "BellEventArgs.g.cpp"
+
 #include <Mmsystem.h>
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::UI::Xaml;
@@ -49,7 +50,7 @@ namespace winrt::TerminalApp::implementation
     {
         return _control;
     }
-    winrt::Windows::Foundation::Size TerminalPaneContent::MinSize()
+    winrt::Windows::Foundation::Size TerminalPaneContent::MinimumSize()
     {
         return _control.MinimumSize();
     }
@@ -324,7 +325,7 @@ namespace winrt::TerminalApp::implementation
     {
         return _control.SnapDimensionToGrid(direction == PaneSnapDirection::Width, sizeToSnap);
     }
-    Windows::Foundation::Size TerminalPaneContent::GridSize()
+    Windows::Foundation::Size TerminalPaneContent::GridUnitSize()
     {
         return _control.CharacterDimensions();
     }

diff --git a/src/cascadia/TerminalApp/TerminalPaneContent.h b/src/cascadia/TerminalApp/TerminalPaneContent.h
@@ -3,17 +3,27 @@
 
 #pragma once
 #include "TerminalPaneContent.g.h"
+#include "BellEventArgs.g.h"
 
 namespace winrt::TerminalApp::implementation
 {
+    struct BellEventArgs : public BellEventArgsT<BellEventArgs>
+    {
+    public:
+        BellEventArgs(bool flashTaskbar) :
+            FlashTaskbar(flashTaskbar) {}
+
+        til::property<bool> FlashTaskbar;
+    };
+
     struct TerminalPaneContent : TerminalPaneContentT<TerminalPaneContent>
     {
         TerminalPaneContent(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile,
                             const winrt::Microsoft::Terminal::Control::TermControl& control);
 
         winrt::Windows::UI::Xaml::FrameworkElement GetRoot();
         winrt::Microsoft::Terminal::Control::TermControl GetTerminal();
-        winrt::Windows::Foundation::Size MinSize();
+        winrt::Windows::Foundation::Size MinimumSize();
         void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic);
         void Close();
 
@@ -35,7 +45,7 @@ namespace winrt::TerminalApp::implementation
         bool ReadOnly() { return _control.ReadOnly(); }
 
         float SnapDownToGrid(const TerminalApp::PaneSnapDirection direction, const float sizeToSnap);
-        Windows::Foundation::Size GridSize();
+        Windows::Foundation::Size GridUnitSize();
 
         til::typed_event<TerminalApp::TerminalPaneContent, winrt::Windows::Foundation::IInspectable> RestartTerminalRequested;
         til::typed_event<> CloseRequested;