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

force a call to m_expressionContainer->Measure in UpdateScrollButtons (#750)

Browse source
This commit is contained in:
Rudy Huyn 2019-11-11 16:23:30 -08:00 • committed by Pepe Rivera
commit 61c2d07a89
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,6 +197,7 @@ void OverflowTextBlock::UpdateScrollButtons()
m_expressionContainer->Padding = Thickness(left, 0, right, 0);
m_expressionContent->Margin = Thickness(-left, 0, -right, 0);
m_expressionContainer->UpdateLayout();
m_expressionContainer->Measure(m_expressionContainer->RenderSize);
m_containerViewChangedToken = m_expressionContainer->ViewChanged +=
ref new EventHandler<ScrollViewerViewChangedEventArgs ^>(this, &OverflowTextBlock::OnViewChanged);

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

@ -21,6 +21,13 @@ namespace CalculatorApp
{
public:
OverflowTextBlock()
: m_isAccessibilityViewControl(false)
, m_ignoreViewChanged(false)
, m_expressionContent(nullptr)
, m_itemsControl(nullptr)
, m_expressionContainer(nullptr)
, m_scrollLeft(nullptr)
, m_scrollRight(nullptr)
{
}
@ -52,6 +59,7 @@ namespace CalculatorApp
void ScrollRight();
bool m_isAccessibilityViewControl;
bool m_ignoreViewChanged;
Windows::UI::Xaml::FrameworkElement ^ m_expressionContent;
Windows::UI::Xaml::Controls::ItemsControl ^ m_itemsControl;
Windows::UI::Xaml::Controls::ScrollViewer ^ m_expressionContainer;