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
|
002e513b82
|
Added float GetWindowDpiScale(). (#1542, #1676)
|
2018-05-23 18:25:37 +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
|
7c7e96e1aa
|
ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions
|
2018-05-18 23:00:48 +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
|
7f960616e0
|
Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. (#1542)
|
2018-05-16 14:34:46 +02:00 |
|
omar
|
1cafdb5b46
|
Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. (#1542)
|
2018-05-15 11:04:07 +02:00 |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
2018-05-14 19:19:19 +02:00 |
|
Kirill Artemov
|
721ca97d95
|
ImVector: Tweaked reserve() flow to avoid calling MemFree(NULL) which is unnecessary. (#1796)
|
2018-05-14 17:52:29 +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
|
f8ca7f45c4
|
Comments about AddConvexPolyFilled(), PathFillConvex() requiring a clockwise order path. (#1811)
|
2018-05-13 15:55:15 +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
|
6eacddb50f
|
Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. (#1542)
|
2018-05-10 13:10:04 +02:00 |
|
omar
|
f83f566530
|
Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.
|
2018-05-09 21:48:03 +02:00 |
|
omar
|
8da0d42ef2
|
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType (#320, #643, #708, #1011)
|
2018-05-08 19:52:55 +02:00 |
|
omar
|
f13f10e725
|
Settings: Comments (#923, #993)
|
2018-05-07 22:37:10 +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
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
2018-05-07 22:18:45 +02:00 |
|
omar
|
c7687fc1d6
|
Viewports: Comments on ImGuiConfigFlags_DpiEnableScaleViewports and ImGuiConfigFlags_DpiEnableScaleFonts. (#1542)
|
2018-05-07 10:44:08 +02:00 |
|
omar
|
3e8087458d
|
SliderScalar, VSliderScalar(): Support for any data types. Tested with various ranges/limits. Note that Drag/Slider/Input currently fail if the format string doesn't preview the actual value. Will fix next. (#320, #643, #708, #1011)
|
2018-05-04 20:55:51 +02:00 |
|
omar
|
dbe16b6a70
|
Made IMGUI_DISABLE_OBSOLETE_FUNCTIONS exceptionally not affect the layout of ImGuiIO. (#1695)
|
2018-05-04 14:55:38 +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 |
|
omar
|
f2e9dddeca
|
DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.
|
2018-04-28 10:43:15 +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
|
73445ff248
|
Renamed all "display_format" arguments to "format" to emphasis that they also affect rounding of values. (#648, #642)
|
2018-04-27 23:44:27 +02:00 |
|
omar
|
28edece04f
|
Comments, minor tweaks
|
2018-04-27 17:32:03 +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
|
f1ae07e532
|
Viewport, Platform: Using Platform_GetWindowFocus to provide a much stronger heuristic of platform z-order, in replacement for when the back-end cannot provide io.MouseHoveredViewport. The pressure for it to work well increased with the use of viewports by popups/menus. (#1542)
|
2018-04-26 11:52:38 +02:00 |
|
omar
|
d9cd494eaf
|
Viewport: Moved ScaleWindow* code in a proper location. Various comments.
|
2018-04-25 23:21:26 +02:00 |
|
omar
|
eb1c36fdfb
|
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. (#1695, #1769)
|
2018-04-25 22:07:14 +02:00 |
|
omar
|
5979233a3c
|
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
|
2018-04-25 18:23:39 +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
|
7a41e0b1ea
|
Platform: Added platform_io.Platform_SetWindowFocus, Platform_GetWindowFocus function wrappers (unused yet). Exact specs tbd because our simplified concept of focus doesn't necessary match the more complex OS native concepts. (#1542)
|
2018-04-25 15:15:14 +02:00 |
|
Bruce Mitchener
|
7ebdadf92b
|
Fix various typos.
|
2018-04-25 09:40:14 +02:00 |
|
omar
|
cb78e62df9
|
Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok. (#1542)
SDL2 ime support under Win32 never worked properly because of SDL interferences.
|
2018-04-24 12:40:38 +02:00 |
|
omar
|
376f2aec54
|
Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the beginning of the list. (#1542)
|
2018-04-23 23:01:37 +02:00 |
|
omar
|
d268471285
|
Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.
|
2018-04-23 18:56:25 +02:00 |
|
omar
|
4433ce4312
|
Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. (#1542)
|
2018-04-23 12:38:20 +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 |
|