omar
|
93b032ea92
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
|
2018-06-05 15:51:52 +02:00 |
|
omar
|
2bdf0b54a2
|
Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().
|
2018-06-05 15:34:22 +02:00 |
|
omar
|
03c8a78f04
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
|
2018-05-25 12:44:56 +02:00 |
|
omar
|
bf56b6b9a5
|
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. (#1826)
|
2018-05-21 10:13:21 +02:00 |
|
omar
|
01429e7d16
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-17 15:03:56 +02:00 |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
2018-05-17 14:12:37 +02:00 |
|
omar
|
640c056602
|
TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.
|
2018-05-14 23:36:37 +02:00 |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
2018-05-14 19:19:19 +02:00 |
|
omar
|
b0fb340b57
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-05-14 13:15:21 +02:00 |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
2018-05-14 12:34:47 +02:00 |
|
omar
|
d7cc4bc317
|
Demo: Tweaked custom rendering custom, added a Thickness drag. Clarified use of vertical/horizontal line. Add a single pixel demo (wowow)
|
2018-05-13 23:42:19 +02:00 |
|
omar
|
3f29ed6fd5
|
ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.
|
2018-05-13 23:41:43 +02:00 |
|
omar
|
d53bae4c14
|
Demo: Fixing build due to using INT_MAX, UINT_MAX, LLONG_MAX, ULLONG_MAX.
|
2018-05-12 18:58:59 +02:00 |
|
omar
|
8adbf081af
|
Demo: Renamed "fixed overlay" to "simple overlay" because it's not fixed any more!
|
2018-05-12 18:07:22 +02:00 |
|
omar
|
a7a1b3b0a7
|
Demo: Added demo for DragScalar(), InputScalar(), SliderScalar(). (#643)
|
2018-05-12 17:53:34 +02:00 |
|
omar
|
85f3ba844c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-11 22:22:41 +02:00 |
|
omar
|
fc7fc83f9e
|
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
|
2018-05-11 19:27:27 +02:00 |
|
omar
|
0dc18a6ca6
|
Documentation tweaks, comments
|
2018-05-11 16:54:50 +02:00 |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
2018-05-11 16:48:50 +02:00 |
|
omar
|
14f575ff76
|
Scrolling: Fixed a case where using SetScrollHere(1.0f) at the bottom of a window on the same frame the window height has been growing would have the scroll clamped using the previous height. (#1804)
|
2018-05-10 14:31:04 +02:00 |
|
omar
|
4ff23d3306
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2018-05-07 22:23:58 +02:00 |
|
omar
|
787a475650
|
Skip missing font glyphs to 1) avoid using space for missing glyphs and 2) allow merging fonts with overlapping ranges. Demo: Fixed displaying ? instead of greyed out empty box. (#1671, #1703)
|
2018-05-07 18:03:00 +02:00 |
|
omar
|
f4c16fbb99
|
Internals: Data types: Made format string optional. DragBehavior: Moved a bit of code outside of the template. Slider tidying up. Removed unnecessary call to fabsf().
|
2018-05-04 17:57:47 +02:00 |
|
omar
|
dcd26f1295
|
DragFloat, DragInt: Default format string is none is passed to the function. Fixed demo using old style %.0f.
|
2018-05-04 16:41:48 +02:00 |
|
omar
|
086c3925c4
|
Internals: Fixed DragInt* default format string. InputScalar(), InputScalarN(), removed InputFloatN(), InputInt(). Note that DragInt2/3/4 will %f format strings will currently be broken. (#320, #643, #708, #1011)
|
2018-05-03 19:42:35 +02:00 |
|
omar
|
4780ac1ca4
|
Internals: Data types: Added s64, u64 data types. Added support in InputScalar(). Removed internal.h InputScalarEx() to InputScalar(). Removed cheap-relative-operators support in recently added U32 data path, since this is heading toward being legacy code. + Fixed InputDouble parsing code. (#1011, #320, #708)
|
2018-05-03 17:34:22 +02:00 |
|
omar
|
d9fa1f869e
|
Comments about using "power curves". Demo tweaks. (#648)
|
2018-05-03 17:34:15 +02:00 |
|
omar
|
429f48bb4f
|
Clarified usage of ListBoxHeader() before we rename those functions + fixed demo code that didn't honor it correctly. (#1783)
|
2018-04-29 12:20:22 +02:00 |
|
Branimir Karadžić
|
d317951b37
|
Demo: Fixed demo from using obsolete functions.
|
2018-04-28 10:33:48 +02:00 |
|
omar
|
f80314754c
|
InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. (#648)
|
2018-04-28 00:11:40 +02:00 |
|
omar
|
c47d34cf70
|
Viewport: Exposing SetNextWindowViewport(). Used in demo and old/obsolete SetNextWindowPosCenter() (which is an interesting case). Fixed back-end likely crash calling GetFocus() after viewport destruction. Fixed metrics crash.
|
2018-04-27 15:13:22 +02:00 |
|
omar
|
e3453d0dc4
|
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
|
2018-04-25 17:58:53 +02:00 |
|
omar
|
3b9b1956cd
|
Merge branch 'master' into viewport
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
|
2018-04-25 15:32:04 +02:00 |
|
omar
|
dc03c93164
|
Internals: Removed misleading ImRect::FixInverted + fix minor formatting in Readme.
Demo: Fixed Overlay: Added a context menu item to enable freely moving the window.
|
2018-04-24 14:19:10 +02:00 |
|
omar
|
456bbffcc4
|
Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. (#1542)
|
2018-04-20 21:36:36 +02:00 |
|
omar
|
1c385c2ca4
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui_internal.h
|
2018-04-18 19:06:49 +02:00 |
|
omar
|
6a0b2627ad
|
BeginMainMenuBar: Followup to 1e41bad9. Removed public window flag. DisplaySafeAreaPadding defaults to (3,3) instead of (4.4). Comments, tab to spaces, Changelog. (#1439)
|
2018-04-18 17:37:35 +02:00 |
|
omar
|
38e357ef10
|
Viewport: Virtual mouse position are patched immediately when viewports are moved in the virtual space, avoiding interaction glitchs on a resizing frame. (#1542)
|
2018-04-12 19:57:35 +02:00 |
|
omar
|
56ad2a2d74
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/vulkan_example/main.cpp
# imgui.h
|
2018-04-09 19:35:14 +02:00 |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
2018-04-09 14:02:32 +02:00 |
|
omar
|
3a29ddbcfa
|
Version 1.60
|
2018-04-08 00:45:02 +02:00 |
|
omar
|
f421e73b40
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2018-04-06 23:36:23 +02:00 |
|
omar
|
72b7f48870
|
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments
|
2018-04-06 18:12:21 +02:00 |
|
omar
|
0cad274b87
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
|
2018-04-04 19:39:42 +02:00 |
|
omar
|
c19b27813d
|
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. (#1011) May transition the other InputXXX function to use format strings as well.
|
2018-03-22 18:58:40 +01:00 |
|
omar
|
172570acae
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
|
2018-03-20 22:14:34 +01:00 |
|
omar
|
75c3793db5
|
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)
|
2018-03-20 21:19:23 +01:00 |
|
omar
|
170f44e6f0
|
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787)
|
2018-03-20 20:12:34 +01:00 |
|
omar
|
c29971cf72
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
|
2018-03-20 16:05:31 +01:00 |
|
omar
|
166411287f
|
Demo: Added more complete Combo demo. (#1658)
|
2018-03-19 14:44:37 +01:00 |
|
omar
|
33ad8b2f0c
|
Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks
|
2018-03-19 13:20:18 +01:00 |
|
omar
|
c50198debe
|
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize (#1542) wip
|
2018-03-13 16:20:27 +01:00 |
|
omar
|
f6fc28dfd2
|
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)
|
2018-03-12 17:50:32 +01:00 |
|
omar
|
111ea7af77
|
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
|
2018-03-12 17:24:15 +01:00 |
|
omar
|
1f6ad7a894
|
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
|
2018-03-10 10:33:12 +01:00 |
|
omar
|
3637193556
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.h
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
|
2018-03-06 20:02:40 +01:00 |
|
omar
|
945f4d1ecd
|
Removed redundant semi colons. (#1653)
|
2018-03-05 16:16:27 +01:00 |
|
omar
|
c4a158656e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/directx9_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_vulkan.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
|
2018-03-03 23:13:31 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
8a4093f38b
|
Added ArrowButton(). Exposed ImGuiDir.
|
2018-03-03 20:08:03 +01:00 |
|
omar
|
b3594a6407
|
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
|
2018-02-28 21:16:47 +01:00 |
|
omar
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 19:03:39 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
omar
|
735267d27c
|
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) (#1542)
|
2018-02-27 23:25:39 +01:00 |
|
omar
|
45cbebad64
|
Added dummy io.DisplayPos field.
|
2018-02-18 21:04:17 +01:00 |
|
omar
|
4ec931853e
|
Demo: Fonts; Added Font Offset.
|
2018-02-13 21:03:30 +01:00 |
|
omar
|
7c16d52f72
|
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)
|
2018-02-06 20:20:34 +01:00 |
|
omar
|
5c83b55d04
|
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. (#787)
|
2018-02-05 15:49:35 +01:00 |
|
omar
|
8ad88f725c
|
Nav: Minor tidying up. (#787)
|
2018-02-05 14:53:22 +01:00 |
|
omar
|
efbd8cebe7
|
Nav: Comments (#787)
|
2018-02-01 22:53:08 +01:00 |
|
omar
|
eaa6f490a2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
2018-01-31 23:38:05 +01:00 |
|
omar
|
dbdbf01b9f
|
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
|
2018-01-31 23:35:54 +01:00 |
|
omar
|
38d45ee73f
|
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
|
2018-01-31 19:13:20 +01:00 |
|
omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
2018-01-31 16:00:25 +01:00 |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
2018-01-31 16:00:07 +01:00 |
|
omar
|
23c11e9764
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-31 15:43:19 +01:00 |
|
omar
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
2018-01-31 00:15:47 +01:00 |
|
omar
|
bebe03db05
|
Metrics: Minor formatting tweaks
|
2018-01-30 21:17:27 +01:00 |
|
omar
|
bd579e5429
|
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (#787). NavActive takes account of NavFlags enable flags.
|
2018-01-30 20:07:12 +01:00 |
|
omar
|
c851b33352
|
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787)
|
2018-01-29 23:59:46 +01:00 |
|
omar
|
6f366fff6b
|
Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. (#787)
|
2018-01-24 17:41:47 +01:00 |
|
omar
|
455989b8b1
|
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787)
|
2018-01-24 17:41:47 +01:00 |
|
omar
|
d500113f1d
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-01-23 19:16:43 +01:00 |
|
omar
|
9a76fd30fd
|
Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
|
2018-01-23 19:13:49 +01:00 |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
2018-01-12 19:53:27 +01:00 |
|
omar
|
c85d7d6e49
|
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
|
2018-01-12 19:28:37 +01:00 |
|
omar
|
cd7e178eac
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-11 16:49:59 +01:00 |
|
omar
|
a8bbb0b7dd
|
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
|
2018-01-11 15:47:07 +01:00 |
|
omar
|
12aa3cb09e
|
Demo: Tweaks format.
|
2018-01-11 15:22:33 +01:00 |
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
2018-01-11 13:51:18 +01:00 |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
2018-01-03 20:26:24 +01:00 |
|
omar
|
a7deb3a394
|
Demo: Minor tweaks.
|
2018-01-03 15:36:51 +01:00 |
|
omar
|
9fbecac87e
|
Demo: Improved Selectable() examples. (#1528)
|
2018-01-03 15:11:14 +01:00 |
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
2018-01-03 14:32:16 +01:00 |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2018-01-03 12:33:27 +01:00 |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
2018-01-03 12:31:56 +01:00 |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
2017-12-29 18:28:23 +01:00 |
|
omar
|
2dd2ca0096
|
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e.
|
2017-12-29 17:59:13 +01:00 |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-29 13:39:07 +01:00 |
|
omar
|
4ba2e85744
|
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
|
2017-12-28 23:53:27 +01:00 |
|