github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to ControlTemplate name for the OverflowTextBlock

Browse source 
There are other problems arising from these changes (ListView cast is failing), this isn't ready for merging yet.
This commit is contained in:
Lance McCarthy 2019-03-10 00:24:09 -05:00
commit 48abffd2b7
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Calculator/Controls/OverflowTextBlock.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. // Licensed under the MIT License.
#include "pch.h" #include "pch.h"
@ -32,7 +32,7 @@ void OverflowTextBlock::OnApplyTemplate()
{ {
assert(((m_scrollLeft == nullptr) && (m_scrollRight == nullptr)) || ((m_scrollLeft != nullptr) && (m_scrollRight != nullptr))); assert(((m_scrollLeft == nullptr) && (m_scrollRight == nullptr)) || ((m_scrollLeft != nullptr) && (m_scrollRight != nullptr)));
m_expressionContainer = safe_cast<ScrollViewer^>(GetTemplateChild("expressionContainer")); m_expressionContainer = safe_cast<ScrollViewer^>(GetTemplateChild("ExpressionContainer"));
m_expressionContainer->ChangeView(m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth, nullptr, nullptr); m_expressionContainer->ChangeView(m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth, nullptr, nullptr);
m_scrollLeft = safe_cast<Button^>(GetTemplateChild("ScrollLeft")); m_scrollLeft = safe_cast<Button^>(GetTemplateChild("ScrollLeft"));
@ -44,7 +44,7 @@ void OverflowTextBlock::OnApplyTemplate()
m_scrollingLeft = false; m_scrollingLeft = false;
m_scrollingRight = false; m_scrollingRight = false;
auto borderContainer = safe_cast<Border^>(GetTemplateChild("expressionborder")); auto borderContainer = safe_cast<Border^>(GetTemplateChild("Expressionborder"));
m_pointerEnteredEventToken = borderContainer->PointerEntered += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerEntered); m_pointerEnteredEventToken = borderContainer->PointerEntered += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerEntered);
m_pointerExitedEventToken = borderContainer->PointerExited += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerExited); m_pointerExitedEventToken = borderContainer->PointerExited += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerExited);
@ -199,7 +199,7 @@ void OverflowTextBlock::UnregisterEventHandlers()
m_scrollRight->Click -= m_scrollRightClickEventToken; m_scrollRight->Click -= m_scrollRightClickEventToken;
} }
auto borderContainer = safe_cast<Border^>(GetTemplateChild("expressionborder")); auto borderContainer = safe_cast<Border^>(GetTemplateChild("Expressionborder"));
// Adding an extra check, in case the returned template is null // Adding an extra check, in case the returned template is null
if (borderContainer != nullptr) if (borderContainer != nullptr)