From 4f1a72ae1c3316a3ecbe0fa83bfff02f42bb224b Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Mon, 24 Oct 2022 12:38:27 -0700 Subject: [PATCH] Remove redundant tooltips from settings UI (#14244) This removes all of the redundant tooltips from the settings UI. Since all of the settings are added through the SettingsContainer, it's a pretty simple change. Closes #14184 - [X] hover over all settings in the settings UI - [X] hover over all entries in the SUI nav view (cherry picked from commit 3eaa781499f5af0094fbcbdea4fdcc839c7e1b2d) Service-Card-Id: 86390068 Service-Version: 1.15 --- .../TerminalSettingsEditor/MainPage.cpp | 2 -- .../Resources/en-US/Resources.resw | 28 ------------------- .../SettingContainer.cpp | 1 - 3 files changed, 31 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp index 2009502c569..c5f01e090bd 100644 --- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp +++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp @@ -502,7 +502,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation if (!profile.Deleted()) { auto navItem = _CreateProfileNavViewItem(_viewModelForProfile(profile, _settingsClone)); - Controls::ToolTipService::SetToolTip(navItem, box_value(profile.Name())); menuItems.Append(navItem); } } @@ -510,7 +509,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation // Top off (the end of the nav view) with the Add Profile item MUX::Controls::NavigationViewItem addProfileItem; addProfileItem.Content(box_value(RS_(L"Nav_AddNewProfile/Content"))); - Controls::ToolTipService::SetToolTip(addProfileItem, box_value(RS_(L"Nav_AddNewProfile/Content"))); addProfileItem.Tag(box_value(addProfileTag)); FontIcon icon; diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw index c7bd603816c..1f31721d8f2 100644 --- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw +++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw @@ -463,34 +463,18 @@ Appearance Header for the "appearance" menu item. This navigates to a page that lets you see and modify settings related to the app's appearance. - - Appearance - Tooltip for the "appearance" menu item. - Color schemes Header for the "color schemes" menu item. This navigates to a page that lets you see and modify schemes of colors that can be used by the terminal. - - Color schemes - Tooltip for the "color schemes" menu item. - Interaction Header for the "interaction" menu item. This navigates to a page that lets you see and modify settings related to the user's mouse and touch interactions with the app. - - Interaction - Tooltip for the "interaction" menu item. - Startup Header for the "startup" menu item. This navigates to a page that lets you see and modify settings related to the app's launch experience (i.e. screen position, mode, etc.) - - Startup - Tooltip for the "startup" menu item. - Open JSON file Header for a menu item. This opens the JSON file that is used to log the app's settings. @@ -499,26 +483,14 @@ Defaults Header for the "defaults" menu item. This navigates to a page that lets you see and modify settings that affect profiles. This is the lowest layer of profile settings that all other profile settings are based on. If a profile doesn't define a setting, this page is responsible for figuring out what that setting is supposed to be. - - Defaults - Tooltip for the "profile defaults" menu item. - Rendering Header for the "rendering" menu item. This navigates to a page that lets you see and modify settings related to the app's rendering of text in the terminal. - - Rendering - Tooltip for the "rendering" menu item. - Actions Header for the "actions" menu item. This navigates to a page that lets you see and modify commands, key bindings, and actions that can be done in the app. - - Actions - Tooltip for the "actions" menu item. - Background opacity Name for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque. diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp index 11ee518458a..ab82dece2fb 100644 --- a/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp +++ b/src/cascadia/TerminalSettingsEditor/SettingContainer.cpp @@ -153,7 +153,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation // apply help text as tooltip and full description (automation property) if (const auto& helpText{ HelpText() }; !helpText.empty()) { - Controls::ToolTipService::SetToolTip(base, box_value(helpText)); Automation::AutomationProperties::SetFullDescription(base, helpText); } }