Merge branch 'master' into strippedstripped1.1.10.2

Conflicts:
	packaging/debian/watch

1 files changed, 19 insertions, 0 deletions

diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index df21488a5..6d48da197 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -159,3 +159,22 @@ int ShortcutWindow::getTabIndex()
         return 0;
     return mTabs->getSelectedTabIndex();
 }
+
+void ShortcutWindow::widgetHidden(const gcn::Event &event)
+{
+    if (mItems)
+        mItems->widgetHidden(event);
+    if (mTabs)
+    {
+        ScrollArea *scroll = static_cast<ScrollArea*>(
+            mTabs->getCurrentWidget());
+        if (scroll)
+        {
+            ShortcutContainer *content = static_cast<ShortcutContainer*>(
+                scroll->getContent());
+
+            if (content)
+                content->widgetHidden(event);
+        }
+    }
+}