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
|
141339e4b7
|
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
|
2017-08-22 19:51:12 +08:00 |
|
ocornut
|
2ad2190d47
|
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
|
2017-08-22 19:47: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
|
d5b0d51274
|
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
|
2017-08-22 18:13:10 +08:00 |
|
omar
|
6ee317d26d
|
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
|
2017-08-22 17:46:50 +08:00 |
|
omar
|
543dc2817f
|
Fixed an assert when calling CloseCurrentPopup() twice in a row.
|
2017-08-21 22:54:20 +08:00 |
|
omar
|
530baee1a7
|
Removed tabs that slipped through the cracks
|
2017-08-21 00:03:37 +08:00 |
|
omar
|
9b484d24cd
|
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
|
2017-08-20 23:45:02 +08:00 |
|
omar
|
067127f113
|
Columns: Caching columns clipping rectangles (#125)
|
2017-08-20 23:17:59 +08:00 |
|
omar
|
adeaf1cd72
|
Columns: Moved PushColumnClipRect() to imgui_internal.h
|
2017-08-20 23:09:43 +08:00 |
|
omar
|
54bdd00df7
|
Columns: Fix for explicit content width and scrollbar. (#519, #125)
|
2017-08-20 21:32:18 +08:00 |
|
omar
|
ea493fd8da
|
Merge branch 'ggtucker-master'
|
2017-08-20 21:09:22 +08:00 |
|
omar
|
83e8d10fab
|
Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. (#125, #913, #893, #1138)
|
2017-08-20 21:08:07 +08:00 |
|
omar
|
1ebd7ec049
|
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913)
|
2017-08-20 20:58:24 +08:00 |
|
omar
|
7ff1c149b5
|
Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. (#913, #125)
|
2017-08-20 20:58:24 +08:00 |
|
omar
|
1c83b073c6
|
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913)
|
2017-08-20 20:58:23 +08:00 |
|
omar
|
7f0063f858
|
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125)
|
2017-08-20 19:32:50 +08:00 |
|
omar
|
e70d49ba1f
|
Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125)
|
2017-08-20 19:32:50 +08:00 |
|
omar
|
9307631c90
|
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. (#913, #125). End() calls EndColumns() directly.
|
2017-08-20 19:32:50 +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
|
3bf2af23e6
|
Columns: Fixed EndColumns() not repositioning the cursor. (#913)
|
2017-08-20 18:44:54 +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
|
cf84650ee8
|
GCC warnings fixes
|
2017-08-20 16:39:43 +08:00 |
|
omar
|
fd394e1e95
|
Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
|
2017-08-20 16:39:11 +08:00 |
|
omar
|
1065a7b95b
|
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
|
2017-08-20 15:38:05 +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
|
3b11e73333
|
Examples: gitignore added patterns for modern MSVC versions
|
2017-08-20 15:17:37 +08:00 |
|
omar
|
8be7a60f20
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
2017-08-17 21:19:54 +08:00 |
|
omar
|
1086c87767
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
2017-08-17 21:13:14 +08:00 |
|
omar
|
4075cc58e9
|
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)
|
2017-08-17 20:44:44 +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
|
4a7e1ff4d4
|
ImFontAtlas: Some shallow renaming + added an assert for clarification
|
2017-08-17 15:35:59 +08:00 |
|
omar
|
52f1a4124c
|
Demo: Tweaked Fonts section.
|
2017-08-17 13:56:16 +08:00 |
|
omar
|
c569676a7b
|
ImVector: Added a const
|
2017-08-17 11:46:25 +08:00 |
|
omar
|
0be4f66d89
|
ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618)
|
2017-08-17 11:46:25 +08:00 |
|
omar
|
34d09f2dc8
|
Merge pull request #1283 from onqtam/imgui_api
Added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
|
2017-08-16 23:29:52 +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
|
a9915681eb
|
PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747)
|
2017-08-16 14:37:54 +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
|
e8dd435ccd
|
Merge branch 'mkeeter-is-popup-open'
|
2017-08-16 13:43:02 +08:00 |
|
omar
|
d2259f65e5
|
Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799)
|
2017-08-16 13:42:41 +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 |
|
omar
|
a83f7083ed
|
BeginPopupEx() uses ImGuiID internally
|
2017-08-16 13:06:14 +08:00 |
|