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

Fix graph dark colors at launch (#1217)

Browse Source
This commit is contained in:
Rudy Huyn 2020-05-15 10:44:50 -07:00 committed by GitHub
parent 0f14e4f46e
commit 80fbe891d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
View File

@ -590,7 +590,6 @@
IsKeepCurrentView="{x:Bind IsManualAdjustment, Mode=TwoWay}" IsKeepCurrentView="{x:Bind IsManualAdjustment, Mode=TwoWay}"
LosingFocus="GraphingControl_LosingFocus" LosingFocus="GraphingControl_LosingFocus"
LostFocus="GraphingControl_LostFocus" LostFocus="GraphingControl_LostFocus"
RequestedTheme="Light"
UseSystemFocusVisuals="True" UseSystemFocusVisuals="True"
VariablesUpdated="GraphingControl_VariablesUpdated"> VariablesUpdated="GraphingControl_VariablesUpdated">
<graphControl:Grapher.ContextFlyout> <graphControl:Grapher.ContextFlyout>

26
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
View File

@ -78,6 +78,8 @@ GraphingCalculator::GraphingCalculator()
// Update where the pointer value is (ie: where the user cursor from keyboard inputs moves the point to) // Update where the pointer value is (ie: where the user cursor from keyboard inputs moves the point to)
GraphingControl->PointerValueChangedEvent += ref new PointerValueChangedEventHandler(this, &GraphingCalculator::OnPointerPointChanged); GraphingControl->PointerValueChangedEvent += ref new PointerValueChangedEventHandler(this, &GraphingCalculator::OnPointerPointChanged);
m_GraphingControlLoadedToken = GraphingControl->Loaded += ref new RoutedEventHandler(this, &GraphingCalculator::OnGraphingCalculatorLoaded);
GraphingControl->UseCommaDecimalSeperator = LocalizationSettings::GetInstance().GetDecimalSeparator() == ','; GraphingControl->UseCommaDecimalSeperator = LocalizationSettings::GetInstance().GetDecimalSeparator() == ',';
// OemMinus and OemAdd aren't declared in the VirtualKey enum, we can't add this accelerator XAML-side // OemMinus and OemAdd aren't declared in the VirtualKey enum, we can't add this accelerator XAML-side
@ -118,8 +120,6 @@ GraphingCalculator::GraphingCalculator()
IsMatchAppTheme = false; IsMatchAppTheme = false;
TraceLogger::GetInstance()->LogGraphTheme(L"IsAlwaysLightTheme"); TraceLogger::GetInstance()->LogGraphTheme(L"IsAlwaysLightTheme");
} }
UpdateGraphTheme();
} }
void GraphingCalculator::OnShowTracePopupChanged(bool newValue) void GraphingCalculator::OnShowTracePopupChanged(bool newValue)
@ -460,7 +460,7 @@ void GraphingCalculator::GraphingControl_LostFocus(Object ^ sender, RoutedEventA
{ {
if (ActiveTracing->Equals(FocusManager::GetFocusedElement()) && ActiveTracing->IsPressed) if (ActiveTracing->Equals(FocusManager::GetFocusedElement()) && ActiveTracing->IsPressed)
{ {
m_ActiveTracingPointerCaptureLost = ActiveTracing->PointerCaptureLost += m_ActiveTracingPointerCaptureLostToken = ActiveTracing->PointerCaptureLost +=
ref new Windows::UI::Xaml::Input::PointerEventHandler(this, &CalculatorApp::GraphingCalculator::ActiveTracing_PointerCaptureLost); ref new Windows::UI::Xaml::Input::PointerEventHandler(this, &CalculatorApp::GraphingCalculator::ActiveTracing_PointerCaptureLost);
} }
else else
@ -473,10 +473,10 @@ void GraphingCalculator::GraphingControl_LostFocus(Object ^ sender, RoutedEventA
void CalculatorApp::GraphingCalculator::ActiveTracing_PointerCaptureLost(Platform::Object ^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs ^ e) void CalculatorApp::GraphingCalculator::ActiveTracing_PointerCaptureLost(Platform::Object ^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs ^ e)
{ {
if (m_ActiveTracingPointerCaptureLost.Value != 0) if (m_ActiveTracingPointerCaptureLostToken.Value != 0)
{ {
ActiveTracing->PointerCaptureLost -= m_ActiveTracingPointerCaptureLost; ActiveTracing->PointerCaptureLost -= m_ActiveTracingPointerCaptureLostToken;
m_ActiveTracingPointerCaptureLost.Value = 0; m_ActiveTracingPointerCaptureLostToken.Value = 0;
} }
if (GraphingControl->ActiveTracing) if (GraphingControl->ActiveTracing)
@ -613,10 +613,10 @@ void CalculatorApp::GraphingCalculator::ActiveTracing_Checked(Platform::Object ^
void CalculatorApp::GraphingCalculator::ActiveTracing_Unchecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e) void CalculatorApp::GraphingCalculator::ActiveTracing_Unchecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
{ {
if (m_ActiveTracingPointerCaptureLost.Value != 0) if (m_ActiveTracingPointerCaptureLostToken.Value != 0)
{ {
ActiveTracing->PointerCaptureLost -= m_ActiveTracingPointerCaptureLost; ActiveTracing->PointerCaptureLost -= m_ActiveTracingPointerCaptureLostToken;
m_ActiveTracingPointerCaptureLost.Value = 0; m_ActiveTracingPointerCaptureLostToken.Value = 0;
} }
if (m_activeTracingKeyUpToken.Value != 0) if (m_activeTracingKeyUpToken.Value != 0)
@ -856,3 +856,11 @@ void GraphingCalculator::GraphViewButton_Click(Object ^ sender, RoutedEventArgs
TraceLogger::GetInstance()->LogGraphButtonClicked( TraceLogger::GetInstance()->LogGraphButtonClicked(
GraphButton::GraphView, IsManualAdjustment ? GraphButtonValue::ManualAdjustment : GraphButtonValue::AutomaticBestFit); GraphButton::GraphView, IsManualAdjustment ? GraphButtonValue::ManualAdjustment : GraphButtonValue::AutomaticBestFit);
} }
void CalculatorApp::GraphingCalculator::OnGraphingCalculatorLoaded(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
{
this->GraphingControl->Loaded -= m_GraphingControlLoadedToken;
// The control needs to be loaded, else the control will override GridLinesColor and ignore the value passed
UpdateGraphTheme();
}

4
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.h
View File

@ -92,7 +92,8 @@ public ref class GraphingCalculator sealed : public Windows::UI::Xaml::Data::INo
Windows::Foundation::EventRegistrationToken m_vectorChangedToken; Windows::Foundation::EventRegistrationToken m_vectorChangedToken;
Windows::Foundation::EventRegistrationToken m_variableUpdatedToken; Windows::Foundation::EventRegistrationToken m_variableUpdatedToken;
Windows::Foundation::EventRegistrationToken m_activeTracingKeyUpToken; Windows::Foundation::EventRegistrationToken m_activeTracingKeyUpToken;
Windows::Foundation::EventRegistrationToken m_ActiveTracingPointerCaptureLost; Windows::Foundation::EventRegistrationToken m_ActiveTracingPointerCaptureLostToken;
Windows::Foundation::EventRegistrationToken m_GraphingControlLoadedToken;
CalculatorApp::ViewModel::GraphingCalculatorViewModel ^ m_viewModel; CalculatorApp::ViewModel::GraphingCalculatorViewModel ^ m_viewModel;
Windows::UI::ViewManagement::AccessibilitySettings ^ m_accessibilitySettings; Windows::UI::ViewManagement::AccessibilitySettings ^ m_accessibilitySettings;
bool m_cursorShadowInitialized; bool m_cursorShadowInitialized;
@ -107,6 +108,7 @@ public ref class GraphingCalculator sealed : public Windows::UI::Xaml::Data::INo
std::wstringstream FormatTraceValue(double min, double max, float pointValue); std::wstringstream FormatTraceValue(double min, double max, float pointValue);
void GraphViewButton_Click(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); void GraphViewButton_Click(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
void ShowShareError(); void ShowShareError();
void OnGraphingCalculatorLoaded(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
}; };
} }