Make edit boxes always focusable and child windows only when they con…

…tain a focusable widget
texus · Sep 5, 2013 · ae80e7d · ae80e7d
1 parent 7ae816d
commit ae80e7d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/TGUI/Container.cpp b/src/TGUI/Container.cpp
@@ -2915,19 +2915,23 @@ namespace tgui
                 // Make sure that the widget is visible and enabled
                 if ((m_Widgets[i]->m_Visible) && (m_Widgets[i]->m_Enabled))
                 {
-                    if (m_FocusedWidget > 0)
+                    // Container widgets can only be focused it they contain focusable widgets
+                    if ((!m_Widgets[i]->m_ContainerWidget) || (Container::Ptr(m_Widgets[i])->focusNextWidgetInContainer()))
                     {
-                        // Unfocus the current widget
-                        m_Widgets[m_FocusedWidget-1]->m_Focused = false;
-                        m_Widgets[m_FocusedWidget-1]->widgetUnfocused();
-                    }
+                        if (m_FocusedWidget > 0)
+                        {
+                            // Unfocus the current widget
+                            m_Widgets[m_FocusedWidget-1]->m_Focused = false;
+                            m_Widgets[m_FocusedWidget-1]->widgetUnfocused();
+                        }
 
-                    // Focus on the new widget
-                    m_FocusedWidget = i+1;
-                    m_Widgets[i]->m_Focused = true;
-                    m_Widgets[i]->widgetFocused();
+                        // Focus on the new widget
+                        m_FocusedWidget = i+1;
+                        m_Widgets[i]->m_Focused = true;
+                        m_Widgets[i]->widgetFocused();
 
-                    return true;
+                        return true;
+                    }
                 }
             }
         }

diff --git a/src/TGUI/EditBox.cpp b/src/TGUI/EditBox.cpp
@@ -57,6 +57,7 @@ namespace tgui
         m_Callback.widgetType = Type_EditBox;
         m_AnimatedWidget = true;
         m_DraggableWidget = true;
+        m_AllowFocus = true;
 
         m_SelectionPoint.setSize(sf::Vector2f(1, 0));
 
@@ -383,7 +384,6 @@ namespace tgui
             // Check if optional textures were loaded
             if ((m_TextureFocused_L.data != nullptr) && (m_TextureFocused_M.data != nullptr) && (m_TextureFocused_R.data != nullptr))
             {
-                m_AllowFocus = true;
                 m_WidgetPhase |= WidgetPhase_Focused;
             }
             if ((m_TextureHover_L.data != nullptr) && (m_TextureHover_M.data != nullptr) && (m_TextureHover_R.data != nullptr))
@@ -408,7 +408,6 @@ namespace tgui
             // Check if optional textures were loaded
             if (m_TextureFocused_M.data != nullptr)
             {
-                m_AllowFocus = true;
                 m_WidgetPhase |= WidgetPhase_Focused;
             }
             if (m_TextureHover_M.data != nullptr)