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
10 changed files with 33 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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