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
|
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
|
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
|
7 years ago |
|
omar
|
a85a14370b
|
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
|
7 years ago |
|
omar
|
a9915681eb
|
PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747)
|
7 years ago |
|
omar
|
5ea1865fdb
|
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
|
7 years ago |
|
omar
|
d2259f65e5
|
Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799)
|
7 years ago |
|
omar
|
f98376d02b
|
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
a83f7083ed
|
BeginPopupEx() uses ImGuiID internally
|
7 years ago |
|
omar
|
a6d69f04c0
|
PlotHistogram: bars are drawn based on the position of zero (#828)
|
7 years ago |
|
omar
|
3d6e037c23
|
Comments (#1034)
|
7 years ago |
|
omar
|
bd3dfc0eba
|
Moved TODO list to TODO.txt
|
7 years ago |
|
omar
|
2b7fe73a08
|
Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (#1048, #1056)
|
7 years ago |
|
omar
|
c1e1e015c4
|
Style: Tweaked default border (which is off by default) to be less noticeable (#707, #1019)
|
7 years ago |
|
omar
|
648f75b245
|
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019)
|
7 years ago |
|
omar
|
6a4064e5f2
|
PathArcToFast: Minor renaming for clarification. Comments.
|
7 years ago |
|
omar
|
8c61a4eb4c
|
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
|
7 years ago |
LuK1337
|
8352d43a0c
|
Fix broken ImGuiColorEditFlags_NoAlpha flag check
* Fixes warning:
imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
|
7 years ago |
|
omar
|
908b025c3c
|
Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks
|
7 years ago |
|
omar
|
08265bfbd9
|
RenderArrow(): fix warning. re-orderer lines to match enum order.
|
7 years ago |
|
omar
|
d7cad903aa
|
Documentation tweaks
|
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
|
53d1b1e929
|
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. (#346)
|
7 years ago |
|
omar
|
fed18d3203
|
Removed old ValueColor() helpers. (#346)
|
7 years ago |
|
omar
|
fc5ab0cb8d
|
RenderCheckMark() tidying up
|
7 years ago |
|
omar
|
4fd148f4f9
|
Added ImFontAtlas::GlyphRangesBuilder helper + doc
|
7 years ago |
|
omar
|
43e2abbee3
|
Comments, FAQ entry (#586, #1105)
|
7 years ago |
|
omar
|
55b99d753c
|
Minor string typo
|
7 years ago |
|
omar
|
a78ef7a369
|
Comments
|
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
|
a4012fd5b2
|
Merge branch 'master' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
b5ad88627d
|
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
|
7 years ago |
|
omar
|
a1bcc8392e
|
Fixed GetScrollMaxX() debug left-over from 7096fd8500 (#1271)
|
7 years ago |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
0ab722c3c5
|
Columns: First first column appearing wider than others (#1266)
|
7 years ago |
|
omar
|
d43c25d8f4
|
SetScrollHere() tweak to make the code a little less confusing
|
7 years ago |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
7 years ago |
|
omar
|
7096fd8500
|
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. (#1271, #246)
|
7 years ago |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
7 years ago |
|
omar
|
46c73cccff
|
Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) (#1252)
|
7 years ago |
|
omar
|
d762f1dbfb
|
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). (#1262)
|
7 years ago |
|
omar
|
95f2706d1c
|
Clipboard: [windows] Fixed not closing win32 clipboard on early return. (#1264)
|
7 years ago |
|
omar
|
40ac84d701
|
DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. (#671)
|
7 years ago |
|
omar
|
f6460970c5
|
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)
|
7 years ago |
|
omar
|
fb54dce71c
|
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
|
7 years ago |
|
omar
|
72da4081f8
|
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
|
7 years ago |
|
omar
|
2f508c7073
|
ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). (#346)
|
7 years ago |
|
omar
|
10ef5a63f0
|
ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. (#346)
|
7 years ago |
|
omar
|
cc3cce7567
|
Comments, minor tidying up.
|
7 years ago |
|
omar
|
70ee41b8b3
|
ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. (#346)
|
7 years ago |
|
omar
|
4b2f157fb1
|
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346)
|
7 years ago |
|
omar
|
efbb1ae04e
|
ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. (#346)
|
7 years ago |
|
omar
|
3ee969c3e3
|
ColorPicker: Alpha bar using a checkerboard. (#346)
|
7 years ago |
|
omar
|
3075d8bcd4
|
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
|
7 years ago |
|
omar
|
f6a89779c8
|
ColorEdit4: Hex input clamps integer components to 0..255 range during printout (#346)
|
7 years ago |
|
omar
|
e1a00c3d26
|
ColorButton: Added frame border when style border are off. (#346) @jdumas
|
7 years ago |
|
omar
|
90fcd4a829
|
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
|
7 years ago |
|
omar
|
3fe7739b5d
|
ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. (#346)
|
7 years ago |
|
omar
|
3ffcc72f98
|
ColorPicker: Better cursor/color preview over the color matrix. (#346)
|
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
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)
|
7 years ago |
|
omar
|
e84224bcd5
|
ColorEdit4: Can open context menu from inputs/drags as well (#346)
|
7 years ago |
|
omar
|
6c82572a35
|
ColorEdit4: Fixed not returning true when clicking on the Original/Ref color in Picker spawned from ColorEdit4 + shallow tidying up (#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
|
6bc1572d31
|
ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346)
|
7 years ago |
|
omar
|
973d4a361b
|
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346)
|
7 years ago |
|
omar
|
cdcda9ff68
|
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. (#346)
|
7 years ago |
|
omar
|
c36d59a42a
|
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. (#346)
|
7 years ago |
|
omar
|
b1cbd87a94
|
ColorEdit4: Minor tidying up. (#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
|
a9df6bfe86
|
ColorButton: Fixed rounding corners artefact when there is a single cell.
|
7 years ago |
|
omar
|
b7a563276d
|
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)
|
7 years ago |
|
omar
|
c1c2b2400a
|
ColorButton: Undo ce203f99f5
|
7 years ago |
|
omar
|
2e37db9002
|
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)
|
7 years ago |
|
omar
|
27e5b09af1
|
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview (#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
|
76bae2f015
|
ColorEdit, ColorPicker: Fixed broken build due to commiting an undesirable change in 78a8f798c5 (#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
|
6796e771fd
|
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again.
|
7 years ago |
|
omar
|
ce203f99f5
|
ColorButton: Push a text baseline offset if higher than g.FontSize. (#346)
|
7 years ago |
|
omar
|
78a8f798c5
|
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)
|
7 years ago |
|
omar
|
9d0e5beaa7
|
GetColorU32(ImGuiCol): avoid using GImGui twice since some implementation make it a TLS-ish variable with non-trivial accessors.
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
4f1f251bd2
|
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. (#346)
|
7 years ago |
|
omar
|
8d32e8dae6
|
ColorPicker: Handle out of 0..1 range colors when displaying the cross hair. (#346)
|
7 years ago |
|
omar
|
7b2d79cffd
|
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. (#346)
|
7 years ago |
|
omar
|
a8b202782f
|
ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)
|
7 years ago |
|
omar
|
790d0eb5be
|
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346)
|
7 years ago |
|
omar
|
4355b2e422
|
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments (#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
|
dd9c2f97a8
|
ColorPicker: Renamed _NoSliders to _NoInputs (#346)
|
7 years ago |
|
omar
|
eba33deaf3
|
ColorPicker: Longer white line for hue/alpha selection, scale down according to ItemInnerSpacing. (#346)
|
7 years ago |
|
omar
|
1edeea2f5a
|
ColorPicker: Removed extraneous ImGui:: prefixes + minor comments (#346)
|
7 years ago |
|
omar
|
e79d7553b0
|
ColorPicker: Don't use Alpha setting when enabling all 3 sliders (#346)
|
7 years ago |
|
omar
|
97bedd704c
|
Better, unified color tooltip (#346)
|
7 years ago |
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
7 years ago |