Commit Graph

  • ce7f3d4831 Merge branch 'master' into navigation omar 2017-08-22 18:27:29 +0800
  • 444792f75f Merge fixes from ,master branch omar 2017-08-22 18:27:23 +0800
  • 50b3a14d0a Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h ocornut 2016-07-31 13:05:13 +0200
  • 7de68fbe3d Merge branch 'master' into navigation omar 2017-08-22 18:22:41 +0800
  • d5b0d51274 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit omar 2017-08-22 18:13:10 +0800
  • 9670fe9ca7 Merge branch 'master' into navigation omar 2017-08-22 17:51:20 +0800
  • 6ee317d26d ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch. omar 2017-08-22 17:46:50 +0800
  • 6c82af2b96 Navigation branch fix (we changed Clip) omar 2017-08-22 17:44:49 +0800
  • 4ee6472b0c Merge 632329b7cb into 543dc2817f Michał Cichoń 2017-08-21 14:53:49 +0000
  • 543dc2817f Fixed an assert when calling CloseCurrentPopup() twice in a row. omar 2017-08-21 22:54:20 +0800
  • 53e73182ff Merge branch 'master' into navigation omar 2017-08-21 00:04:45 +0800
  • 530baee1a7 Removed tabs that slipped through the cracks omar 2017-08-21 00:03:37 +0800
  • 9b484d24cd ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments. omar 2017-08-20 23:45:02 +0800
  • 067127f113 Columns: Caching columns clipping rectangles (#125) omar 2017-08-20 23:17:59 +0800
  • adeaf1cd72 Columns: Moved PushColumnClipRect() to imgui_internal.h omar 2017-08-20 23:09:43 +0800
  • 54bdd00df7 Columns: Fix for explicit content width and scrollbar. (#519, #125) omar 2017-08-20 21:32:18 +0800
  • ea493fd8da Merge branch 'ggtucker-master' omar 2017-08-20 21:09:22 +0800
  • 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) omar 2017-08-20 21:08:07 +0800
  • 1ebd7ec049 Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913) omar 2017-08-20 20:56:11 +0800
  • 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) omar 2017-08-20 20:40:25 +0800
  • 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) omar 2017-08-20 20:37:04 +0800
  • 7f0063f858 Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125) omar 2017-08-20 19:32:18 +0800
  • e70d49ba1f Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125) omar 2017-08-20 19:30:57 +0800
  • 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. omar 2017-08-20 19:25:29 +0800
  • a511b00226 Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913, #125) omar 2017-08-20 19:19:31 +0800
  • 3bf2af23e6 Columns: Fixed EndColumns() not repositioning the cursor. (#913) omar 2017-08-20 18:44:54 +0800
  • 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125) omar 2017-08-20 18:44:48 +0800
  • bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master omar 2017-08-20 18:22:34 +0800
  • b4eeb4aa8d Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section. omar 2017-08-20 17:53:09 +0800
  • af2db53780 Added GetStyleColorVec4() omar 2017-08-20 17:50:25 +0800
  • cf84650ee8 GCC warnings fixes omar 2017-08-20 16:39:43 +0800
  • 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. omar 2017-08-20 16:39:11 +0800
  • 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended) omar 2017-08-20 15:38:05 +0800
  • 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.) omar 2017-08-20 15:28:12 +0800
  • 3b11e73333 Examples: gitignore added patterns for modern MSVC versions omar 2017-08-20 15:17:37 +0800
  • bf0d9c123e Merge branch 'master' into navigation omar 2017-08-18 00:25:12 +0800
  • 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) omar 2017-08-17 21:19:54 +0800
  • 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) omar 2017-08-17 21:13:14 +0800
  • 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618) omar 2017-08-17 20:44:44 +0800
  • 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) omar 2017-08-17 19:36:48 +0800
  • 24a78767d2 Merge branch 'master' into styles omar 2017-08-17 17:24:33 +0800
  • 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification omar 2017-08-17 15:35:59 +0800
  • 52f1a4124c Demo: Tweaked Fonts section. omar 2017-08-17 13:56:16 +0800
  • c569676a7b ImVector: Added a const omar 2017-08-17 11:37:07 +0800
  • 0be4f66d89 ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618) omar 2017-08-16 18:56:26 +0800
  • 34d09f2dc8 Merge pull request #1283 from onqtam/imgui_api omar 2017-08-16 23:29:52 +0800
  • fd9460a087 added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp Viktor Kirilov 2017-08-16 17:52:11 +0300
  • 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 omar 2017-08-16 17:51:44 +0800
  • a85a14370b OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier. omar 2017-08-16 15:47:10 +0800
  • a9915681eb PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747) omar 2017-08-16 14:37:54 +0800
  • 5ea1865fdb (api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely. omar 2017-08-16 14:24:41 +0800
  • 638d77c682 Comments (#402) omar 2017-08-16 14:19:48 +0800
  • e8dd435ccd Merge branch 'mkeeter-is-popup-open' omar 2017-08-16 13:43:02 +0800
  • d2259f65e5 Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799) omar 2017-08-16 13:42:41 +0800
  • f98376d02b Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open omar 2017-08-16 13:19:15 +0800
  • a83f7083ed BeginPopupEx() uses ImGuiID internally omar 2017-08-16 13:06:14 +0800
  • e682362f35 TODO list update, comments omar 2017-08-16 12:54:51 +0800
  • f827c8448a Merge pull request #1282 from jadwallis/master omar 2017-08-16 10:45:07 +0800
  • 9239e91dc9 Whitespace fix to previous James Wallis 2017-08-15 14:12:32 +0100
  • 718f00d651 Make font atlas packing padding configurable James Wallis 2017-08-15 14:11:04 +0100
  • 1e162dfc74 PushStyleVar/PopStyleVar: internal tweaks omar 2017-08-15 19:19:00 +0800
  • 18f217e631 Style: Moved position of ImGuiCol_TitleBgCollapsed omar 2017-08-15 19:06:02 +0800
  • 5429bd892e ColorEdit4: Added "Copy as..." option in context menu (#346) omar 2017-08-15 18:30:52 +0800
  • 668a4bf1bc Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update omar 2017-08-15 17:48:41 +0800
  • 0f935248e3 Combo, Inputint, InputFloat, ColorEdit4 all use the small size for little square omar 2017-08-15 17:46:11 +0800
  • 18b50f8eba Comments omar 2017-08-15 11:41:36 +0800
  • f8f382221c ImVector: added resize() variant with initialization value omar 2017-08-15 11:41:00 +0800
  • 032c222d57 Merge branch 'master' into styles omar 2017-08-15 10:52:38 +0800
  • 9bf5028fd3 Merge branch 'master' into navigation omar 2017-08-15 00:50:59 +0800
  • 01b99bbe09 TODO list update omar 2017-08-15 00:36:15 +0800
  • cd17af0d33 Renamed omar 2017-08-15 00:09:03 +0800
  • 03aae93f3e TODO list update (merging a first batch of things I had laying around, +60 entries) omar 2017-08-14 21:14:42 +0800
  • 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization omar 2017-08-14 21:00:44 +0800
  • a6d69f04c0 PlotHistogram: bars are drawn based on the position of zero (#828) omar 2017-08-14 17:20:05 +0800
  • d258287c92 Revert d2c219d #826 + tidying up ImFont::RenderChar() omar 2017-08-14 16:53:38 +0800
  • 3d6e037c23 Comments (#1034) omar 2017-08-14 16:27:22 +0800
  • bd3dfc0eba Moved TODO list to TODO.txt omar 2017-08-14 15:34:04 +0800
  • d2c219df84 Merge pull request #826 from swetland/patch omar 2017-08-14 16:50:20 +0800
  • c26b29b254 Style: Moving code in a function to make incoming diff easier to parse. omar 2017-08-14 15:14:46 +0800
  • 2b7fe73a08 Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (#1048, #1056) omar 2017-08-14 13:27:19 +0800
  • c1e1e015c4 Style: Tweaked default border (which is off by default) to be less noticeable (#707, #1019) omar 2017-08-14 13:07:55 +0800
  • 97fccbdb73 Demo: Fixed conflicting id introduced in be9628494a . Added tooltip. omar 2017-08-14 13:05:03 +0800
  • 648f75b245 Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019) omar 2017-08-14 13:04:32 +0800
  • 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments. omar 2017-08-14 12:25:35 +0800
  • 8c61a4eb4c Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points) omar 2017-08-14 11:29:54 +0800
  • 41076188ca Merge pull request #1277 from luk1337/master omar 2017-08-12 12:53:13 +0800
  • 8352d43a0c Fix broken ImGuiColorEditFlags_NoAlpha flag check LuK1337 2017-08-11 22:52:33 +0200
  • 908b025c3c Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks omar 2017-08-12 01:23:39 +0800
  • 734fb9434a Merge 0959a92be7 into 0f126a5b07 Darenn Keller 2017-08-11 17:07:03 +0000
  • f74ef7245c Merge 233b11e112 into 0f126a5b07 Stefanos 2017-08-11 17:05:31 +0000
  • 0f126a5b07 Update README.md (small wording bits, inspired by #1093) omar 2017-08-12 01:05:24 +0800
  • b4fe5d36a4 Examples: OpenGL3+SDL: Fix types to uses GlEnum (#1147) omar 2017-08-12 00:46:58 +0800
  • 048322f3fd Merge pull request #1147 from TinyTinni/master omar 2017-08-12 00:43:34 +0800
  • 5eef7dd82f Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard omar 2017-08-12 00:43:55 +0800
  • 08265bfbd9 RenderArrow(): fix warning. re-orderer lines to match enum order. omar 2017-08-11 14:44:53 +0800
  • e3fae56089 Merge branch 'master' into navigation omar 2017-08-11 14:30:17 +0800
  • d7cad903aa Documentation tweaks omar 2017-08-11 14:29:27 +0800
  • 73f9c9d80c Merge branch 'master' into navigation omar 2017-08-11 13:44:25 +0800
  • 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS omar 2017-08-11 13:36:28 +0800
  • 53d1b1e929 ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. (#346) omar 2017-08-10 10:25:50 +0800