More tweaks

Author: kunitoki

modules/yup_gui/component/yup_Component.cpp

@@ -95,10 +95,13 @@ void Component::setVisible (bool shouldBeVisible)
 
     options.isVisible = shouldBeVisible;
 
+    auto bailOutChecker = BailOutChecker (this);
+
     if (options.onDesktop && native != nullptr)
         native->setVisible (shouldBeVisible);
 
-    auto bailOutChecker = BailOutChecker (this);
+    if (bailOutChecker.shouldBailOut())
+        return;
 
     visibilityChanged();
 
@@ -138,7 +141,7 @@ void Component::setTitle (const String& title)
 {
     componentTitle = title;
 
-    if (options.onDesktop)
+    if (options.onDesktop && native != nullptr)
         native->setTitle (title);
 }
 
@@ -441,7 +444,7 @@ void Component::displayChanged() {}
 
 float Component::getScaleDpi() const
 {
-    if (native != nullptr)
+    if (options.onDesktop && native != nullptr)
         return native->getScaleDpi();
 
     if (parentComponent == nullptr)
@@ -460,7 +463,7 @@ void Component::setOpacity (float newOpacity)
 
     opacity = static_cast<uint8> (newOpacity * 255);
 
-    if (native != nullptr)
+    if (options.onDesktop && native != nullptr)
         native->setOpacity (newOpacity);
 }
 
@@ -1251,6 +1254,16 @@ void Component::internalMoved (int xpos, int ypos)
 
 //==============================================================================
 
+void Component::internalFocusChanged (bool gotFocus)
+{
+    if (gotFocus)
+        focusGained();
+    else
+        focusLost();
+}
+
+//==============================================================================
+
 void Component::internalDisplayChanged() {}
 
 //==============================================================================

modules/yup_gui/component/yup_Component.h

@@ -906,8 +906,9 @@ class JUCE_API Component
     void internalKeyDown (const KeyPress& keys, const Point<float>& position);
     void internalKeyUp (const KeyPress& keys, const Point<float>& position);
     void internalTextInput (const String& text);
-    void internalMoved (int xpos, int ypos);
     void internalResized (int width, int height);
+    void internalMoved (int xpos, int ypos);
+    void internalFocusChanged (bool gotFocus);
     void internalDisplayChanged();
     void internalContentScaleChanged (float dpiScale);
     void internalUserTriedToCloseWindow();

modules/yup_gui/native/yup_Windowing_sdl2.cpp

@@ -961,9 +961,17 @@ void SDL2ComponentNative::handleFocusChanged (bool gotFocus)
 
         if (! isRendering())
             startRendering();
+
+        component.internalFocusChanged (true);
     }
     else
     {
+        component.internalFocusChanged (false);
+
+        lastComponentClicked = nullptr;
+        lastMouseDownPosition.reset();
+        lastMouseDownTime.reset();
+
         SDL_StopTextInput();
 
         if (updateOnlyWhenFocused)
@@ -1168,6 +1176,8 @@ void SDL2ComponentNative::handleEvent (SDL_Event* event)
 
         case SDL_MOUSEMOTION:
         {
+            //YUP_WINDOWING_LOG ("SDL_MOUSEMOTION " << event->motion.x << " " << event->motion.y);
+
             auto cursorPosition = Point<float> { static_cast<float> (event->motion.x), static_cast<float> (event->motion.y) };
 
             if (event->window.windowID == SDL_GetWindowID (window))
@@ -1178,26 +1188,36 @@ void SDL2ComponentNative::handleEvent (SDL_Event* event)
 
         case SDL_MOUSEBUTTONDOWN:
         {
+            YUP_WINDOWING_LOG ("SDL_MOUSEBUTTONDOWN " << event->button.x << " " << event->button.y);
+
             auto cursorPosition = Point<float> { static_cast<float> (event->button.x), static_cast<float> (event->button.y) };
 
             if (event->button.windowID == SDL_GetWindowID (window))
                 handleMouseDown (cursorPosition, toMouseButton (event->button.button), KeyModifiers (SDL_GetModState()));
+            else
+                ; // TODO - when opening a window in mouse down, mouse up is sent to the other window
 
             break;
         }
 
         case SDL_MOUSEBUTTONUP:
         {
+            YUP_WINDOWING_LOG ("SDL_MOUSEBUTTONUP " << event->button.x << " " << event->button.y);
+
             auto cursorPosition = Point<float> { static_cast<float> (event->button.x), static_cast<float> (event->button.y) };
 
             if (event->button.windowID == SDL_GetWindowID (window))
                 handleMouseUp (cursorPosition, toMouseButton (event->button.button), KeyModifiers (SDL_GetModState()));
+            else
+                ; // TODO - when opening a window in mouse down, mouse up is sent to the other window
 
             break;
         }
 
         case SDL_MOUSEWHEEL:
         {
+            YUP_WINDOWING_LOG ("SDL_MOUSEWHEEL " << event->wheel.x << " " << event->wheel.y);
+
             auto cursorPosition = getCursorPosition();
 
             if (event->wheel.windowID == SDL_GetWindowID (window))

modules/yup_gui/widgets/yup_PopupMenu.cpp

@@ -27,7 +27,7 @@ namespace yup
 namespace
 {
 
-static std::vector<Component*> activePopups;
+static std::vector<WeakReference<Component>> activePopups;
 
 } // namespace
 
@@ -211,7 +211,7 @@ class PopupMenu::MenuWindow : public Component
     void dismiss (int itemID)
     {
         selectedItemID = itemID;
-        setVisible (false);
+        //setVisible (false);
 
         // Call the owner's callback
         if (owner->onItemSelected)
@@ -419,9 +419,9 @@ struct GlobalMouseListener : public MouseListener
         Point<float> globalPos = event.getScreenPosition().to<float>();
 
         bool clickedInsidePopup = false;
-        for (auto* popup : activePopups)
+        for (const auto& popup : activePopups)
         {
-            if (auto* menuWindow = dynamic_cast<PopupMenu::MenuWindow*> (popup))
+            if (auto* menuWindow = dynamic_cast<PopupMenu::MenuWindow*> (popup.get()))
             {
                 if (menuWindow->isWithinBounds (globalPos))
                 {
@@ -474,9 +474,9 @@ void PopupMenu::dismissAllPopups()
     // Make a copy to avoid issues with the vector being modified during iteration
     auto popupsToClose = std::move (activePopups);
 
-    for (auto* popup : popupsToClose)
+    for (const auto& popup : popupsToClose)
     {
-        if (auto* menuWindow = dynamic_cast<PopupMenu::MenuWindow*> (popup))
+        if (auto* menuWindow = dynamic_cast<PopupMenu::MenuWindow*> (popup.get()))
             menuWindow->dismiss (0);
     }