ComponentPeer: Add isShowing() member, which more closely matches exp…

…ected behaviour of Component::isShowing
Dave-Lowndes · Sep 18, 2024 · 555b667 · 555b667
1 parent 68d0ea9
commit 555b667
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 1 deletion.
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_Unity.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_Unity.cpp
@@ -273,6 +273,7 @@ class UnityPeer final : public ComponentPeer,
     //==============================================================================
     void setMinimised (bool) override                                 {}
     bool isMinimised() const override                                 { return false; }
+    bool isShowing() const override                                   { return true; }
     void setFullScreen (bool) override                                {}
     bool isFullScreen() const override                                { return false; }
     bool setAlwaysOnTop (bool) override                               { return false; }

diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp
@@ -343,7 +343,7 @@ bool Component::isShowing() const
         return parentComponent->isShowing();
 
     if (auto* peer = getPeer())
-        return ! peer->isMinimised();
+        return peer->isShowing();
 
     return false;
 }

diff --git a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm
@@ -465,6 +465,11 @@ bool isMinimised() const override
         return [window isMiniaturized];
     }
 
+    bool isShowing() const override
+    {
+        return [window isVisible] && ! isMinimised();
+    }
+
     NSWindowCollectionBehavior getCollectionBehavior (bool forceFullScreen) const
     {
         if (forceFullScreen)

diff --git a/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm b/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm
@@ -408,6 +408,7 @@ void setViewController (UIViewController* newController) override
     void setAlpha (float newAlpha) override;
     void setMinimised (bool) override                         {}
     bool isMinimised() const override                         { return false; }
+    bool isShowing() const override                           { return true; }
     void setFullScreen (bool shouldBeFullScreen) override;
     bool isFullScreen() const override                        { return fullScreen; }
     bool contains (Point<int> localPos, bool trueIfInAChildWindow) const override;

diff --git a/modules/juce_gui_basics/native/juce_Windowing_android.cpp b/modules/juce_gui_basics/native/juce_Windowing_android.cpp
@@ -1462,6 +1462,11 @@ class AndroidComponentPeer final : public ComponentPeer,
         return false;
     }
 
+    bool isShowing() const override
+    {
+        return true;
+    }
+
     void setFullScreen (bool shouldBeFullScreen) override
     {
         if (shouldNavBarsBeHidden (shouldBeFullScreen))

diff --git a/modules/juce_gui_basics/native/juce_Windowing_linux.cpp b/modules/juce_gui_basics/native/juce_Windowing_linux.cpp
@@ -204,6 +204,11 @@ class LinuxComponentPeer final : public ComponentPeer,
         return XWindowSystem::getInstance()->isMinimised (windowH);
     }
 
+    bool isShowing() const override
+    {
+        return XWindowSystem::getInstance()->isMinimised (windowH);
+    }
+
     void setFullScreen (bool shouldBeFullScreen) override
     {
         auto r = lastNonFullscreenBounds; // (get a copy of this before de-minimising)

diff --git a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp
@@ -1720,6 +1720,11 @@ class HWNDComponentPeer final : public ComponentPeer
         return wp.showCmd == SW_SHOWMINIMIZED;
     }
 
+    bool isShowing() const override
+    {
+        return IsWindowVisible (hwnd) && ! isMinimised();
+    }
+
     void setFullScreen (bool shouldBeFullScreen) override
     {
         const ScopedValueSetter<bool> scope (shouldIgnoreModalDismiss, true);

diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/modules/juce_gui_basics/windows/juce_ComponentPeer.h
@@ -244,6 +244,9 @@ class JUCE_API  ComponentPeer : private FocusChangeListener
     /** True if the window is currently minimised. */
     virtual bool isMinimised() const = 0;
 
+    /** True if the window is being displayed on-screen. */
+    virtual bool isShowing() const = 0;
+
     /** Enable/disable fullscreen mode for the window. */
     virtual void setFullScreen (bool shouldBeFullScreen) = 0;