omar
|
059e838b2c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
be9628494a
|
Demo: Rearranged everything under Widgets in a more consistent way.
|
7 years ago |
|
omar
|
d888de4483
|
Demo: Merged a few demo tweaks from navigation branch to minimize drift.
|
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
|
d952a8d3bf
|
Demo: Color widget demo tweaks (#346)
|
7 years ago |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
7 years ago |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
7 years ago |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
7 years ago |
|
omar
|
cdea8ca94f
|
Demo: Comment about 'static' and some tweaks (#1267)
|
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
|
3075d8bcd4
|
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
|
7 years ago |
|
omar
|
91a4f5df25
|
Demo: Tweaks
|
7 years ago |
|
omar
|
90fcd4a829
|
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
|
7 years ago |
|
omar
|
4d844ffde1
|
Demo: custom ColorPicker popup example tweaks (#346)
|
7 years ago |
|
omar
|
f040547a5f
|
Demo: custom ColorPicker popup example (#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
|
35186a1165
|
Demo: Comments (#346)
|
7 years ago |
|
omar
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo 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
|
b7a563276d
|
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)
|
7 years ago |
|
omar
|
2e37db9002
|
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)
|
7 years ago |
|
omar
|
6796e771fd
|
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again.
|
7 years ago |
|
omar
|
d29a4c5e5c
|
Demo: Removed the color button from the context menu example because it is misleading now that our color widget have tooltip/context menus themselves. (#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
|
4def2ce339
|
ColorPicker: Demo tweaks (#346)
|
7 years ago |
|
omar
|
790d0eb5be
|
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346)
|
7 years ago |
|
omar
|
91bf8fd689
|
ColorPicker,ColorEdit: Demo code (#346)
|
7 years ago |
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
100d30a0a1
|
Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169)
|
7 years ago |
|
omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
8261d9ff30
|
Comments (#1172, #1231)
|
7 years ago |
|
omar
|
12d265fa31
|
Version 1.51 WIP tag
|
7 years ago |
|
omar
|
5e1caaaef3
|
Version 1.50
|
7 years ago |
|
omar
|
8228dc20df
|
Merge branch 'master' into 2016-07-navigation
|
7 years ago |
|
omar
|
c038339a4c
|
Merge branch 'master' into 2015-02-colorpicker
|
7 years ago |
|
omar
|
026d021df1
|
Demo: Fixed warnings introduced in 0828a1fd6c
|
7 years ago |
|
omar
|
0828a1fd6c
|
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
|
8 years ago |
|
omar
|
497381dc3d
|
Comments
|
8 years ago |
|
omar
|
89b1497843
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
288dccd5a5
|
Merge branch 'master' into 2016-07-navigation
|
8 years ago |
|
omar
|
e10ceebd36
|
ImFont: Store the texture surface used to get an idea of how costly each font is.
|
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
|
714beb217c
|
Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.
|
8 years ago |
|
ocornut
|
68df09cf47
|
Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)
|
8 years ago |