Skip to content

Commit fed711a

Browse files
committed
Show configuration based on feature
modified: src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp modified: src/cascadia/TerminalSettingsEditor/ProfileViewModel.h modified: src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl modified: src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml
1 parent 756a006 commit fed711a

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
168168

169169
_parsedPadding = StringToXamlThickness(_profile.Padding());
170170
_defaultAppearanceViewModel.IsDefault(true);
171+
172+
if constexpr (Feature_TmuxControl::IsEnabled())
173+
{
174+
TmuxControlEnabled(true);
175+
}
171176
}
172177

173178
void ProfileViewModel::_UpdateBuiltInIcons()

src/cascadia/TerminalSettingsEditor/ProfileViewModel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
164164

165165
WINRT_PROPERTY(bool, IsBaseLayer, false);
166166
WINRT_PROPERTY(bool, FocusDeleteButton, false);
167+
WINRT_PROPERTY(bool, TmuxControlEnabled, false);
167168
WINRT_PROPERTY(Windows::Foundation::Collections::IVector<Windows::Foundation::IInspectable>, IconTypes);
168169
GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode);
169170
GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, CloseOnExit);

src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ namespace Microsoft.Terminal.Settings.Editor
116116
Boolean UsingBuiltInIcon { get; };
117117
Boolean UsingEmojiIcon { get; };
118118
Boolean UsingImageIcon { get; };
119+
Boolean TmuxControlEnabled;
119120

120121
IInspectable CurrentBuiltInIcon;
121122
Windows.Foundation.Collections.IVector<IInspectable> BuiltInIcons { get; };

src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282

8383
<!-- Allow Tmux Control -->
8484
<local:SettingContainer x:Uid="Profile_AllowTmuxControl"
85+
Visibility="{x:Bind Profile.TmuxControlEnabled}"
8586
ClearSettingValue="{x:Bind Profile.ClearAllowTmuxControl}"
8687
HasSettingValue="{x:Bind Profile.HasAllowTmuxControl, Mode=OneWay}"
8788
SettingOverrideSource="{x:Bind Profile.AllowTmuxControlOverrideSource, Mode=OneWay}">

0 commit comments

Comments
 (0)