Merge a89139f into 24a02bc

pyimgui · Mar 15, 2017 · 2a264b4 · 2a264b4
2 parents 24a02bc + a89139f
commit 2a264b4
Show file tree

Hide file tree

Showing 6 changed files with 610 additions and 10 deletions.
diff --git a/doc/source/guide/index.rst b/doc/source/guide/index.rst
@@ -11,6 +11,7 @@ usage guide
    window-flags
    treenode-flags
    selectable-flag
+   inputtext-flags
 
 .. visual-example::
     :title: Guide - hello world!

diff --git a/doc/source/guide/inputtext-flags.rst b/doc/source/guide/inputtext-flags.rst
@@ -0,0 +1,28 @@
+.. _guide-inputtext-flags:
+
+Using input text flags
+======================
+
+InpuText functions accept various flags to manage their behaviour.
+
+List of all available input text flags (click to see documentation):
+
+.. _inputtext-flag-options:
+
+
+* :py:data:`imgui.INPUT_TEXT_CHARS_DECIMAL`
+* :py:data:`imgui.INPUT_TEXT_CHARS_HEXADECIMAL`
+* :py:data:`imgui.INPUT_TEXT_CHARS_UPPERCASE`
+* :py:data:`imgui.INPUT_TEXT_CHARS_NO_BLANK`
+* :py:data:`imgui.INPUT_TEXT_AUTO_SELECT_ALL`
+* :py:data:`imgui.INPUT_TEXT_ENTER_RETURNS_TRUE`
+* :py:data:`imgui.INPUT_TEXT_CALLBACK_COMPLETION`
+* :py:data:`imgui.INPUT_TEXT_CALLBACK_HISTORY`
+* :py:data:`imgui.INPUT_TEXT_CALLBACK_ALWAYS`
+* :py:data:`imgui.INPUT_TEXT_CALLBACK_CHAR_FILTER`
+* :py:data:`imgui.INPUT_TEXT_ALLOW_TAB_INPUT`
+* :py:data:`imgui.INPUT_TEXT_CTRL_ENTER_FOR_NEW_LINE`
+* :py:data:`imgui.INPUT_TEXT_NO_HORIZONTAL_SCROLL`
+* :py:data:`imgui.INPUT_TEXT_ALWAYS_INSERT_MODE`
+* :py:data:`imgui.INPUT_TEXT_READ_ONLY`
+* :py:data:`imgui.INPUT_TEXT_PASSWORD`
diff --git a/imgui/__init__.py b/imgui/__init__.py
@@ -168,3 +168,40 @@
 SELECTABLE_SPAN_ALL_COLUMNS = core.SELECTABLE_SPAN_ALL_COLUMNS
 #: Generate press events on double clicks too.
 SELECTABLE_ALLOW_DOUBLE_CLICK = core.SELECTABLE_ALLOW_DOUBLE_CLICK
+
+#: Allow 0123456789.+-*/
+INPUT_TEXT_CHARS_DECIMAL = core.INPUT_TEXT_CHARS_DECIMAL
+#: Allow 0123456789ABCDEFabcdef
+INPUT_TEXT_CHARS_HEXADECIMAL = core.INPUT_TEXT_CHARS_HEXADECIMAL
+#: Turn a..z into A..Z
+INPUT_TEXT_CHARS_UPPERCASE = core.INPUT_TEXT_CHARS_UPPERCASE
+#: Filter out spaces, tabs
+INPUT_TEXT_CHARS_NO_BLANK = core.INPUT_TEXT_CHARS_NO_BLANK
+#: Select entire text when first taking mouse focus
+INPUT_TEXT_AUTO_SELECT_ALL = core.INPUT_TEXT_AUTO_SELECT_ALL
+#: Return 'true' when Enter is pressed (as opposed to when the
+#: # value was modified)
+INPUT_TEXT_ENTER_RETURNS_TRUE = core.INPUT_TEXT_ENTER_RETURNS_TRUE
+#: Call user function on pressing TAB (for completion handling)
+INPUT_TEXT_CALLBACK_COMPLETION = core.INPUT_TEXT_CALLBACK_COMPLETION
+#: Call user function on pressing Up/Down arrows (for history handling)
+INPUT_TEXT_CALLBACK_HISTORY = core.INPUT_TEXT_CALLBACK_HISTORY
+#: Call user function every time. User code may query cursor position,
+#: # modify text buffer.
+INPUT_TEXT_CALLBACK_ALWAYS = core.INPUT_TEXT_CALLBACK_ALWAYS
+#: Call user function to filter character. Modify data->EventChar to
+#: # replace/filter input, or return 1 to discard character.
+INPUT_TEXT_CALLBACK_CHAR_FILTER = core.INPUT_TEXT_CALLBACK_CHAR_FILTER
+#: Pressing TAB input a '\t' character into the text field
+INPUT_TEXT_ALLOW_TAB_INPUT = core.INPUT_TEXT_ALLOW_TAB_INPUT
+#: In multi-line mode, allow exiting edition by pressing Enter.
+#: # Ctrl+Enter to add new line (by default adds new lines with Enter).
+INPUT_TEXT_CTRL_ENTER_FOR_NEW_LINE = core.INPUT_TEXT_CTRL_ENTER_FOR_NEW_LINE
+#: Disable following the cursor horizontally
+INPUT_TEXT_NO_HORIZONTAL_SCROLL = core.INPUT_TEXT_NO_HORIZONTAL_SCROLL
+#: Insert mode
+INPUT_TEXT_ALWAYS_INSERT_MODE = core.INPUT_TEXT_ALWAYS_INSERT_MODE
+#: Read-only mode
+INPUT_TEXT_READ_ONLY = core.INPUT_TEXT_READ_ONLY
+#: Password mode, display all characters as '*'
+INPUT_TEXT_PASSWORD = core.INPUT_TEXT_PASSWORD
diff --git a/imgui/cimgui.pxd b/imgui/cimgui.pxd
@@ -632,56 +632,56 @@ cdef extern from "imgui.h" namespace "ImGui":
     )
 
     # Widgets: Input with Keyboard
-    bool InputText(  # ✗
+    bool InputText(  # ✓
             const char* label, char* buf, size_t buf_size,
             # note: optional
             ImGuiInputTextFlags flags,
             ImGuiTextEditCallback callback, void* user_data
     )
-    bool InputTextMultiline(  # ✗
+    bool InputTextMultiline(  # ✓
             const char* label, char* buf, size_t buf_size,
             # note: optional
             const ImVec2& size, ImGuiInputTextFlags flags,
             ImGuiTextEditCallback callback, void* user_data
     )
-    bool InputFloat(  # ✗
+    bool InputFloat(  # ✓
             const char* label, float* v,
             # note: optional
             float step, float step_fast,
             int decimal_precision, ImGuiInputTextFlags extra_flags
     )
-    bool InputFloat2(  # ✗
+    bool InputFloat2(  # ✓
             const char* label, float v[2],
             # note: optional
             int decimal_precision, ImGuiInputTextFlags extra_flags
     )
-    bool InputFloat3(  # ✗
+    bool InputFloat3(  # ✓
             const char* label, float v[3],
             # note: optional
             int decimal_precision, ImGuiInputTextFlags extra_flags
     )
-    bool InputFloat4(  # ✗
+    bool InputFloat4(  # ✓
             const char* label, float v[4],
             # note: optional
             int decimal_precision, ImGuiInputTextFlags extra_flags
     )
-    bool InputInt(  # ✗
+    bool InputInt(  # ✓
             const char* label, int* v,
             # note: optional
             int step, int step_fast,
             ImGuiInputTextFlags extra_flags
     )
-    bool InputInt2(  # ✗
+    bool InputInt2(  # ✓
             const char* label, int v[2],
             # note: optional
             ImGuiInputTextFlags extra_flags
     )
-    bool InputInt3(  # ✗
+    bool InputInt3(  # ✓
             const char* label, int v[3],
             # note: optional
             ImGuiInputTextFlags extra_flags
     )
-    bool InputInt4(  # ✗
+    bool InputInt4(  # ✓
             const char* label, int v[4],
             # note: optional
             ImGuiInputTextFlags extra_flags