Remove preview tag from graphing mode (#1285)

* Remove preview tag

* Remove preview tag

* fix bug

src/CalcViewModel/ApplicationViewModel.cpp

@@ -58,7 +58,6 @@ void ApplicationViewModel::Mode::set(ViewMode value)
     {
         PreviousMode = m_mode;
         m_mode = value;
-        IsModePreview = NavCategory::IsViewModePreview(m_mode);
         SetDisplayNormalAlwaysOnTopOption();
         OnModeChanged();
         RaisePropertyChanged(ModePropertyName);

src/CalcViewModel/ApplicationViewModel.h

@@ -26,7 +26,6 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(UnitConverterViewModel ^, ConverterViewModel);
             OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, PreviousMode);
             OBSERVABLE_PROPERTY_R(bool, IsAlwaysOnTop);
-            OBSERVABLE_PROPERTY_R(bool, IsModePreview);
             OBSERVABLE_NAMED_PROPERTY_RW(Platform::String ^, CategoryName);
 
             // Indicates whether calculator is currently in standard mode _and_ supports CompactOverlay _and_ is not in Always-on-Top mode

src/CalcViewModel/Common/NavCategory.cpp

@@ -118,8 +118,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                                                      MyVirtualKey::Number1,
                                                                      L"1",
                                                                      SUPPORTS_ALL,
-                                                                     true,
+                                                                     true },
-                                                                     false },
                                              NavCategoryInitializer{ ViewMode::Scientific,
                                                                      SCIENTIFIC_ID,
                                                                      L"Scientific",
@@ -129,8 +128,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                                                      MyVirtualKey::Number2,
                                                                      L"2",
                                                                      SUPPORTS_ALL,
-                                                                     true,
+                                                                     true } };
-                                                                     false } };
 
     int currentIndex = 3;
     bool supportGraphingCalculator = IsGraphingModeAvailable();
@@ -146,8 +144,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                               MyVirtualKey::Number3,
                                               L"3",
                                               SUPPORTS_ALL,
-                                              isEnabled,
+                                              isEnabled });
-                                              true });
         ++currentIndex;
     }
     res.insert(
@@ -161,8 +158,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   supportGraphingCalculator ? MyVirtualKey::Number4 : MyVirtualKey::Number3,
                                   towchar_t(currentIndex++),
                                   SUPPORTS_ALL,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Date,
                                   DATE_ID,
                                   L"Date",
@@ -172,8 +168,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   supportGraphingCalculator ? MyVirtualKey::Number5 : MyVirtualKey::Number4,
                                   towchar_t(currentIndex++),
                                   SUPPORTS_ALL,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Currency,
                                   CURRENCY_ID,
                                   L"Currency",
@@ -183,8 +178,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Volume,
                                   VOLUME_ID,
                                   L"Volume",
@@ -194,8 +188,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Length,
                                   LENGTH_ID,
                                   L"Length",
@@ -205,8 +198,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Weight,
                                   WEIGHT_ID,
                                   L"Weight and Mass",
@@ -216,8 +208,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Temperature,
                                   TEMPERATURE_ID,
                                   L"Temperature",
@@ -227,8 +218,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   SUPPORTS_NEGATIVE,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Energy,
                                   ENERGY_ID,
                                   L"Energy",
@@ -238,8 +228,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Area,
                                   AREA_ID,
                                   L"Area",
@@ -249,8 +238,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Speed,
                                   SPEED_ID,
                                   L"Speed",
@@ -260,8 +248,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Time,
                                   TIME_ID,
                                   L"Time",
@@ -271,8 +258,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Power,
                                   POWER_ID,
                                   L"Power",
@@ -282,8 +268,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   SUPPORTS_NEGATIVE,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Data,
                                   DATA_ID,
                                   L"Data",
@@ -293,8 +278,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Pressure,
                                   PRESSURE_ID,
                                   L"Pressure",
@@ -304,8 +288,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   POSITIVE_ONLY,
-                                  true,
+                                  true },
-                                  false },
           NavCategoryInitializer{ ViewMode::Angle,
                                   ANGLE_ID,
                                   L"Angle",
@@ -315,8 +298,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   MyVirtualKey::None,
                                   nullptr,
                                   SUPPORTS_NEGATIVE,
-                                  true,
+                                  true } });
-                                  false } });
     return res;
 }();
 
@@ -540,8 +522,7 @@ NavCategoryGroup::NavCategoryGroup(const NavCategoryGroupInitializer& groupIniti
                 groupMode,
                 categoryInitializer.viewMode,
                 categoryInitializer.supportsNegative,
-                categoryInitializer.isEnabled,
+                categoryInitializer.isEnabled));
-                categoryInitializer.isPreview));
         }
     }
 }
@@ -565,15 +546,3 @@ NavCategoryGroup ^ NavCategoryGroup::CreateConverterCategory()
     return ref new NavCategoryGroup(
         NavCategoryGroupInitializer{ CategoryGroupType::Converter, L"ConverterModeTextCaps", L"ConverterModeText", L"ConverterModePluralText" });
 }
-
-bool NavCategory::IsViewModePreview(ViewMode mode)
-{
-    auto iter =
-        find_if(begin(s_categoryManifest), end(s_categoryManifest), [mode](const NavCategoryInitializer& initializer) { return initializer.viewMode == mode; });
-
-    if (iter != s_categoryManifest.end())
-    {
-        return iter->isPreview;
-    }
-    return false;
-}

src/CalcViewModel/Common/NavCategory.h

@@ -69,8 +69,7 @@ namespace CalculatorApp
                 MyVirtualKey vKey,
                 wchar_t const* aKey,
                 bool categorySupportsNegative,
-                bool enabled,
+                bool enabled)
-                bool isPreview)
                 : viewMode(mode)
                 , serializationId(id)
                 , friendlyName(name)
@@ -81,7 +80,6 @@ namespace CalculatorApp
                 , accessKey(aKey)
                 , supportsNegative(categorySupportsNegative)
                 , isEnabled(enabled)
-                , isPreview(isPreview)
             {
             }
 
@@ -95,7 +93,6 @@ namespace CalculatorApp
             const wchar_t* const accessKey;
             const bool supportsNegative;
             const bool isEnabled;
-            const bool isPreview;
         };
 
     private
@@ -126,7 +123,6 @@ namespace CalculatorApp
             PROPERTY_R(Platform::String ^, AccessKey);
             PROPERTY_R(bool, SupportsNegative);
             PROPERTY_R(bool, IsEnabled);
-            PROPERTY_R(bool, IsPreview);
 
             property Platform::String
                 ^ AutomationId { Platform::String ^ get() { return m_Mode.ToString(); } }
@@ -142,7 +138,7 @@ namespace CalculatorApp
             static bool IsGraphingCalculatorViewMode(ViewMode mode);
             static bool IsDateCalculatorViewMode(ViewMode mode);
             static bool IsConverterViewMode(ViewMode mode);
-            static bool IsViewModePreview(ViewMode mode);
+
             static Platform::String ^ GetFriendlyName(ViewMode mode);
             static Platform::String ^ GetNameResourceKey(ViewMode mode);
             static CategoryGroupType GetGroupType(ViewMode mode);
@@ -163,8 +159,7 @@ namespace CalculatorApp
                            Platform::String ^ mode,
                            ViewMode viewMode,
                            bool supportsNegative,
-                           bool isEnabled,
+                           bool isEnabled)
-                           bool isPreview)
                 : m_Name(name)
                 , m_AutomationName(automationName)
                 , m_Glyph(glyph)
@@ -173,7 +168,6 @@ namespace CalculatorApp
                 , m_Mode(viewMode)
                 , m_SupportsNegative(supportsNegative)
                 , m_IsEnabled(isEnabled)
-                , m_IsPreview(isPreview)
             {
             }
 

src/Calculator/Calculator.vcxproj

@@ -247,9 +247,6 @@
     <ClInclude Include="Controls\CalculatorButton.h" />
     <ClInclude Include="Controls\FlipButtons.h" />
     <ClInclude Include="Controls\OverflowTextBlock.h" />
-    <ClInclude Include="Controls\PreviewTagControl.xaml.h">
-      <DependentUpon>Controls\PreviewTagControl.xaml</DependentUpon>
-    </ClInclude>
     <ClInclude Include="Controls\RadixButton.h" />
     <ClInclude Include="Controls\SupplementaryItemsControl.h" />
     <ClInclude Include="Converters\BooleanNegationConverter.h" />
@@ -350,9 +347,6 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Page Include="AboutFlyout.xaml" />
-    <Page Include="Controls\PreviewTagControl.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="EquationStylePanelControl.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -415,9 +409,6 @@
     <ClCompile Include="Controls\CalculatorButton.cpp" />
     <ClCompile Include="Controls\FlipButtons.cpp" />
     <ClCompile Include="Controls\OverflowTextBlock.cpp" />
-    <ClCompile Include="Controls\PreviewTagControl.xaml.cpp">
-      <DependentUpon>Controls\PreviewTagControl.xaml</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Controls\RadixButton.cpp" />
     <ClCompile Include="Controls\SupplementaryItemsControl.cpp" />
     <ClCompile Include="Converters\BooleanNegationConverter.cpp" />

src/Calculator/Controls/PreviewTagControl.xaml

@@ -1,57 +0,0 @@
-<UserControl x:Class="CalculatorApp.Controls.PreviewTagControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DesignHeight="300"
-             d:DesignWidth="400"
-             mc:Ignorable="d">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <Style x:Key="PreviewTagRectStyle" TargetType="Rectangle">
-                        <Setter Property="Opacity" Value="0.86"/>
-                        <Setter Property="Fill" Value="{ThemeResource SystemAccentColor}"/>
-                    </Style>
-                    <Style x:Key="PreviewTagTextStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="White"/>
-                        <Setter Property="FontSize" Value="11"/>
-                        <Setter Property="Margin" Value="4,0,4,1"/>
-                    </Style>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <Style x:Key="PreviewTagRectStyle" TargetType="Rectangle">
-                        <Setter Property="Opacity" Value="0.86"/>
-                        <Setter Property="Fill" Value="{ThemeResource SystemAccentColor}"/>
-                    </Style>
-                    <Style x:Key="PreviewTagTextStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="White"/>
-                        <Setter Property="FontSize" Value="11"/>
-                        <Setter Property="Margin" Value="4,0,4,1"/>
-                    </Style>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <Style x:Key="PreviewTagRectStyle" TargetType="Rectangle">
-                        <Setter Property="Fill" Value="{ThemeResource SystemColorWindowBrush}"/>
-                        <Setter Property="Stroke" Value="{ThemeResource SystemColorWindowTextBrush}"/>
-                        <Setter Property="StrokeThickness" Value="1"/>
-                    </Style>
-                    <Style x:Key="PreviewTagTextStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemColorWindowTextBrush}"/>
-                        <Setter Property="FontSize" Value="14"/>
-                        <Setter Property="Margin" Value="6,2,6,3"/>
-                    </Style>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid>
-        <Rectangle Style="{ThemeResource PreviewTagRectStyle}"
-                   RadiusX="2"
-                   RadiusY="2"/>
-        <TextBlock x:Uid="PreviewTag"
-                   Style="{ThemeResource PreviewTagTextStyle}"
-                   FontWeight="SemiBold"/>
-    </Grid>
-</UserControl>

src/Calculator/Controls/PreviewTagControl.xaml.cpp

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "PreviewTagControl.xaml.h"
-
-using namespace CalculatorApp;
-using namespace CalculatorApp::Controls;
-using namespace Platform;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Controls::Primitives;
-using namespace Windows::UI::Xaml::Data;
-using namespace Windows::UI::Xaml::Input;
-using namespace Windows::UI::Xaml::Media;
-using namespace Windows::UI::Xaml::Navigation;
-
-PreviewTagControl::PreviewTagControl()
-{
-	InitializeComponent();
-}

src/Calculator/Controls/PreviewTagControl.xaml.h

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "Controls\PreviewTagControl.g.h"
-
-namespace CalculatorApp::Controls
-{
-	[Windows::Foundation::Metadata::WebHostHidden]
-	public ref class PreviewTagControl sealed
-	{
-	public:
-		PreviewTagControl();
-	};
-}

src/Calculator/Views/MainPage.xaml

@@ -39,13 +39,6 @@
             <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings"/>
         </Style>
 
-        <DataTemplate x:Key="NavMenuItemPreviewDataTemplate" x:DataType="x:String">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock VerticalAlignment="Center" Text="{x:Bind}"/>
-                <controls:PreviewTagControl Margin="10,0,0,0" VerticalAlignment="Center"/>
-            </StackPanel>
-        </DataTemplate>
-
         <converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
         <converters:BooleanNegationConverter x:Key="BooleanNegationConverter"/>
     </Page.Resources>
@@ -128,20 +121,15 @@
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
-            <StackPanel Grid.Column="1"
+            <TextBlock x:Name="Header"
-                        Margin="8,0,0,0"
+                       Grid.Column="1"
-                        Orientation="Horizontal">
+                       Margin="8,-3,0,0"
-                <TextBlock x:Name="Header"
+                       HorizontalAlignment="Left"
-                           Margin="0,-3,0,0"
+                       VerticalAlignment="Center"
-                           HorizontalAlignment="Left"
+                       Style="{StaticResource CategoryNameTextBlockStyle}"
-                           VerticalAlignment="Center"
+                       Text="{x:Bind Model.CategoryName, Mode=OneWay}"
-                           Style="{StaticResource CategoryNameTextBlockStyle}"
+                       Visibility="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
-                           Text="{x:Bind Model.CategoryName, Mode=OneWay}"
+
-                           Visibility="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
-                <controls:PreviewTagControl Margin="10,0,0,0"
-                                            VerticalAlignment="Center"
-                                            Visibility="{x:Bind Model.IsModePreview, Mode=OneWay}"/>
-            </StackPanel>
             <Button x:Name="NormalAlwaysOnTopButton"
                     x:Uid="EnterAlwaysOnTopButton"
                     Grid.Column="2"
@@ -168,7 +156,6 @@
                              DataContext="{x:Bind Model}"
                              ExpandedModeThresholdWidth="Infinity"
                              IsBackButtonVisible="Collapsed"
-                             IsEnabled="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanNegationConverter}, Mode=OneWay}"
                              IsPaneToggleButtonVisible="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanNegationConverter}, Mode=OneWay}"
                              IsSettingsVisible="False"
                              ItemInvoked="OnNavItemInvoked"
@@ -181,6 +168,7 @@
                              SelectionChanged="OnNavSelectionChanged"
                              TabIndex="1"
                              UseSystemFocusVisuals="True"
+                             IsEnabled="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanNegationConverter}, Mode=OneWay}"
                              x:Load="False">
 
             <muxc:NavigationView.PaneFooter>

src/Calculator/Views/MainPage.xaml.cpp

@@ -497,17 +497,7 @@ MUXC::NavigationViewItem ^ MainPage::CreateNavViewItemFromCategory(NavCategory ^
     icon->Glyph = category->Glyph;
     item->Icon = icon;
 
-    if (category->IsPreview)
+    item->Content = category->Name;
-    {
-        auto contentPresenter = ref new ContentPresenter();
-        contentPresenter->Content = category->Name;
-        contentPresenter->ContentTemplate = static_cast<DataTemplate ^>(Resources->Lookup(L"NavMenuItemPreviewDataTemplate"));
-        item->Content = contentPresenter;
-    }
-    else
-    {
-        item->Content = category->Name;
-    }
     item->AccessKey = category->AccessKey;
     item->IsEnabled = category->IsEnabled;
     item->Style = static_cast<Windows::UI::Xaml::Style ^>(Resources->Lookup(L"NavViewItemStyle"));