omar
|
d213c0eb7e
|
Style: Tweaked default border (undo half-way from original c1e1e015c4) (#707)
|
7 years ago |
|
omar
|
b0fc30bd19
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
7c5556c921
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
92efa00bc9
|
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
|
7 years ago |
|
omar
|
6ed75d3046
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
eb2bbf6f29
|
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
|
7 years ago |
|
omar
|
52b39af0a0
|
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
|
7 years ago |
|
omar
|
6be7d4904e
|
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
|
7 years ago |
|
omar
|
2e35957a81
|
Undo reordering of ImGuiKey in Nav branch
|
7 years ago |
|
omar
|
8581050002
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
141339e4b7
|
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
|
7 years ago |
|
omar
|
8e89809078
|
Merge branch 'master' into navigation
|
7 years ago |
|
ocornut
|
2ad2190d47
|
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
|
7 years ago |
|
omar
|
f3ab5e6252
|
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) (#787). Thanks @Grouflon
|
7 years ago |
|
omar
|
bea06117bb
|
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291)
|
7 years ago |
|
omar
|
ce7f3d4831
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
444792f75f
|
Merge fixes from ,master branch
|
7 years ago |
|
ocornut
|
50b3a14d0a
|
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
|
7 years ago |
|
omar
|
7de68fbe3d
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
d5b0d51274
|
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
|
7 years ago |
|
omar
|
9670fe9ca7
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
6ee317d26d
|
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
|
7 years ago |
|
omar
|
6c82af2b96
|
Navigation branch fix (we changed Clip)
|
7 years ago |
|
omar
|
543dc2817f
|
Fixed an assert when calling CloseCurrentPopup() twice in a row.
|
7 years ago |
|
omar
|
53e73182ff
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
530baee1a7
|
Removed tabs that slipped through the cracks
|
7 years ago |
|
omar
|
9b484d24cd
|
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
|
7 years ago |
|
omar
|
067127f113
|
Columns: Caching columns clipping rectangles (#125)
|
7 years ago |
|
omar
|
adeaf1cd72
|
Columns: Moved PushColumnClipRect() to imgui_internal.h
|
7 years ago |
|
omar
|
54bdd00df7
|
Columns: Fix for explicit content width and scrollbar. (#519, #125)
|
7 years ago |
|
omar
|
ea493fd8da
|
Merge branch 'ggtucker-master'
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
1ebd7ec049
|
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913)
|
7 years ago |
|
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)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
7f0063f858
|
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125)
|
7 years ago |
|
omar
|
e70d49ba1f
|
Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125)
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
a511b00226
|
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913, #125)
|
7 years ago |
|
omar
|
3bf2af23e6
|
Columns: Fixed EndColumns() not repositioning the cursor. (#913)
|
7 years ago |
|
omar
|
19a42cb2fd
|
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
|
7 years ago |
|
omar
|
bc78535bbf
|
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
b4eeb4aa8d
|
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
|
7 years ago |
|
omar
|
af2db53780
|
Added GetStyleColorVec4()
|
7 years ago |
|
omar
|
cf84650ee8
|
GCC warnings fixes
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
1065a7b95b
|
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
|
7 years ago |
|
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.)
|
7 years ago |
|
omar
|
3b11e73333
|
Examples: gitignore added patterns for modern MSVC versions
|
7 years ago |
|
omar
|
bf0d9c123e
|
Merge branch 'master' into navigation
|
7 years ago |