29be8564f6
## Summary of the Pull Request BODGY! This solution was suggested in https://github.com/microsoft/microsoft-ui-xaml/issues/4554#issuecomment-887815332. When the window moves, or when a ScrollViewer scrolls, dismiss any popups that are visible. This happens automagically when an app is a real XAML app, but it doesn't work for XAML Islands. ## References * upstream at https://github.com/microsoft/microsoft-ui-xaml/issues/4554 ## PR Checklist * [x] Closes #9320 * [x] I work here * [ ] Tests added/passed * [ ] Requires documentation to be updated ## Detailed Description of the Pull Request / Additional comments Unfortunately, we've got a bunch of scroll viewers in our SUI. So I did something bodgyx2 to make our life a little easier. `DismissAllPopups` can be used to dismiss all popups for a particular UI element. However, we've got a bunch of pages with scroll viewers that may or may not have popups in them. Rather than define the same exact body for all their `ViewChanging` events, the `HasScrollViewer` struct will just do it for you! Inside the `HasScrollViewer` stuct, we can't get at the `XamlRoot()` that our subclass implements. I mean, _we_ can, but when XAML does it's codegen, _XAML_ won't be able to figure it out. Fortunately for us, we don't need to! The sender is a UIElement, so we can just get _their_ `XamlRoot()`. So, you can fix this for any SUI page with just a simple ```diff - <ScrollViewer> + <ScrollViewer ViewChanging="ViewChanging"> ``` ```diff - struct AddProfile : AddProfileT<AddProfile> + struct AddProfile : public HasScrollViewer<AddProfile>, AddProfileT<AddProfile> ``` ## Validation Steps Performed * the window doesn't close when you move it * the popups _do_ close when you move the window * the popups close when you scroll any SUI page
200 lines
9.3 KiB
C++
200 lines
9.3 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#pragma once
|
|
|
|
#include "Profiles.g.h"
|
|
#include "ProfilePageNavigationState.g.h"
|
|
#include "DeleteProfileEventArgs.g.h"
|
|
#include "ProfileViewModel.g.h"
|
|
#include "Utils.h"
|
|
#include "ViewModelHelpers.h"
|
|
#include "Appearances.h"
|
|
|
|
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
|
{
|
|
struct ProfileViewModel : ProfileViewModelT<ProfileViewModel>, ViewModelHelper<ProfileViewModel>
|
|
{
|
|
public:
|
|
ProfileViewModel(const Model::Profile& profile, const Model::CascadiaSettings& settings);
|
|
|
|
Model::TerminalSettings TermSettings() const;
|
|
|
|
void SetAcrylicOpacityPercentageValue(double value)
|
|
{
|
|
AcrylicOpacity(winrt::Microsoft::Terminal::Settings::Editor::Converters::PercentageValueToPercentage(value));
|
|
};
|
|
|
|
void SetPadding(double value)
|
|
{
|
|
Padding(to_hstring(value));
|
|
}
|
|
|
|
// starting directory
|
|
bool UseParentProcessDirectory();
|
|
void UseParentProcessDirectory(const bool useParent);
|
|
bool UseCustomStartingDirectory();
|
|
|
|
// font face
|
|
static void UpdateFontList() noexcept;
|
|
Windows::Foundation::Collections::IObservableVector<Editor::Font> CompleteFontList() const noexcept;
|
|
Windows::Foundation::Collections::IObservableVector<Editor::Font> MonospaceFontList() const noexcept;
|
|
|
|
// general profile knowledge
|
|
winrt::guid OriginalProfileGuid() const noexcept;
|
|
bool CanDeleteProfile() const;
|
|
Editor::AppearanceViewModel DefaultAppearance();
|
|
Editor::AppearanceViewModel UnfocusedAppearance();
|
|
bool HasUnfocusedAppearance();
|
|
bool EditableUnfocusedAppearance();
|
|
bool ShowUnfocusedAppearance();
|
|
|
|
void CreateUnfocusedAppearance(const Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme>& schemes,
|
|
const IHostedInWindow& windowRoot);
|
|
void DeleteUnfocusedAppearance();
|
|
|
|
WINRT_PROPERTY(bool, IsBaseLayer, false);
|
|
|
|
PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, Guid);
|
|
PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, ConnectionType);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, Name);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, Source);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, Hidden);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, Icon);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, CloseOnExit);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, TabTitle);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, TabColor);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, SuppressApplicationTitle);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, UseAcrylic);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, AcrylicOpacity);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, ScrollState);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, Padding);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, Commandline);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, StartingDirectory);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, AntialiasingMode);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, ForceFullRepaintRendering);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, SoftwareRendering);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), Foreground);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), Background);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), SelectionBackground);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile.DefaultAppearance(), CursorColor);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, HistorySize);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, SnapOnInput);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, AltGrAliasing);
|
|
OBSERVABLE_PROJECTED_SETTING(_profile, BellStyle);
|
|
|
|
private:
|
|
Model::Profile _profile;
|
|
winrt::guid _originalProfileGuid;
|
|
winrt::hstring _lastBgImagePath;
|
|
winrt::hstring _lastStartingDirectoryPath;
|
|
Editor::AppearanceViewModel _defaultAppearanceViewModel;
|
|
|
|
static Windows::Foundation::Collections::IObservableVector<Editor::Font> _MonospaceFontList;
|
|
static Windows::Foundation::Collections::IObservableVector<Editor::Font> _FontList;
|
|
|
|
static Editor::Font _GetFont(com_ptr<IDWriteLocalizedStrings> localizedFamilyNames);
|
|
|
|
Model::CascadiaSettings _appSettings;
|
|
Editor::AppearanceViewModel _unfocusedAppearanceViewModel;
|
|
};
|
|
|
|
struct DeleteProfileEventArgs :
|
|
public DeleteProfileEventArgsT<DeleteProfileEventArgs>
|
|
{
|
|
public:
|
|
DeleteProfileEventArgs(guid profileGuid) :
|
|
_ProfileGuid(profileGuid) {}
|
|
|
|
guid ProfileGuid() const noexcept { return _ProfileGuid; }
|
|
|
|
private:
|
|
guid _ProfileGuid{};
|
|
};
|
|
|
|
struct ProfilePageNavigationState : ProfilePageNavigationStateT<ProfilePageNavigationState>
|
|
{
|
|
public:
|
|
ProfilePageNavigationState(const Editor::ProfileViewModel& viewModel,
|
|
const Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme>& schemes,
|
|
const Editor::ProfilePageNavigationState& lastState,
|
|
const IHostedInWindow& windowRoot) :
|
|
_Profile{ viewModel },
|
|
_Schemes{ schemes },
|
|
_WindowRoot{ windowRoot }
|
|
{
|
|
// If there was a previous nav state copy the selected pivot from it.
|
|
if (lastState)
|
|
{
|
|
_LastActivePivot = lastState.LastActivePivot();
|
|
}
|
|
viewModel.DefaultAppearance().Schemes(schemes);
|
|
viewModel.DefaultAppearance().WindowRoot(windowRoot);
|
|
|
|
if (viewModel.UnfocusedAppearance())
|
|
{
|
|
viewModel.UnfocusedAppearance().Schemes(schemes);
|
|
viewModel.UnfocusedAppearance().WindowRoot(windowRoot);
|
|
}
|
|
}
|
|
|
|
void DeleteProfile();
|
|
void CreateUnfocusedAppearance();
|
|
void DeleteUnfocusedAppearance();
|
|
|
|
Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> Schemes() { return _Schemes; }
|
|
void Schemes(const Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme>& val) { _Schemes = val; }
|
|
TYPED_EVENT(DeleteProfile, Editor::ProfilePageNavigationState, Editor::DeleteProfileEventArgs);
|
|
WINRT_PROPERTY(IHostedInWindow, WindowRoot, nullptr);
|
|
WINRT_PROPERTY(Editor::ProfilesPivots, LastActivePivot, Editor::ProfilesPivots::General);
|
|
WINRT_PROPERTY(Editor::ProfileViewModel, Profile, nullptr);
|
|
|
|
private:
|
|
Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> _Schemes;
|
|
};
|
|
|
|
struct Profiles : public HasScrollViewer<Profiles>, ProfilesT<Profiles>
|
|
{
|
|
public:
|
|
Profiles();
|
|
|
|
void OnNavigatedTo(const Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
|
|
void OnNavigatedFrom(const Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
|
|
|
|
// bell style bits
|
|
bool IsBellStyleFlagSet(const uint32_t flag);
|
|
void SetBellStyleAudible(winrt::Windows::Foundation::IReference<bool> on);
|
|
void SetBellStyleWindow(winrt::Windows::Foundation::IReference<bool> on);
|
|
void SetBellStyleTaskbar(winrt::Windows::Foundation::IReference<bool> on);
|
|
|
|
fire_and_forget Commandline_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
fire_and_forget StartingDirectory_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
fire_and_forget Icon_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
void DeleteConfirmation_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
void Pivot_SelectionChanged(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
void CreateUnfocusedAppearance_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
void DeleteUnfocusedAppearance_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
|
|
WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
|
|
|
|
WINRT_PROPERTY(Editor::ProfilePageNavigationState, State, nullptr);
|
|
GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, State().Profile, AntialiasingMode);
|
|
GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, State().Profile, CloseOnExit);
|
|
GETSET_BINDABLE_ENUM_SETTING(ScrollState, Microsoft::Terminal::Control::ScrollbarState, State().Profile, ScrollState);
|
|
|
|
private:
|
|
void _UpdateBIAlignmentControl(const int32_t val);
|
|
|
|
std::array<Windows::UI::Xaml::Controls::Primitives::ToggleButton, 9> _BIAlignmentButtons;
|
|
Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ViewModelChangedRevoker;
|
|
Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _AppearanceViewModelChangedRevoker;
|
|
|
|
Microsoft::Terminal::Control::TermControl _previewControl;
|
|
};
|
|
};
|
|
|
|
namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
|
|
{
|
|
BASIC_FACTORY(Profiles);
|
|
}
|