From 78a09bdfc63751de61e426bbabd524c627d349f3 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Thu, 4 Feb 2021 19:21:57 +0000
Subject: [PATCH] DemoRunner:  Use Display::safeAreaInsets to position demo
 content

---
 examples/DemoRunner/Source/UI/MainComponent.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/examples/DemoRunner/Source/UI/MainComponent.cpp b/examples/DemoRunner/Source/UI/MainComponent.cpp
index c0f56b6cdc..173fc12b24 100644
--- a/examples/DemoRunner/Source/UI/MainComponent.cpp
+++ b/examples/DemoRunner/Source/UI/MainComponent.cpp
@@ -313,14 +313,21 @@ void MainComponent::paint (Graphics& g)
 
 void MainComponent::resized()
 {
-    auto bounds = getLocalBounds();
+    auto safeBounds = [this]
+    {
+        auto bounds = getLocalBounds();
 
-    showDemosButton.setBounds (0, 0, 150, contentComponent->getTabBarDepth());
+        if (auto* display = Desktop::getInstance().getDisplays().getDisplayForRect (getScreenBounds()))
+            return display->safeAreaInsets.subtractedFrom (bounds);
+
+        return bounds;
+    }();
+
+    showDemosButton.setBounds (safeBounds.getX(), safeBounds.getY(), 150, contentComponent->getTabBarDepth());
 
     if (isShowingHeavyweightDemo)
     {
-        bounds.removeFromLeft (sidePanelWidth);
-
+        safeBounds.removeFromLeft (sidePanelWidth);
         contentComponent->setTabBarIndent (jmax (0, 150 - sidePanelWidth));
     }
     else
@@ -328,7 +335,7 @@ void MainComponent::resized()
         contentComponent->setTabBarIndent (150);
     }
 
-    contentComponent->setBounds (bounds);
+    contentComponent->setBounds (safeBounds);
 }
 
 void MainComponent::homeButtonClicked()