DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove preview tag from graphing mode (#1285)

Browse Source 
* Remove preview tag

* Remove preview tag

* fix bug
This commit is contained in:
Pepe Rivera 2020-06-23 13:06:23 -07:00 committed by GitHub
parent 76e33ef159
commit 876a7fe13c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 33 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CalcViewModel/ApplicationViewModel.cpp
View File

@ -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);

1
src/CalcViewModel/ApplicationViewModel.h
View File

@ -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

69
src/CalcViewModel/Common/NavCategory.cpp
View File

@ -118,8 +118,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::Number1,
L"1",
SUPPORTS_ALL,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Scientific,
SCIENTIFIC_ID,
L"Scientific",
@ -129,8 +128,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::Number2,
L"2",
SUPPORTS_ALL,
true,
false } };
true } };
int currentIndex = 3;
bool supportGraphingCalculator = IsGraphingModeAvailable();
@ -146,8 +144,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::Number3,
L"3",
SUPPORTS_ALL,
isEnabled,
true });
isEnabled });
++currentIndex;
}
res.insert(
@ -161,8 +158,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
supportGraphingCalculator ? MyVirtualKey::Number4 : MyVirtualKey::Number3,
towchar_t(currentIndex++),
SUPPORTS_ALL,
true,
false },
true },
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,
false },
true },
NavCategoryInitializer{ ViewMode::Currency,
CURRENCY_ID,
L"Currency",
@ -183,8 +178,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Volume,
VOLUME_ID,
L"Volume",
@ -194,8 +188,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Length,
LENGTH_ID,
L"Length",
@ -205,8 +198,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
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,
false },
true },
NavCategoryInitializer{ ViewMode::Temperature,
TEMPERATURE_ID,
L"Temperature",
@ -227,8 +218,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
SUPPORTS_NEGATIVE,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Energy,
ENERGY_ID,
L"Energy",
@ -238,8 +228,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Area,
AREA_ID,
L"Area",
@ -249,8 +238,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Speed,
SPEED_ID,
L"Speed",
@ -260,8 +248,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Time,
TIME_ID,
L"Time",
@ -271,8 +258,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Power,
POWER_ID,
L"Power",
@ -282,8 +268,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
SUPPORTS_NEGATIVE,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Data,
DATA_ID,
L"Data",
@ -293,8 +278,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Pressure,
PRESSURE_ID,
L"Pressure",
@ -304,8 +288,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
POSITIVE_ONLY,
true,
false },
true },
NavCategoryInitializer{ ViewMode::Angle,
ANGLE_ID,
L"Angle",
@ -315,8 +298,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
MyVirtualKey::None,
nullptr,
SUPPORTS_NEGATIVE,
true,
false } });
true } });
return res;
}();
@ -540,8 +522,7 @@ NavCategoryGroup::NavCategoryGroup(const NavCategoryGroupInitializer& groupIniti
groupMode,
categoryInitializer.viewMode,
categoryInitializer.supportsNegative,
categoryInitializer.isEnabled,
categoryInitializer.isPreview));
categoryInitializer.isEnabled));
}
}
}
@ -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;
}

12
src/CalcViewModel/Common/NavCategory.h
View File

@ -69,8 +69,7 @@ namespace CalculatorApp
MyVirtualKey vKey,
wchar_t const* aKey,
bool categorySupportsNegative,
bool enabled,
bool isPreview)
bool enabled)
: 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 isPreview)
bool isEnabled)
: 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)
{
}

9
src/Calculator/Calculator.vcxproj
View File

@ -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" />

57
src/Calculator/Controls/PreviewTagControl.xaml
View File

@ -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>

23
src/Calculator/Controls/PreviewTagControl.xaml.cpp
View File

@ -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();
}

16
src/Calculator/Controls/PreviewTagControl.xaml.h
View File

@ -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();
};
}

32
src/Calculator/Views/MainPage.xaml
View File

@ -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"
Margin="8,0,0,0"
Orientation="Horizontal">
<TextBlock x:Name="Header"
Margin="0,-3,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Style="{StaticResource CategoryNameTextBlockStyle}"
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>
<TextBlock x:Name="Header"
Grid.Column="1"
Margin="8,-3,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Style="{StaticResource CategoryNameTextBlockStyle}"
Text="{x:Bind Model.CategoryName, Mode=OneWay}"
Visibility="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
<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>

12
src/Calculator/Views/MainPage.xaml.cpp
View File

@ -497,17 +497,7 @@ MUXC::NavigationViewItem ^ MainPage::CreateNavViewItemFromCategory(NavCategory ^
icon->Glyph = category->Glyph;
item->Icon = icon;
if (category->IsPreview)
{
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->Content = category->Name;
item->AccessKey = category->AccessKey;
item->IsEnabled = category->IsEnabled;
item->Style = static_cast<Windows::UI::Xaml::Style ^>(Resources->Lookup(L"NavViewItemStyle"));