Browse Source

HWNDComponentPeer: Avoid assertions when opening submenus

tags/2021-05-28
reuk 4 years ago
parent
commit
755e93e1c0
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 4
- 3
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -4115,7 +4115,6 @@ private:
constexpr UINT events[] { WM_MOVE,
WM_SIZE,
WM_WINDOWPOSCHANGED,
WM_NCPOINTERDOWN,
WM_NCLBUTTONDOWN,
WM_NCRBUTTONDOWN,
@@ -4124,9 +4123,11 @@ private:
if (std::find (std::begin (events), std::end (events), info->message) == std::end (events))
return;
// windowMayDismissModals could affect the number of active ComponentPeer instances
for (auto i = ComponentPeer::getNumPeers(); --i >= 0;)
if (auto* hwndPeer = dynamic_cast<HWNDComponentPeer*> (ComponentPeer::getPeer (i)))
hwndPeer->windowShouldDismissModals (info->hwnd);
if (i < ComponentPeer::getNumPeers())
if (auto* hwndPeer = dynamic_cast<HWNDComponentPeer*> (ComponentPeer::getPeer (i)))
hwndPeer->windowShouldDismissModals (info->hwnd);
}
static LRESULT CALLBACK callWndProc (int nCode, WPARAM wParam, LPARAM lParam)


Loading…
Cancel
Save