13a3a2d0f3
Merge branch 'examples_refactor2' into viewport ( #1870 )
...
# Conflicts:
# examples/README.txt
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl2.cpp
# examples/imgui_impl_sdl2.h
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
7 years ago
ff4f40de41
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
7 years ago
85f9694bd4
Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ( #1870 )
...
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
7 years ago
f5bf9f509c
ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. ( #1869 )
7 years ago
24fc7c30dd
Examples: Documentation
7 years ago
f63a404df0
Added missing IMGUI_API markers in non-inline section of the IMGUI_DISABLE_OBSOLETE_FUNCTIONS block: old Begin(), InputFloat().
7 years ago
d44faa165a
Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. ( #1859 )
...
Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.
7 years ago
2a56105f85
TreeNodeEx(): The helper ImGuiTreeNodeFlags_CollapsingHeader flag now include ImGuiTreeNodeFlags_NoTreePushOnOpen. The flag was already set by CollapsingHeader(). The only difference is if you were using TreeNodeEx() manually with ImGuiTreeNodeFlags_CollapsingHeader and without ImGuiTreeNodeFlags_NoTreePushOnOpen. In which case you can remove the ImGuiTreeNodeFlags_NoTreePushOnOpen flag from your call (ImGuiTreeNodeFlags_CollapsingHeader & ~ImGuiTreeNodeFlags_NoTreePushOnOpen). ( #1864 )
7 years ago
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
7 years ago
948009a8b2
Intensive FAQ answer for the million of people asking the same questions over and over again. ( #1848 , #1791 , #1840 , #1493 , #1295 )
7 years ago
92b7d6bc4f
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site ( #143 )
7 years ago
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
7 years ago
002e513b82
Added float GetWindowDpiScale(). ( #1542 , #1676 )
7 years ago
bf56b6b9a5
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. ( #1826 )
7 years ago
7c7e96e1aa
ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions
7 years ago
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
7 years ago
d5c8f404b2
Remove trailing white spaces.
7 years ago
7f960616e0
Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. ( #1542 )
7 years ago
1cafdb5b46
Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. ( #1542 )
7 years ago
036dce634e
Version 1.62 WIP
7 years ago
721ca97d95
ImVector: Tweaked reserve() flow to avoid calling MemFree(NULL) which is unnecessary. ( #1796 )
7 years ago
b0fb340b57
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
7 years ago
78b28d545f
Version 1.61 + todo additions
7 years ago
f8ca7f45c4
Comments about AddConvexPolyFilled(), PathFillConvex() requiring a clockwise order path. ( #1811 )
7 years ago
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
7 years ago
fc7fc83f9e
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
7 years ago
0dc18a6ca6
Documentation tweaks, comments
7 years ago
8149408408
Merge branch 'data_types'
...
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
7 years ago
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 )
7 years ago
f83f566530
Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.
7 years ago
8da0d42ef2
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType ( #320 , #643 , #708 , #1011 )
7 years ago
f13f10e725
Settings: Comments ( #923 , #993 )
7 years ago
4ff23d3306
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
7 years ago
0bf43b3a1b
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. ( #923 , #993 )
7 years ago
c7687fc1d6
Viewports: Comments on ImGuiConfigFlags_DpiEnableScaleViewports and ImGuiConfigFlags_DpiEnableScaleFonts. ( #1542 )
7 years ago
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 )
7 years ago
dbe16b6a70
Made IMGUI_DISABLE_OBSOLETE_FUNCTIONS exceptionally not affect the layout of ImGuiIO. ( #1695 )
7 years ago
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 )
7 years ago
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 )
7 years ago
d9fa1f869e
Comments about using "power curves". Demo tweaks. ( #648 )
7 years ago
429f48bb4f
Clarified usage of ListBoxHeader() before we rename those functions + fixed demo code that didn't honor it correctly. ( #1783 )
7 years ago
f2e9dddeca
DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.
7 years ago
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 )
7 years ago
73445ff248
Renamed all "display_format" arguments to "format" to emphasis that they also affect rounding of values. ( #648 , #642 )
7 years ago
28edece04f
Comments, minor tweaks
7 years ago
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.
7 years ago
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 )
7 years ago
d9cd494eaf
Viewport: Moved ScaleWindow* code in a proper location. Various comments.
7 years ago
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 )
7 years ago
5979233a3c
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
7 years ago
e3453d0dc4
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
7 years ago
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
7 years ago
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 )
7 years ago
7ebdadf92b
Fix various typos.
7 years ago
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.
7 years ago
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 )
7 years ago
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.
7 years ago
4433ce4312
Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. ( #1542 )
7 years ago
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 )
7 years ago
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
7 years ago
6a0b2627ad
BeginMainMenuBar: Followup to 1e41bad9. Removed public window flag. DisplaySafeAreaPadding defaults to (3,3) instead of (4.4). Comments, tab to spaces, Changelog. ( #1439 )
7 years ago
1e41bad90f
Added DisplaySafeAreaPadding to MainMenuBar height and fixed starting x position. Fixes main menu bar problems with TVs. ( #1439 )
7 years ago
0d16492eb7
Viewport: Moved ImGuiWindowFlags_FullViewport to an internal ViewportOwned flag. Renamed AddViewport to AddUpdateViewport. (#Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. ( #1542 ))
7 years ago
83d97d4a9b
Fix typos KeyDown => KeysDown
7 years ago
950539b768
Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. ( #1542 , #1676 )
7 years ago
285269ef55
Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. ( #1542 )
7 years ago
e25da4230b
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
83bd3595a4
Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. ( #1542 )
7 years ago
32ee0a3947
Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. ( #1542 )
7 years ago
7ddc22b326
Viewports, DPI: Renamed config flags. ( #1542 )
7 years ago
0d5042f0f3
Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. ( #1542 )
7 years ago
74a11e2087
Viewport: Merge fix conflicting flags.
7 years ago
d4dd448511
Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
7 years ago
9117632bf0
Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
7 years ago
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
7 years ago
6f1f5cbc20
Version 1.61 WIP
7 years ago
dd079fe6e6
Version 1.60 (missed the string). Will retag.
7 years ago
8acda84202
Nav: Fixed comment. ( #1599 )
7 years ago
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
7 years ago
c2fc978983
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) ( #707 )
7 years ago
c1bdab6d5b
Comments about io.WantCapture flags + todo entries.
7 years ago
2464e62a1a
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
7 years ago
72b7f48870
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. ( #787 , #1495 , #1202 ) + comments
7 years ago
84c6ea0cee
Viewport: Comments about honoring ImGuiViewportFlags_NoInputs and MouseHoveredViewport. ( #1542 )
7 years ago
9d8bc79025
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. ( #1542 )
7 years ago
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
7 years ago
4649967112
Added extra comments and assertions to avoid user combining ImGuiCond flags. ( #1694 )
7 years ago
cd1e6e384f
Tooltip windows uses PopupBorderSize ( #1697 ) + commented out debug stuff.
7 years ago
ac8931b2e9
Viewport: Moved OverlayDrawList to be a per-viewport instead of being global + fix overlay clipping glitch during viewport creation frame + support for software mouse cursor stradding over multiple viewport. The overlay draw list move is rather important as draw lists are not shared among viewports anymore and we can do a swap of their data without copying it. ( #1542 )
7 years ago
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.
7 years ago
c796960ff9
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011 )
7 years ago
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
7 years ago
75c3793db5
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. ( #787 , #1495 , #1202 )
7 years ago
dcf7c3d188
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. ( #787 , #1542 )
7 years ago
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 )
7 years ago
c29971cf72
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
7 years ago
70d500502a
ImVector: Fixed insert() helper using the = operator (followup to be consistent with 4186c2c2b1)
7 years ago
2fecd332fc
Viewport, Platform: Added void* to render/swap buffer functions. Comments. ( #1542 , #1042 )
7 years ago
33ad8b2f0c
Nav: Track nav input source more generally (gamepad vs keyboard) ( #787 ) + update todos and demo tweaks
7 years ago
46b61427e1
Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. ( #1542 , #1042 )
7 years ago
bcf4ed28a9
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.h
7 years ago
d8d93f6360
imgui.h: Various comments and tweaks.
7 years ago
6fe22e6297
imgui.h: Moved columns lower in the file. Various spacing changes and minor comments.
7 years ago
6cfc9e6256
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.h
7 years ago
6bda816ffe
ImVector: Added copy/assign operators as helpers to ease cloning of data.
7 years ago
1e296453ef
ImDrawList: Added Clone() helper function.
7 years ago
4186c2c2b1
ImVector: resize() / push_back() use memcpy() as we are not supposed to be constructor/destructor/operator aware at all. (If we do need to rework ImVector). In turn this will allow us to define assign/copy operators.
7 years ago
d68be086b2
ImVector: Using value_type consistently. Spacing.
7 years ago
533c86a7a3
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
7 years ago
d0e0b106f0
Examples: SDL,GLFW,Vulkan: The Platform<>Renderer link is handled by SDL/GLFW platforms, both can compile without Vulkan headers, SDL+Vulkan is now on part with GLFW+Vulkan (aka broken the same way!). ( #1542 )
7 years ago
921bb92eec
Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. ( #1542 )
7 years ago
c50198debe
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize ( #1542 ) wip
7 years ago
8657201257
Merge branch 'master' into viewport
7 years ago
0e3a6ef4f7
Moved IM_NEW, IM_DELETE helpers to imgui.h for convenient use by back-ends and user code.
7 years ago
7b833dabc8
ImVector: Spacing, assert tweaks
7 years ago
26296bb4c1
Misc: Fix 111ea7af77, GetStyleColorName() would assert, removed removed ImGuiCol defines (too much risk/complexity trying to silently ignore it).
7 years ago
b88492746e
Examples, Viewport: Vulkan: Experiment (broken) multi-viewport support, merging code from ParticlePeter branches. ( #1542 , #1042 )
7 years ago
f6fc28dfd2
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042 )
7 years ago
111ea7af77
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
7 years ago
e7670c0bcc
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. ( #707 )
7 years ago
5e63711084
Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. ( #1542 , #1676 )
7 years ago
1f6ad7a894
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
7 years ago
64cbbed152
Merge branch 'master' into viewport
7 years ago
43f375b2f2
Viewport,Platform: Added GetWindowDpiScale() platform interface, changes of scale are reflected by positioning and resizing windows in their given viewport. ( #1542 )
7 years ago
1eb89d7e3b
Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.
7 years ago
4d46383100
Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). ( #1542 )
7 years ago
a3d5f92214
Merge branch 'master' into font_offset
7 years ago
1ef1acbd8d
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
7 years ago
3dfac93ebe
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
7 years ago
642c6748ac
Comments, Changelog
7 years ago
a1f3949d71
Drag and Drop: Increased payload data type to 32 characters. ( #143 )
7 years ago
9dcc07422e
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. ( #1542 )
7 years ago
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
7 years ago
8e3274e137
Viewport: Tracking current viewport we are appending to + added callback in PlatformInterface for DPI purpose (WIP). ( #1542 )
7 years ago
0ec356eb6e
Comments, FAQ update.
7 years ago
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
7 years ago
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
7 years ago
1549c5cf5e
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
7 years ago
e9fa17e1bf
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). ( #1542 )
7 years ago
df8a9c49eb
Allow user to override ImTextureId. ( #1641 )
7 years ago
6797ee4b68
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. ( #787 )
7 years ago
b3594a6407
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
7 years ago
d98a5d54aa
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
735267d27c
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) ( #1542 )
7 years ago
b32bb4e6e3
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
7 years ago
3f335b0d42
Merge branch 'master' into examples_refactor
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
27667fc035
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. ( #1079 )
7 years ago
e6bc840f6f
Merge branch 'master' into examples_refactor
7 years ago
omar
Kirill Artemov
Bruce Mitchener
Doug Binks
daniel-murray