From dcb27c38d714758bd1ce022ef8cb89b5be25cc18 Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 2 Dec 2016 17:24:09 -0300 Subject: [PATCH] Don't update brush size/angle fields when we're editing them --- src/app/ui/context_bar.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp index 8319d2af6..61870fdf7 100644 --- a/src/app/ui/context_bar.cpp +++ b/src/app/ui/context_bar.cpp @@ -1547,7 +1547,8 @@ void ContextBar::updateForTool(tools::Tool* tool) // target to implement this new IContextBarUser and ask for // ContextBar elements. - base::ScopedValue lockFlag(g_updatingFromCode, true, g_updatingFromCode); + const bool oldUpdatingFromCode = g_updatingFromCode; + base::ScopedValue lockFlag(g_updatingFromCode, true, oldUpdatingFromCode); ToolPreferences* toolPref = nullptr; ToolPreferences::Brush* brushPref = nullptr; @@ -1569,8 +1570,10 @@ void ContextBar::updateForTool(tools::Tool* tool) m_brushType->updateBrush(tool); if (brushPref) { - m_brushSize->setTextf("%d", brushPref->size()); - m_brushAngle->setTextf("%d", brushPref->angle()); + if (!oldUpdatingFromCode) { + m_brushSize->setTextf("%d", brushPref->size()); + m_brushAngle->setTextf("%d", brushPref->angle()); + } } m_brushPatternField->setBrushPattern(