moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,998 Commits 4 Branches 0 Tags
2ee1b706529a4d9570d6e7908fbb7f8fa8ee21b8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
omar 2ee1b70652 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 2017-08-29 15:36:36 +08:00
omar 0ba3cadb88 RenderRectFilledRangeH() can't use cheap acosf() approximation for now. (#1296) 2017-08-29 15:25:05 +08:00
omar f8eef49575 ProgressBar() fixed rendering when straddling rounded area. (#1296) 2017-08-29 15:23:07 +08:00
omar 01d4bf299a Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (#1296, #76) 2017-08-29 15:22:30 +08:00
omar f0fa17b5e0 ImDrawList: Minor renaming 2017-08-29 15:10:03 +08:00
omar 7a9ea281be ImSwap() helper. 2017-08-28 19:27:12 +08:00
omar 808d631e35 imDrawList: PathArcTo() returns when passed zero radius. 2017-08-28 16:02:25 +08:00
omar e1d81f4dc5 ImDrawList: Minor tidying up. 2017-08-28 14:12:55 +08:00
omar 1f51e8f39d Internals: Renamed some ImGuiCorner enums. 2017-08-28 14:11:11 +08:00
omar 7a7327adde ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those. 2017-08-28 13:19:36 +08:00
omar 807322c9a5 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-08-26 18:43:10 +08:00
omar b295e185ff Updated copyright date for 2017, updated Gallery link 2017-08-26 16:42:40 +08:00
omar 419b22a487 Internals: Split some code out of NewFrame() into an Initialize() function. 2017-08-26 16:35:39 +08:00
omar 5938f1ba61 Added IsMousePosValid() helper. 2017-08-26 15:18:06 +08:00
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) 2017-08-26 14:11:56 +08:00
omar 304de0ee1b ImFontConfig: Comments, const. 2017-08-26 14:11:41 +08:00
omar a02210a455 Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined 2017-08-26 00:31:44 +08:00
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. 2017-08-25 16:43:25 +08:00
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. 2017-08-25 16:10:14 +08:00
omar 40f608ce9b Version 1.52 WIP 2017-08-25 15:12:12 +08:00
omar 55a6209931 Version 1.51 2017-08-25 00:29:59 +08:00
omar e6ed2f9939 Nav: Tooltip do not appear in navigation focus list. (#1294, #787) 2017-08-25 00:06:57 +08:00
omar 82c3116b4f Demo: Displaying version number in test window. 2017-08-24 17:32:03 +08:00
omar d213c0eb7e Style: Tweaked default border (undo half-way from original c1e1e015c4) (#707) 2017-08-24 17:30:10 +08:00
omar b0fc30bd19 Merge branch 'master' into navigation 2017-08-22 20:49:02 +08:00
omar 7c5556c921 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-08-22 20:48:36 +08:00
omar 92efa00bc9 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit 2017-08-22 20:44:39 +08:00
omar 6ed75d3046 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-08-22 20:27:39 +08:00
omar eb2bbf6f29 Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav. 2017-08-22 20:25:27 +08:00
omar 52b39af0a0 Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245) 2017-08-22 20:23:46 +08:00
omar 6be7d4904e Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function. 2017-08-22 20:10:02 +08:00
omar 2e35957a81 Undo reordering of ImGuiKey in Nav branch 2017-08-22 20:02:52 +08:00
omar 8581050002 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-08-22 19:55:59 +08:00
omar 141339e4b7 (internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch 2017-08-22 19:51:12 +08:00
omar 8e89809078 Merge branch 'master' into navigation 2017-08-22 19:48:01 +08:00
ocornut 2ad2190d47 Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch) 2017-08-22 19:47:52 +08:00
omar f3ab5e6252 Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) (#787). Thanks @Grouflon 2017-08-22 19:43:49 +08:00
omar bea06117bb Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291) 2017-08-22 19:26:21 +08:00
omar ce7f3d4831 Merge branch 'master' into navigation 2017-08-22 18:27:29 +08:00
omar 444792f75f Merge fixes from ,master branch 2017-08-22 18:27:23 +08:00
ocornut 50b3a14d0a Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h 2017-08-22 18:26:27 +08:00
omar 7de68fbe3d Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-08-22 18:22:41 +08:00
omar d5b0d51274 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit 2017-08-22 18:13:10 +08:00
omar 9670fe9ca7 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-08-22 17:51:20 +08:00
omar 6ee317d26d ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch. 2017-08-22 17:46:50 +08:00
omar 6c82af2b96 Navigation branch fix (we changed Clip) 2017-08-22 17:44:49 +08:00
omar 543dc2817f Fixed an assert when calling CloseCurrentPopup() twice in a row. 2017-08-21 22:54:20 +08:00
omar 53e73182ff Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 2017-08-21 00:04:45 +08:00
omar 530baee1a7 Removed tabs that slipped through the cracks 2017-08-21 00:03:37 +08:00
omar 9b484d24cd ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments. 2017-08-20 23:45:02 +08:00
omar 067127f113 Columns: Caching columns clipping rectangles (#125) 2017-08-20 23:17:59 +08:00
omar adeaf1cd72 Columns: Moved PushColumnClipRect() to imgui_internal.h 2017-08-20 23:09:43 +08:00
omar 54bdd00df7 Columns: Fix for explicit content width and scrollbar. (#519, #125) 2017-08-20 21:32:18 +08:00
omar ea493fd8da Merge branch 'ggtucker-master' 2017-08-20 21:09:22 +08:00
omar 83e8d10fab Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. (#125, #913, #893, #1138) 2017-08-20 21:08:07 +08:00
omar 1ebd7ec049 Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913) 2017-08-20 20:58:24 +08:00
omar 7ff1c149b5 Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. (#913, #125) 2017-08-20 20:58:24 +08:00
omar 1c83b073c6 Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913) 2017-08-20 20:58:23 +08:00
omar 7f0063f858 Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125) 2017-08-20 19:32:50 +08:00
omar e70d49ba1f Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125) 2017-08-20 19:32:50 +08:00
omar 9307631c90 Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. (#913, #125). End() calls EndColumns() directly. 2017-08-20 19:32:50 +08:00
omar a511b00226 Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913, #125) 2017-08-20 19:32:50 +08:00
omar 3bf2af23e6 Columns: Fixed EndColumns() not repositioning the cursor. (#913) 2017-08-20 18:44:54 +08:00
omar 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125) 2017-08-20 18:44:48 +08:00
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-08-20 18:22:34 +08:00
omar b4eeb4aa8d Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section. 2017-08-20 17:53:09 +08:00
omar af2db53780 Added GetStyleColorVec4() 2017-08-20 17:50:25 +08:00
omar cf84650ee8 GCC warnings fixes 2017-08-20 16:39:43 +08:00
omar fd394e1e95 Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not. 2017-08-20 16:39:11 +08:00
omar 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended) 2017-08-20 15:38:05 +08:00
omar 91d841dd5f Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.) 2017-08-20 15:28:12 +08:00
omar 3b11e73333 Examples: gitignore added patterns for modern MSVC versions 2017-08-20 15:17:37 +08:00
omar bf0d9c123e Merge branch 'master' into navigation 2017-08-18 00:25:12 +08:00
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 2017-08-17 21:19:54 +08:00
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 2017-08-17 21:13:14 +08:00
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618) 2017-08-17 20:44:44 +08:00
omar d970957e2d ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui) 2017-08-17 19:36:48 +08:00
omar 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification 2017-08-17 15:35:59 +08:00
omar 52f1a4124c Demo: Tweaked Fonts section. 2017-08-17 13:56:16 +08:00
omar c569676a7b ImVector: Added a const 2017-08-17 11:46:25 +08:00
omar 0be4f66d89 ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618) 2017-08-17 11:46:25 +08:00
omar 68bf5ecbc1 Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME 2017-08-16 17:51:44 +08:00
omar a85a14370b OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier. 2017-08-16 15:47:10 +08:00
omar a9915681eb PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747) 2017-08-16 14:37:54 +08:00
omar 5ea1865fdb (api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely. 2017-08-16 14:24:41 +08:00
omar 638d77c682 Comments (#402) 2017-08-16 14:19:48 +08:00
omar e8dd435ccd Merge branch 'mkeeter-is-popup-open' 2017-08-16 13:43:02 +08:00
omar d2259f65e5 Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799) 2017-08-16 13:42:41 +08:00
omar f98376d02b Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open 
# Conflicts:
#	imgui.cpp
 2017-08-16 13:19:15 +08:00
omar a83f7083ed BeginPopupEx() uses ImGuiID internally 2017-08-16 13:06:14 +08:00
omar e682362f35 TODO list update, comments 2017-08-16 12:54:51 +08:00
omar 9bf5028fd3 Merge branch 'master' into navigation 2017-08-15 00:50:59 +08:00
omar 01b99bbe09 TODO list update 2017-08-15 00:36:15 +08:00
omar cd17af0d33 Renamed 2017-08-15 00:09:03 +08:00
omar 03aae93f3e TODO list update (merging a first batch of things I had laying around, +60 entries) 2017-08-14 21:14:42 +08:00
omar 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization 2017-08-14 21:00:44 +08:00
omar a6d69f04c0 PlotHistogram: bars are drawn based on the position of zero (#828) 2017-08-14 17:20:05 +08:00
omar d258287c92 Revert d2c219d #826 + tidying up ImFont::RenderChar() 2017-08-14 16:53:38 +08:00
omar 3d6e037c23 Comments (#1034) 2017-08-14 16:51:14 +08:00
omar bd3dfc0eba Moved TODO list to TODO.txt 2017-08-14 16:51:14 +08:00