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

Ensure element presence is checked prior to its use (#1715)

Browse source
This commit is contained in:
Michał Janiszewski 2021-10-18 20:14:04 -07:00 • committed by GitHub
commit 82c4c9a227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Calculator/Controls/OverflowTextBlock.cs
View file

@ -141,7 +141,7 @@ namespace CalculatorApp
public void UpdateScrollButtons()
{
if (m_expressionContainer == null || m_scrollLeft == null || m_scrollRight == null)
if (m_expressionContent == null || m_expressionContainer == null || m_scrollLeft == null || m_scrollRight == null)
{
return;
}
@ -307,13 +307,16 @@ namespace CalculatorApp
private void ScrollRight()
{
var realOffset = m_expressionContainer.HorizontalOffset + m_expressionContainer.Padding.Left + m_expressionContent.Margin.Left;
if (m_expressionContainer != null && realOffset + m_expressionContainer.ActualWidth < m_expressionContent.ActualWidth)
if (m_expressionContainer != null && m_expressionContent != null)
{
double offset = m_expressionContainer.HorizontalOffset + (SCROLL_RATIO * m_expressionContainer.ViewportWidth);
m_expressionContainer.ChangeView(offset, null, null);
m_expressionContainer.UpdateLayout();
UpdateScrollButtons();
var realOffset = m_expressionContainer.HorizontalOffset + m_expressionContainer.Padding.Left + m_expressionContent.Margin.Left;
if (realOffset + m_expressionContainer.ActualWidth < m_expressionContent.ActualWidth)
{
double offset = m_expressionContainer.HorizontalOffset + (SCROLL_RATIO * m_expressionContainer.ViewportWidth);
m_expressionContainer.ChangeView(offset, null, null);
m_expressionContainer.UpdateLayout();
UpdateScrollButtons();
}
}
}