From 824b2cae18b7789f61cfae90969fa574fa5ce6b1 Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@mit.edu>
Date: Mon, 15 May 2017 18:04:50 -0400
Subject: [PATCH] Make flyouts hide the parent workspace's scrollbars

---
 core/flyout.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/flyout.js b/core/flyout.js
index 3df8eff0e..0df05b16e 100644
--- a/core/flyout.js
+++ b/core/flyout.js
@@ -721,6 +721,7 @@ Blockly.Flyout.prototype.hide = function() {
   if (!this.isVisible()) {
     return;
   }
+  Blockly.mainWorkspace.scrollbar.setContainerVisible(true);
   this.setVisible(false);
   // Delete all the event listeners.
   for (var x = 0, listen; listen = this.listeners_[x]; x++) {
@@ -741,6 +742,7 @@ Blockly.Flyout.prototype.hide = function() {
  *     Variables and procedures have a custom set of blocks.
  */
 Blockly.Flyout.prototype.show = function(xmlList) {
+  Blockly.mainWorkspace.scrollbar.setContainerVisible(false);  // hide parent's scrollbars
   this.workspace_.setResizesEnabled(false);
   this.hide();
   this.clearOldBlocks_();