Update to TGUI 1.6

Author: texus

code-generator/templates/Widgets/ChildWindow.desc

@@ -1,5 +1,7 @@
 inherits Container
 
+enum CloseBehavior { None, Hide, Remove }
+
 /// @brief Renderer containing properties that determine how the widget is displayed
 property-widget-renderer ChildWindowRenderer
 
@@ -13,6 +15,7 @@ property string Title
 property uint TitleTextSize
 property HorizontalAlignment TitleAlignment
 property uint TitleButtons
+property CloseBehavior CloseBehavior
 property-bool-is Resizable
 property bool KeepInParent
 property-bool-is PositionLocked

code-generator/templates/Widgets/ComboBox.desc

@@ -8,6 +8,7 @@ property-widget-renderer ComboBoxRenderer
 property size_t ItemsToDisplay
 
 function size_t addItem(string item, string id)
+function void addMultipleItems(List<string> items)
 const-function string getItemById(string id)
 
 const-function List<string> getItems()

code-generator/templates/Widgets/ListBox.desc

@@ -5,6 +5,7 @@ inherits ScrollbarChildInterface
 property-widget-renderer ListBoxRenderer
 
 function size_t addItem(string item, string id)
+function void addMultipleItems(List<string> items)
 
 const-function string getItemById(string id)
 const-function string getItemByIndex(size_t index)

code-generator/templates/Widgets/SpinControl.desc

@@ -13,4 +13,4 @@ property float Minimum
 property float Maximum
 property float Step
 property uint DecimalPlaces
-property bool UseWideArrows
+property float SpinButtonWidth

include/CTGUI/BackendRenderTarget.h

@@ -40,6 +40,8 @@ CTGUI_API void tguiBackendRenderTarget_drawFilledRect(tguiBackendRenderTarget* t
 
 CTGUI_API void tguiBackendRenderTarget_drawSprite(tguiBackendRenderTarget* target, const tguiRenderStates* states, const tguiSprite* sprite);
 CTGUI_API void tguiBackendRenderTarget_drawText(tguiBackendRenderTarget* target, const tguiRenderStates* states, const tguiText* text);
+CTGUI_API void tguiBackendRenderTarget_drawTextOutline(tguiBackendRenderTarget* target, const tguiRenderStates* states, const tguiText* text);
+CTGUI_API void tguiBackendRenderTarget_drawTextWithoutOutline(tguiBackendRenderTarget* target, const tguiRenderStates* states, const tguiText* text);
 CTGUI_API void tguiBackendRenderTarget_drawTriangle(tguiBackendRenderTarget* target, const tguiRenderStates* states, tguiVertex point1, tguiVertex point2, tguiVertex point3);
 CTGUI_API void tguiBackendRenderTarget_drawCircle(tguiBackendRenderTarget* target, const tguiRenderStates* states, float size, tguiColor backgroundColor, float borderThickness, tguiColor borderColor);
 CTGUI_API void tguiBackendRenderTarget_drawRoundedRectangle(tguiBackendRenderTarget* target, const tguiRenderStates* states, tguiVector2f size, tguiColor backgroundColor, float radius, const tguiOutline* borders, tguiColor borderColor);

src/CTGUI/Backend/CSFML-Graphics.cpp

@@ -149,6 +149,35 @@ namespace ctgui
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#if 0
+    static tgui::Event::KeyboardKey translateKeypadKey(tgui::Event::KeyboardKey key)
+    {
+        switch (key)
+        {
+        case tgui::Event::KeyboardKey::Numpad0:
+            return tgui::Event::KeyboardKey::Insert;
+        case tgui::Event::KeyboardKey::Numpad1:
+            return tgui::Event::KeyboardKey::End;
+        case tgui::Event::KeyboardKey::Numpad2:
+            return tgui::Event::KeyboardKey::Down;
+        case tgui::Event::KeyboardKey::Numpad3:
+            return tgui::Event::KeyboardKey::PageDown;
+        case tgui::Event::KeyboardKey::Numpad4:
+            return tgui::Event::KeyboardKey::Left;
+        case tgui::Event::KeyboardKey::Numpad6:
+            return tgui::Event::KeyboardKey::Right;
+        case tgui::Event::KeyboardKey::Numpad7:
+            return tgui::Event::KeyboardKey::Home;
+        case tgui::Event::KeyboardKey::Numpad8:
+            return tgui::Event::KeyboardKey::Up;
+        case tgui::Event::KeyboardKey::Numpad9:
+            return tgui::Event::KeyboardKey::PageUp;
+        default: // tgui::Event::KeyboardKey::Numpad5
+            return tgui::Event::KeyboardKey::Unknown; // Let's ignore this key press
+        };
+    }
+#endif
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     TGUI_NODISCARD static bool convertEvent(const sfEvent& eventSFML, tgui::Event& eventTGUI)
     {
@@ -207,6 +236,21 @@ namespace ctgui
                 eventTGUI.key.control = eventSFML.key.control;
                 eventTGUI.key.shift = eventSFML.key.shift;
                 eventTGUI.key.system = eventSFML.key.system;
+
+                // If the NumLock is off then we will translate keypad key events to key events for text cursor navigation.
+                // This functionality is not yet part of SFML, but is available in PR #3238 (https://github.com/SFML/SFML/pull/3238)
+#if 0
+                static_assert(static_cast<int>(tgui::Event::KeyboardKey::Numpad0) + 9 == static_cast<int>(tgui::Event::KeyboardKey::Numpad9), "Numpad0 to Numpad9 need continous ids in KeyboardKey");
+                if (!eventSFML.key.numLock
+                 && (static_cast<int>(eventTGUI.key.code) >= static_cast<int>(tgui::Event::KeyboardKey::Numpad0))
+                 && (static_cast<int>(eventTGUI.key.code) <= static_cast<int>(tgui::Event::KeyboardKey::Numpad9)))
+                {
+                    eventTGUI.key.code = translateKeypadKey(eventTGUI.key.code);
+                    if (eventTGUI.key.code == tgui::Event::KeyboardKey::Unknown) // Numpad5 was pressed which has no function
+                        return false; // We didn't handle this key press
+                }
+#endif
+
                 return true;
             }
             case sfEvtMouseWheelScrolled:

src/CTGUI/BackendRenderTarget.cpp

@@ -75,6 +75,16 @@ void tguiBackendRenderTarget_drawText(tguiBackendRenderTarget* target, const tgu
     target->This->drawText(convertRenderStates(states), *text->This);
 }
 
+void tguiBackendRenderTarget_drawTextOutline(tguiBackendRenderTarget* target, const tguiRenderStates* states, const tguiText* text)
+{
+    target->This->drawTextOutline(convertRenderStates(states), *text->This);
+}
+
+void tguiBackendRenderTarget_drawTextWithoutOutline(tguiBackendRenderTarget* target, const tguiRenderStates* states, const tguiText* text)
+{
+    target->This->drawTextWithoutOutline(convertRenderStates(states), *text->This);
+}
+
 void tguiBackendRenderTarget_drawTriangle(tguiBackendRenderTarget* target, const tguiRenderStates* states, tguiVertex point1, tguiVertex point2, tguiVertex point3)
 {
     target->This->drawTriangle(convertRenderStates(states), {{point1.position.x, point1.position.y}, {point1.color.r, point1.color.g, point1.color.b, point1.color.a}, {point1.texCoords.x, point1.texCoords.y}},