diff --git a/modules/juce_gui_basics/desktop/juce_Displays.cpp b/modules/juce_gui_basics/desktop/juce_Displays.cpp index a201143449..f42550b1b7 100644 --- a/modules/juce_gui_basics/desktop/juce_Displays.cpp +++ b/modules/juce_gui_basics/desktop/juce_Displays.cpp @@ -26,15 +26,6 @@ namespace juce { -template -auto* getPrimaryDisplayImpl (This& t) -{ - JUCE_ASSERT_MESSAGE_MANAGER_IS_LOCKED - - const auto iter = std::find_if (t.displays.begin(), t.displays.end(), [] (auto& d) { return d.isMain; }); - return iter != t.displays.end() ? std::addressof (*iter) : nullptr; -} - Displays::Displays (Desktop& desktop) { init (desktop); @@ -171,7 +162,10 @@ Point Displays::logicalToPhysical (Point point, const Disp const Displays::Display* Displays::getPrimaryDisplay() const noexcept { - return getPrimaryDisplayImpl (*this); + JUCE_ASSERT_MESSAGE_MANAGER_IS_LOCKED + + const auto iter = std::find_if (displays.begin(), displays.end(), [] (auto& d) { return d.isMain; }); + return iter != displays.end() ? iter : nullptr; } RectangleList Displays::getRectangleList (bool userAreasOnly) const diff --git a/modules/juce_gui_basics/native/juce_ios_Windowing.mm b/modules/juce_gui_basics/native/juce_ios_Windowing.mm index b21a0ed928..c940bcbe7a 100644 --- a/modules/juce_gui_basics/native/juce_ios_Windowing.mm +++ b/modules/juce_gui_basics/native/juce_ios_Windowing.mm @@ -700,7 +700,7 @@ void Displays::findDisplays (float masterScale) if (value == nullptr) return {}; - auto* display = getPrimaryDisplayImpl (Desktop::getInstance().getDisplays()); + auto* display = Desktop::getInstance().getDisplays().getPrimaryDisplay(); if (display == nullptr) return {};