Commit Graph

5535 Commits (0e741036599a1d53b8b4e6f954567f1b3e5cf949)
 

Author SHA1 Message Date
omar d9016964ad Examples: GL3: Comments, tweaks ()
omar c47e5fc76a Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
omar 7d1f2c0dc5 Examples: GL2: rename functions to include GL2 in name
omar d165817880 Merge pull request from JJscott/dev
Examples: OpenGL: Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes 
unknown cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes
Branimir Karadžić 670d40642f Fixed C4267 conversion from size_t to int.
omar 6a1ba317c7 Demo: Minor coding style tweaks so bgfx copy needs less patching.
omar 1a62d46db5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 97a40e74fb Nav: Fixed bad merge of 6def01be5d so the bug fixed in wasn't fully fixed in Nav branch.
omar 96d2942373 InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle).
omar 9a0171b803 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 35e4fa7b85 Merged from Navigation branch (DragBehavior)
omar 6cca4025ee Merge from Navigation branch: 6aa8019763
omar ddf41b0398 Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
omar 550dc09998 Merged from Navigation branch (misc)
omar aef041f948 Merged from Navigation branch
omar c9298c2657 Merged from Navigation branch:
f71cdd13b7  Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code.
c816e6c742 Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). (, )
omar 287a4b6b38 Merged from Navigation branch: 5cac4926c8 fix title bar color of window under a modal window.
omar a9e1d9aab9 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
omar 358e7a194e Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
omar 1f1e63f705 Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. ()
omar ee42fae468 Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ()
omar 6752cba4bc Removed duplicate comments
omar 2ee1b70652 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar 0ba3cadb88 RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ()
omar f8eef49575 ProgressBar() fixed rendering when straddling rounded area. ()
omar 01d4bf299a Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (, )
omar f0fa17b5e0 ImDrawList: Minor renaming
omar 7a9ea281be ImSwap() helper.
omar 808d631e35 imDrawList: PathArcTo() returns when passed zero radius.
omar e1d81f4dc5 ImDrawList: Minor tidying up.
omar 1f51e8f39d Internals: Renamed some ImGuiCorner enums.
omar 7a7327adde ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.
omar 0d4b08a851 Added Go binding link
omar 807322c9a5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar b295e185ff Updated copyright date for 2017, updated Gallery link
omar 419b22a487 Internals: Split some code out of NewFrame() into an Initialize() function.
omar 5938f1ba61 Added IsMousePosValid() helper.
omar f72ca6d22c ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
omar 304de0ee1b ImFontConfig: Comments, const.
omar a02210a455 Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
omar 92a6faca6f IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
omar 37f3a718c6 Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
omar 40f608ce9b Version 1.52 WIP
omar 55a6209931 Version 1.51
omar e6ed2f9939 Nav: Tooltip do not appear in navigation focus list. (, )
omar 82c3116b4f Demo: Displaying version number in test window.
omar d213c0eb7e Style: Tweaked default border (undo half-way from original c1e1e015c4) ()
omar b0fc30bd19 Merge branch 'master' into navigation
omar 7c5556c921 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp