omar
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
8 years ago |
|
omar
|
a78ef7a369
|
Comments
|
8 years ago |
|
omar
|
942cb0e1f2
|
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
|
8 years ago |
|
omar
|
a4012fd5b2
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
b5ad88627d
|
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
|
8 years ago |
|
omar
|
a1bcc8392e
|
Fixed GetScrollMaxX() debug left-over from 7096fd8500 (#1271)
|
8 years ago |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
8 years ago |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
0ab722c3c5
|
Columns: First first column appearing wider than others (#1266)
|
8 years ago |
|
omar
|
d43c25d8f4
|
SetScrollHere() tweak to make the code a little less confusing
|
8 years ago |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
8 years ago |
|
omar
|
7096fd8500
|
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. (#1271, #246)
|
8 years ago |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
8 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)
|
8 years ago |
|
omar
|
d762f1dbfb
|
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). (#1262)
|
8 years ago |
|
omar
|
95f2706d1c
|
Clipboard: [windows] Fixed not closing win32 clipboard on early return. (#1264)
|
8 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)
|
8 years ago |
|
omar
|
f6460970c5
|
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)
|
8 years ago |
|
omar
|
fb54dce71c
|
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
|
8 years ago |
|
omar
|
72da4081f8
|
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
|
8 years ago |
|
omar
|
2f508c7073
|
ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). (#346)
|
8 years ago |
|
omar
|
10ef5a63f0
|
ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. (#346)
|
8 years ago |
|
omar
|
cc3cce7567
|
Comments, minor tidying up.
|
8 years ago |
|
omar
|
70ee41b8b3
|
ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. (#346)
|
8 years ago |
|
omar
|
4b2f157fb1
|
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346)
|
8 years ago |
|
omar
|
efbb1ae04e
|
ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. (#346)
|
8 years ago |
|
omar
|
3ee969c3e3
|
ColorPicker: Alpha bar using a checkerboard. (#346)
|
8 years ago |
|
omar
|
3075d8bcd4
|
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
|
8 years ago |
|
omar
|
f6a89779c8
|
ColorEdit4: Hex input clamps integer components to 0..255 range during printout (#346)
|
8 years ago |
|
omar
|
e1a00c3d26
|
ColorButton: Added frame border when style border are off. (#346) @jdumas
|
8 years ago |
|
omar
|
90fcd4a829
|
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
|
8 years ago |
|
omar
|
3fe7739b5d
|
ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. (#346)
|
8 years ago |
|
omar
|
3ffcc72f98
|
ColorPicker: Better cursor/color preview over the color matrix. (#346)
|
8 years ago |
|
omar
|
fef8aac523
|
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)
|
8 years ago |
|
omar
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)
|
8 years ago |
|
omar
|
e84224bcd5
|
ColorEdit4: Can open context menu from inputs/drags as well (#346)
|
8 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)
|
8 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)
|
8 years ago |
|
omar
|
6bc1572d31
|
ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346)
|
8 years ago |
|
omar
|
973d4a361b
|
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346)
|
8 years ago |
|
omar
|
cdcda9ff68
|
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. (#346)
|
8 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)
|
8 years ago |
|
omar
|
b1cbd87a94
|
ColorEdit4: Minor tidying up. (#346)
|
8 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)
|
8 years ago |
|
omar
|
a9df6bfe86
|
ColorButton: Fixed rounding corners artefact when there is a single cell.
|
8 years ago |
|
omar
|
b7a563276d
|
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)
|
8 years ago |
|
omar
|
c1c2b2400a
|
ColorButton: Undo ce203f99f5
|
8 years ago |
|
omar
|
2e37db9002
|
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)
|
8 years ago |
|
omar
|
27e5b09af1
|
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview (#346)
|
8 years ago |
|
omar
|
69dd1ed583
|
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346)
|
8 years ago |