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
|
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
|
067127f113
|
Columns: Caching columns clipping rectangles (#125)
|
7 years ago |
|
omar
|
adeaf1cd72
|
Columns: Moved PushColumnClipRect() to imgui_internal.h
|
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
|
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
|
bf0d9c123e
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
8be7a60f20
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
7 years ago |
|
omar
|
1086c87767
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
7 years ago |
|
omar
|
4075cc58e9
|
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)
|
7 years ago |
|
omar
|
a85a14370b
|
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
|
7 years ago |
|
omar
|
d2259f65e5
|
Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799)
|
7 years ago |
|
omar
|
e682362f35
|
TODO list update, comments
|
7 years ago |
|
omar
|
73f9c9d80c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
7 years ago |
|
omar
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
7 years ago |
|
omar
|
942cb0e1f2
|
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
|
7 years ago |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
7 years ago |
|
omar
|
fb54dce71c
|
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
|
7 years ago |
|
omar
|
1a26d0bc98
|
Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
|
7 years ago |
|
omar
|
72da4081f8
|
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
|
7 years ago |
|
omar
|
390188dfa9
|
Comments about parts of imgui_internal.h that will self-destruct.
|
7 years ago |
|
omar
|
fef8aac523
|
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)
|
7 years ago |
|
omar
|
7537dff806
|
ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code (#346)
|
7 years ago |
|
omar
|
bfec9c657e
|
ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. (#346)
|
7 years ago |
|
omar
|
69dd1ed583
|
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346)
|
7 years ago |
|
omar
|
19c6a9c0e0
|
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( (#346) + comments
|
7 years ago |
|
omar
|
78a8f798c5
|
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)
|
7 years ago |
|
omar
|
a8b202782f
|
ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
85d9c8fb46
|
Internals: renaming IndexWithinParent to OrderWithinParent
|
7 years ago |
|
omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
12d265fa31
|
Version 1.51 WIP tag
|
7 years ago |
|
omar
|
5e1caaaef3
|
Version 1.50
|
7 years ago |
|
omar
|
2a3c61e5f8
|
Merge branch 'master' into 2016-07-navigation
|
8 years ago |
|
omar
|
92ea8d1131
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
b8043d3ee5
|
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917)
|
8 years ago |
|
omar
|
b6c0227add
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
c76be71acf
|
Merge branch 'master' into 2016-07-navigation
|
8 years ago |
|
omar
|
6257b5814a
|
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
|
8 years ago |
|
ocornut
|
3028ccc25b
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
8 years ago |
|
ocornut
|
f4cf972ea9
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
ocornut
|
104b381023
|
Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). (#917)
|
8 years ago |
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.
|
8 years ago |