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 |
|