omar
a2b2e56e8e
Merge branch 'master' into navigation
2017-09-27 12:31:12 +02:00
omar
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
2017-09-27 11:21:42 +02:00
omar
8fd4beddb8
Merge branch 'master' into navigation
2017-09-26 20:28:40 +02:00
omar
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
2017-09-26 20:24:27 +02:00
omar
501e73feed
Minor comments
2017-09-26 20:18:14 +02:00
omar
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
2017-09-26 20:05:16 +02:00
omar
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
2017-09-26 19:54:30 +02:00
omar
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
2017-09-26 19:10:29 +02:00
omar
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
2017-09-26 18:41:21 +02:00
omar
f1a20ec66d
Merge branch 'master' into navigation
2017-09-26 16:54:37 +02:00
omar
728deff56c
Comments, debug code (commented), todo list
2017-09-26 15:33:57 +02:00
omar
99b9f1c93c
Fix static misusage error with decent compilers. Error introduced in 4b82759598
2017-09-26 11:23:06 +02:00
omar
7e8069dd23
Merge branch 'master' into navigation
2017-09-25 22:08:38 +02:00
omar
4b82759598
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
...
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
2017-09-25 18:25:43 +02:00
omar
92e55a8a79
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-09-18 16:06:48 +02:00
omar
1ff27d7db8
Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. ( #787 )
2017-09-18 16:04:28 +02:00
omar
44e8d94aba
Merge branch 'master' into navigation
2017-09-18 15:32:31 +02:00
omar
709653c330
Merge branch 'master' into styles
2017-09-18 15:03:25 +02:00
omar
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 20:33:39 +02:00
omar
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
2017-09-06 20:28:36 +02:00
omar
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 19:17:51 +02:00
omar
804ee78731
Added IsWindowAppearing().
2017-09-01 21:55:59 +02:00
omar
fd684ba974
Removed 2 obsolete redirection functions (obsoleted 26+ months ago).
2017-09-01 17:43:56 +02:00
omar
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-08-29 16:21:46 +08:00
omar
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
2017-08-29 16:13:17 +08:00
omar
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
2017-08-29 16:05:12 +08:00
omar
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-26 18:43:10 +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
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
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
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
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-08-21 00:04:45 +08:00
omar
9b484d24cd
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
2017-08-20 23:45:02 +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
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
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
bf0d9c123e
Merge branch 'master' into navigation
2017-08-18 00:25:12 +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
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
2017-08-17 17:24:33 +08:00
omar
c569676a7b
ImVector: Added a const
2017-08-17 11:46:25 +08:00
Viktor Kirilov
fd9460a087
added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
2017-08-16 17:52:11 +03: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
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
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
James Wallis
9239e91dc9
Whitespace fix to previous
2017-08-15 14:12:32 +01:00
James Wallis
718f00d651
Make font atlas packing padding configurable
2017-08-15 14:11:04 +01:00
omar
18f217e631
Style: Moved position of ImGuiCol_TitleBgCollapsed
2017-08-15 19:06:02 +08:00
omar
f8f382221c
ImVector: added resize() variant with initialization value
2017-08-15 11:41:00 +08:00
omar
9bf5028fd3
Merge branch 'master' into navigation
2017-08-15 00:50:59 +08:00
omar
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
2017-08-14 16:53:38 +08:00
omar
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
2017-08-14 16:50:20 +08:00
omar
c26b29b254
Style: Moving code in a function to make incoming diff easier to parse.
2017-08-14 15:14:46 +08:00
omar
648f75b245
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. ( #707 , #1019 )
2017-08-14 13:04:32 +08:00
omar
8c61a4eb4c
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
2017-08-14 11:29:54 +08:00
omar
e3fae56089
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-11 14:30:17 +08:00
omar
d7cad903aa
Documentation tweaks
2017-08-11 14:29:27 +08:00
omar
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-08-11 13:44:25 +08:00
omar
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-08-11 13:36:28 +08:00
omar
fed18d3203
Removed old ValueColor() helpers. ( #346 )
2017-08-09 23:04:26 +08:00
omar
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
2017-08-09 22:42:03 +08:00
omar
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-08-08 17:30:32 +08:00
omar
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
2017-08-08 15:54:20 +08:00
omar
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2017-08-07 22:51:18 +08:00
omar
f4c0134f9f
Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment ( #346 )
2017-08-06 18:08:58 +08:00
omar
f6460970c5
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ( #346 )
2017-07-31 21:20:42 +08:00
omar
4b2f157fb1
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ( #346 )
2017-07-31 11:50:14 +08:00
omar
3075d8bcd4
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). ( #346 )
2017-07-30 23:08:43 +08:00
omar
65a27732d8
ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. ( #346 )
2017-07-30 17:57:38 +08:00
omar
90fcd4a829
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview ( #346 )
2017-07-30 17:55:42 +08:00
omar
3926bd08e1
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. ( #346 )
2017-07-29 17:23:32 +08:00
omar
c36d59a42a
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. ( #346 )
2017-07-27 17:16:46 +08:00
omar
27e5b09af1
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview ( #346 )
2017-07-26 23:07:35 +08:00
omar
6796e771fd
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag ( #346 ). Reorder flags again.
2017-07-26 16:28:01 +08:00
omar
c84acf3f56
Comments
2017-07-26 15:59:57 +08:00
omar
95fe11b5bf
Added GetColorU32(u32) variant that does the style alpha multiply without a floating point round trip. Not 100% sure about that before the signature may seem ambiguous? But also make using imgui+drawlist more consistent in end-user extensions.
2017-07-26 14:34:59 +08:00
omar
f39cd61bf0
Reorder ImGuiColorEditFlags_ ( #346 )
2017-07-23 19:08:58 +08:00
omar
4f1f251bd2
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. ( #346 )
2017-07-23 19:02:26 +08:00
omar
7b2d79cffd
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. ( #346 )
2017-07-23 18:44:32 +08:00
omar
790d0eb5be
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option ( #346 )
2017-07-22 19:24:39 +08:00
omar
4355b2e422
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments ( #346 )
2017-07-22 19:04:10 +08:00
omar
15be7e1a71
ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h ( #346 )
2017-07-22 18:01:16 +08:00
omar
dd9c2f97a8
ColorPicker: Renamed _NoSliders to _NoInputs ( #346 )
2017-07-22 17:38:38 +08:00
omar
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
2017-07-21 02:34:19 +08:00
omar
138a9dbaeb
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) ( #862 )
2017-07-21 02:21:48 +08:00
omar
25f3717a1c
Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. ( #1237 )
2017-07-20 20:57:46 +08:00
omar
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
2017-07-19 14:53:25 +08:00
omar
d1145e990d
Comments tweak ( #1231 )
2017-07-16 13:07:11 +08:00
omar
41f944238b
Comments about GlyphExtraSpacing ( #1192 )
2017-07-15 18:03:43 +08:00
omar
8261d9ff30
Comments ( #1172 , #1231 )
2017-07-15 17:11:53 +08:00
omar
03e6bfe84a
Comments
2017-07-14 19:49:11 +08:00
omar
d3f4309491
Comments about ImGuiStyleVar enum ( #1198 )
2017-06-24 13:11:46 +02:00
omar
1e981f00e5
Comments
2017-06-21 13:50:31 +02:00
omar
a5e0210902
Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. ( #1184 )
2017-06-19 21:19:48 +02:00
omar
12d265fa31
Version 1.51 WIP tag
2017-06-13 11:30:22 +02:00
omar
5e1caaaef3
Version 1.50
2017-06-02 12:22:34 +02:00
omar
2acbd1ac2d
Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear
2017-06-02 11:25:45 +02:00
omar
62c4698a73
Further clarifications of the key indices passed to IsKeyXXX functions ( #1159 )
2017-05-27 17:55:48 +02:00
omar
8228dc20df
Merge branch 'master' into 2016-07-navigation
2017-05-26 13:44:08 +02:00
omar
c038339a4c
Merge branch 'master' into 2015-02-colorpicker
2017-05-26 13:43:36 +02:00
omar
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
2017-05-26 13:42:36 +02:00
omar
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
2017-05-26 13:36:52 +02:00
omar
27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +02:00
omar
89b1497843
Merge branch 'master' into 2016-02-colorpicker
2017-05-01 12:37:34 +02:00
omar
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
2017-05-01 12:36:46 +02:00
omar
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
2017-05-01 12:34:32 +02:00
Peter
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
2017-04-28 10:04:20 +02:00
Mikulas Florek
7a37a1c3f6
do not export inline function, it causes problems on some compiers
2017-03-24 12:45:09 +01:00
Mikulas Florek
316555f9de
missing API
2017-03-24 10:10:22 +01:00
omar
288dccd5a5
Merge branch 'master' into 2016-07-navigation
2017-03-17 21:30:16 +01:00
omar
e10ceebd36
ImFont: Store the texture surface used to get an idea of how costly each font is.
2017-03-17 21:29:57 +01:00
omar
931bc61345
Comment about ImGuiInputTextFlags_CtrlEnterForNewLine for InputTextMultiline()
2017-03-16 21:55:36 +01:00
omar
2a3c61e5f8
Merge branch 'master' into 2016-07-navigation
2017-03-16 19:31:12 +01:00
omar
92ea8d1131
Merge branch 'master' into 2016-02-colorpicker
2017-03-16 19:28:30 +01:00
omar
6384eee34f
Minor comments ( #998 )
2017-01-29 16:53:01 +01:00
omar
b6c0227add
Merge branch 'master' into 2016-02-colorpicker
2017-01-11 21:03:35 +01:00
omar
c76be71acf
Merge branch 'master' into 2016-07-navigation
2017-01-11 21:03:25 +01:00
omar
cffdbfe01b
Comments ( #972 )
2017-01-10 10:36:07 +01:00
ocornut
a60b2cc645
Merge branch 'master' into 2016-02-colorpicker
2016-12-23 12:15:58 +01:00
ocornut
fdc70456f4
Merge branch 'master' into 2016-07-navigation
2016-12-23 12:13:52 +01:00
ocornut
db593220fc
Comments, clarified use of io.MouseDelta ( #942 )
...
(ImGuiIO structure layout changed)
2016-12-23 11:34:23 +01:00
Nicolas Guillemot
36d78e0565
const correctness for Combo and ListBox
...
Since Combo and ListBox only read and display the list of items, they
should not modify the pointers inside the array of pointers passed in.
Adding "const" here makes it possible to call these functions with such
an array of const pointers. Previously, a cast to "const char**" was
required as a workaround, otherwise there was a compile error.
2016-12-04 12:54:31 -08:00
Geoffrey Tucker
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
2016-11-13 23:58:09 -08:00
ocornut
941cf1b436
Merge branch 'master' into 2016-07-navigation
2016-11-09 15:21:36 +01:00
ocornut
ccb3db94da
Merge branch 'master' into 2016-02-colorpicker
2016-11-09 15:17:20 +01:00
ocornut
b376b68326
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
2016-11-06 21:50:18 +01:00
Matt Keeter
32dbe836d0
Add user-facing IsPopupOpen function
2016-10-29 15:33:09 -04:00
ocornut
dd6163241c
Merge branch 'master' into 2016-02-colorpicker
2016-10-16 14:02:15 +02:00
ocornut
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
2016-10-16 14:01:13 +02:00
ocornut
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
2016-10-15 11:36:43 +02:00
ocornut
d649bc485b
Minor comments
2016-10-15 11:18:29 +02:00
ocornut
31dc7d8d63
Added ImGuiMouseCursor_None for usage by app/binding
2016-10-10 18:03:37 +02:00
ocornut
d567595dde
ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions
2016-10-09 10:35:01 +02:00
ocornut
e4deb7a190
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-10-07 09:52:14 +02:00
ocornut
404979e48d
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-10-07 09:52:00 +02:00
ocornut
e07d45709f
ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing ( #844 )
2016-10-07 09:49:52 +02:00
ocornut
68c81739bf
Minor tidying up following merge BGRA color PR ( #844 )
2016-10-01 14:29:12 +02:00
Michał Cichoń
1999c01db8
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
2016-09-26 12:00:33 +02:00
Michał Cichoń
d75d2b1871
Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h.
...
When IMGUI_USE_BGRA_PACKED_COLOR is defined packed color hold in ImU32 use BGRA format instead RGBA.
2016-09-26 12:00:33 +02:00
ocornut
fea0fcb7c3
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 15:25:55 +02:00
ocornut
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 12:59:24 +02:00
ocornut
1b5bbf725b
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-09-25 12:57:22 +02:00
ocornut
56cdbe434d
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ( #842 )
2016-09-25 12:53:13 +02:00
ocornut
0f303d363a
Refactor text alignment options to use ImVec2, removed ImGuiAlign ( #842 , #222 )
2016-09-25 12:19:15 +02:00
ocornut
c5b8c6303a
Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ( #842 )
2016-09-25 11:06:14 +02:00
ocornut
612b17ef57
Fixing minor english typos ( #827 )
2016-09-11 22:02:35 +02:00
Brian Swetland
5a47346f5a
ImFont: add RenderGlyph() to allow rendering of individual glyphs
2016-09-10 18:21:49 -07:00
ocornut
252f094101
Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() ( #323 )
2016-08-21 15:26:40 +02:00
ocornut
87eb749cbc
Added IsItemHoveredOrFocused() (provisional name), better handling of popup/tooltip positioning when using mouse+nav ( #323 )
2016-08-21 13:25:40 +02:00
ocornut
3ab0d5cdfd
Nav: NavHighlight gets its own color (default to Header color), made rectangle thicker ( #323 )
2016-08-15 13:07:39 +02:00
ocornut
996eb080fa
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-11 22:53:26 +02:00
ocornut
df1d1b5b25
Nav: DragBehavior: Adjust minimum step to displayed precision when using navigation ( #323 , #180 )
2016-08-07 20:40:57 +02:00
ocornut
a68132948b
Nav: Added ImGuiCol_NavWindowingHighlight into style ( #323 )
2016-08-07 15:26:04 +02:00
ocornut
5ef8452509
Nav: Comments ( #323 )
2016-08-07 13:33:15 +02:00
ocornut
cbf24c13ca
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-07 12:15:21 +02:00
ocornut
5d1a0a6f77
Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015)
...
OpenNextNode() -> SetNextTreeNodeOpen()
GetWindowIsFocused() -> IsWindowFocused()
GetItemBoxMin() -> GetItemRectMin()
GetItemBoxMax() -> GetItemRectMax()
IsMouseHoveringBox() -> IsMouseHoveringRect()
IsClipped() -> !IsRectVisible()
2016-08-06 09:48:04 +02:00
ocornut
b8397c2933
Tweak comments ( #768 )
2016-08-06 09:40:26 +02:00
Michał Cichoń
7588dfb67e
Add ability to test arbitrary rectangle for visibility without need of moving cursor.
2016-08-05 11:47:16 +02:00
ocornut
dcff032429
Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. ( #323 )
2016-08-03 23:23:04 +02:00
ocornut
4ccc87c91d
Typo in commented default-value
2016-08-03 21:53:07 +02:00
ocornut
2e52bee12e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-31 17:00:44 +02:00
ocornut
907265d632
Using ImGuiID instead of ImU32 is a few places
2016-07-31 16:48:06 +02:00
ocornut
a154625a56
Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work ( #323 )
2016-07-31 13:40:14 +02:00
ocornut
2545d75c3b
Tidying up, removed two unnecessary window flags from being exposed in imgui.h
2016-07-31 13:05:13 +02:00
ocornut
b3cba62b80
Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows ( #323 )
2016-07-31 12:55:23 +02:00
ocornut
68b73b61b5
Nav: Comment ( #323 )
2016-07-30 23:17:32 +02:00
ocornut
e2dd48ae65
Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus ( #323 )
2016-07-30 18:06:05 +02:00
ocornut
04157da291
Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) ( #323 )
2016-07-30 17:18:34 +02:00
ocornut
5f6f4d0ffc
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-29 11:17:13 +02:00
ocornut
666d83b5c7
InputText/IO: Got rid of individual OSX options in ImGuiIO, added io.OSXBehaviors ( #473 , #650 )
2016-07-29 10:56:47 +02:00
ocornut
802e91f69e
Merge branch 'add-osx-homeend-keys' of https://github.com/michaelbartnett/imgui into michaelbartnett-add-osx-homeend-keys
2016-07-29 10:34:01 +02:00
ocornut
c3aa36d9ab
Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu ( #323 )
2016-07-24 14:49:16 +02:00
ocornut
b2ad33ce41
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-23 20:33:25 +02:00
ocornut
8efd05a148
Tab->Spaces, missing spaces, typos
2016-07-20 11:39:38 +02:00
Adisorn Aeksatean
4141144b21
Added GetGlyphRangesThai()
2016-07-20 11:37:08 +02:00
ocornut
c2cb2a6928
Gamepad/Keyboard navigation support, initial commit, WIP ( #323 )
2016-07-20 00:02:59 +02:00
ocornut
4a11cc35b9
Updated code for repeat delay / repeat handling. GetKeyPressedAmount() now returns a count to support fast repeat rate (where DeltaTime > RepeatRate).
...
Renamed from recently added IsKeyPressed() variant to GetKeyPressedAmount(). (no API breakage, added in branch, bbd3b75609#323 )
2016-07-19 21:26:36 +02:00
ocornut
88c1966629
Added IsAnyWindowFocused(). Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsPosHoveringAnyWindow() -> IsAnyWindowHoveredAtPos(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
2016-07-18 18:24:23 +02:00
ocornut
0300e73b3f
Comments
2016-07-18 15:26:07 +02:00
ocornut
bbd3b75609
Added IsKeyPressed() with explicit repeat delay and repeat rate (for usage by nav) ( #323 )
2016-07-18 15:25:58 +02:00
ocornut
9c71ec38f0
ImVector: reserve() tweak to avoid undefined behavior warning ( #731 )
2016-07-12 11:19:38 +02:00
Michael Bartnett
86f42b5950
osx uses super+arrows for home/end, built on work in ocornut/imgui#473
2016-07-07 13:02:52 -04:00
ocornut
de61fcc619
Minor bits
2016-06-25 17:03:49 +02:00
ocornut
1ef7980e17
Merge branch 'master' into 2016-02-colorpicker
2016-06-15 10:05:17 +02:00
ocornut
f83790dc5a
Comments
2016-06-12 12:23:20 +02:00
ocornut
2da30e8702
Comments ( #691 )
2016-06-11 09:28:20 +02:00
ocornut
65a525550e
ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000)
2016-06-07 09:14:54 +02:00
ocornut
5d4cf1c3f3
Version 1.50 WIP
2016-05-30 19:38:36 +02:00
ocornut
adb85d800d
Version 1.49
2016-05-29 19:16:44 +02:00
ocornut
9a751da136
Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files
2016-05-29 19:14:19 +02:00
ocornut
3ddb50a925
Merge branch 'master' into 2016-02-colorpicker
2016-05-29 19:07:23 +02:00
ocornut
dcef7dedce
Comments ( #590 )
2016-05-29 18:24:02 +02:00
ocornut
d5a12866fe
Comments ( #676 , #655 )
2016-05-29 14:00:35 +02:00
ocornut
1483a69c11
Demo: Tree: showing how to align tree node label with current x position ( #324 , #581 )
2016-05-28 19:30:01 +02:00
ocornut
61c294bb52
Added optional Indent() Unindent() width ( #324 , #581 )
2016-05-28 18:40:00 +02:00
ocornut
a0a48f6e59
Added TreeAdvanceToLabelPos() ( #581 )
2016-05-28 18:15:54 +02:00
ocornut
793f5f8cdb
Comments
2016-05-28 17:54:40 +02:00
ocornut
806a146198
TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet ( #324 , #581 )
2016-05-28 17:12:13 +02:00
ocornut
2acb61e3a1
Comments
2016-05-28 16:52:59 +02:00
ocornut
8f4b123e1b
SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints ( #668 )
2016-05-28 14:02:14 +02:00
ocornut
b7ebeb1610
Added SetNextWindowSizeConstraint() + demo code ( #668 )
2016-05-21 22:53:08 +02:00
ocornut
753bf5cefe
Comments
2016-05-21 22:35:05 +02:00
ocornut
81bf5aeb09
Minor bits
2016-05-21 20:07:51 +02:00
ocornut
69a29e4715
Added NewLine() (very shy reminder that #97 isn't done)
2016-05-16 20:14:07 +02:00
ocornut
787be01e61
ImGuiListClipper comments ( #660 , #661 , #662 )
2016-05-16 20:03:18 +02:00
ocornut
7a28f5bb81
ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere ( #662 )
2016-05-16 19:22:51 +02:00
ocornut
431eaf1abe
Comments to clarify what float[2] int[2] etc. are. May switch to pointers? ( #659 )
2016-05-14 15:35:50 +02:00
ocornut
39bda5ea09
Fixed a IMGUI_API->inline case ( #657 , #349 )
2016-05-14 10:22:25 +02:00
ocornut
f48f9a30ef
ButtonBehavior(), fixed subtle old bug when a repeating button would also return true on release + comments ( #656 )
2016-05-13 11:13:54 +02:00
ocornut
b628acbb52
StyleEditor: comments ( #652 )
2016-05-12 20:59:20 +02:00
ocornut
2f55dc1f33
ImFontConfig: Clarified persistence requirement of GlyphRanges array ( #651 )
2016-05-12 11:58:05 +02:00
ocornut
aa11934efa
Comments to clarify default shared ImFontAtlas and current context pointer thread-safety ( #586 , #591 )
2016-05-08 17:12:54 +02:00
ocornut
7b9c0a5c3f
Renamed ImGuiState -> ImGuiContext ( #586 , #269 )
2016-05-07 19:55:51 +02:00
ocornut
8b428e8c74
Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() ( #586 , #269 )
2016-05-07 19:54:27 +02:00
ocornut
69cc00f91f
ImGuiStorage: Added bool helper functions for completeness.
2016-05-07 18:18:37 +02:00
ocornut
ce4d731486
Minor comments, tweaks
2016-05-07 18:10:32 +02:00
ocornut
89d5026187
Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). ( #625 , #579 )
2016-05-02 12:32:16 +02:00
ocornut
4170b4847d
Style: Changed default IndentSpacing from 22 to 21 ( #581 , #324 )
2016-05-01 23:49:10 +02:00
ocornut
13df4668d1
Added GetTreeNodeToLabelSpacing() helper - tentative name ( #581 , #324 )
2016-05-01 23:47:58 +02:00
ocornut
bb674ccee6
TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag ( #581 , #324 )
2016-05-01 21:15:46 +02:00
ocornut
f79b2d6ce3
TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag ( #581 , #324 , #190 )
2016-05-01 20:12:14 +02:00
ocornut
dc8446d048
Demo: Added simple tree node selection demo ( #581 , #516 , #190 )
2016-05-01 17:55:04 +02:00
ocornut
4c880b7106
Added ImGuiTreeNodeFlags_OpenOnDoubleClick ( #581 , #516 , #190 )
2016-05-01 17:46:08 +02:00
ocornut
a38fd2e186
Added TreeNodeEx() functions ( #581 , #600 , #190 )
2016-05-01 17:45:31 +02:00
ocornut
ac501102fc
Added IsItemClicked() helper ( #581 )
2016-05-01 17:43:17 +02:00
ocornut
ec6471ca87
TreeNodeEx() wired the display-side ImGuiTreeNodeFlags_Selected flag ( #581 )
2016-05-01 16:06:46 +02:00
ocornut
ab6bc05fc3
Fixed ImGuiTreeNodeFlags_AllowOverlapMode to behave better on touch-style inputs ( #600 )
2016-05-01 15:44:50 +02:00
ocornut
df749e3f13
Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. ( #600 )
...
New flag and declaration makes uses of SetNextTreeNode() functions on
collapsing header more obvious as well (#579 ).
2016-05-01 14:34:55 +02:00
ocornut
befe02559a
Added IsRootWindowOrAnyChildHovered() helper ( #615 )
2016-05-01 12:14:07 +02:00
ocornut
be7621f7c5
Updated FAQ about non UTF-8 literal ( #609 , #613 )
2016-04-26 19:23:36 +02:00
ocornut
6bcc31e575
Merge branch 'master' into 2016-02-colorpicker
2016-04-26 11:06:24 +02:00
ocornut
ea6b615179
Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ( #610 )
2016-04-26 11:03:51 +02:00
ocornut
4b6e9ac396
ImFont: Added AddRemapChar() helper ( #609 )
2016-04-26 10:08:06 +02:00
ocornut
247da0e01b
BeginGroup() comment tweaks ( #608 )
2016-04-25 08:45:32 +02:00
ocornut
4b51e43d60
BeginGroup() extra comment because this is overused and misleading ( #608 )
2016-04-24 22:52:07 +02:00
ocornut
727ca4bd17
ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes
2016-04-23 11:37:18 +02:00
ocornut
a20d69f9ce
ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split
2016-04-23 11:29:42 +02:00
