omar
|
1ebd7ec049
|
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913)
|
8 years ago |
|
omar
|
19a42cb2fd
|
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
|
8 years ago |
|
omar
|
bc78535bbf
|
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
# imgui.cpp
# imgui.h
|
8 years ago |
|
omar
|
b4eeb4aa8d
|
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
|
8 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.)
|
8 years ago |
|
omar
|
24a78767d2
|
Merge branch 'master' into styles
# Conflicts:
# TODO.txt
|
8 years ago |
|
omar
|
52f1a4124c
|
Demo: Tweaked Fonts section.
|
8 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
|
8 years ago |
|
omar
|
668a4bf1bc
|
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
|
8 years ago |
|
omar
|
18b50f8eba
|
Comments
|
8 years ago |
|
omar
|
97fccbdb73
|
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
|
8 years ago |
|
omar
|
5eef7dd82f
|
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
|
8 years ago |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
8 years ago |
|
omar
|
be9628494a
|
Demo: Rearranged everything under Widgets in a more consistent way.
|
8 years ago |
|
omar
|
d888de4483
|
Demo: Merged a few demo tweaks from navigation branch to minimize drift.
|
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
|
d952a8d3bf
|
Demo: Color widget demo tweaks (#346)
|
8 years ago |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
8 years ago |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
8 years ago |
|
omar
|
cdea8ca94f
|
Demo: Comment about 'static' and some tweaks (#1267)
|
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
|
3075d8bcd4
|
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
|
8 years ago |
|
omar
|
91a4f5df25
|
Demo: Tweaks
|
8 years ago |
|
omar
|
90fcd4a829
|
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
|
8 years ago |
|
omar
|
4d844ffde1
|
Demo: custom ColorPicker popup example tweaks (#346)
|
8 years ago |
|
omar
|
f040547a5f
|
Demo: custom ColorPicker popup example (#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
|
35186a1165
|
Demo: Comments (#346)
|
8 years ago |
|
omar
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo 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
|
b7a563276d
|
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)
|
8 years ago |
|
omar
|
2e37db9002
|
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)
|
8 years ago |
|
omar
|
6796e771fd
|
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again.
|
8 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)
|
8 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)
|
8 years ago |
|
omar
|
4def2ce339
|
ColorPicker: Demo tweaks (#346)
|
8 years ago |
|
omar
|
790d0eb5be
|
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346)
|
8 years ago |
|
omar
|
91bf8fd689
|
ColorPicker,ColorEdit: Demo code (#346)
|
8 years ago |
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
100d30a0a1
|
Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169)
|
8 years ago |
|
omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
omar
|
8261d9ff30
|
Comments (#1172, #1231)
|
8 years ago |
|
omar
|
12d265fa31
|
Version 1.51 WIP tag
|
8 years ago |
|
omar
|
5e1caaaef3
|
Version 1.50
|
8 years ago |
|
omar
|
c038339a4c
|
Merge branch 'master' into 2015-02-colorpicker
|
8 years ago |
|
omar
|
026d021df1
|
Demo: Fixed warnings introduced in 0828a1fd6c
|
8 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
|
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
|
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 |
|
ocornut
|
a60b2cc645
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
ocornut
|
52308a54f8
|
Demo: comments
|
8 years ago |
|
ocornut
|
f4cf972ea9
|
Merge branch 'master' into 2016-02-colorpicker
|
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 |
|
ocornut
|
fdbad2708c
|
Ignore GCC 6 warnings (#883)
|
8 years ago |
|
ocornut
|
775ac24d45
|
Fixed overzealous GCC warnings (#883) + partly undo 8553bab241
|
8 years ago |
|
ocornut
|
8553bab241
|
Ignoring overzealous GCC warnings (#883)
|
8 years ago |
|
ocornut
|
ccb3db94da
|
Merge branch 'master' into 2016-02-colorpicker
|
8 years ago |
|
ocornut
|
faafcf418d
|
Demo: Comments, even though nobody appears to read the comments.
|
8 years ago |
|
ocornut
|
b2f0ea6c0d
|
Font: Default font given explicit name "ProggyClean.ttf"
|
8 years ago |
|
ocornut
|
b376b68326
|
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
|
8 years ago |
|
ocornut
|
357167f917
|
Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.
|
8 years ago |
James Fulop
|
6fa3aaf7c0
|
outdated dragging API mentioned in demo text
Looks like you changed the API on dragging, but did not update the description text for it.
https://github.com/ocornut/imgui/issues/167
|
8 years ago |
|
ocornut
|
404979e48d
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
8 years ago |
Jeongseok Lee
|
1d7e05327b
|
Fix clang warning: unknown warning group '-Wreserved-id-macro'
|
8 years ago |
Michał Cichoń
|
1999c01db8
|
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
|
8 years ago |
|
ocornut
|
82dcdc9dfc
|
ShowStyleEditor: tweak font map display to show glyph details when hovered.
|
8 years ago |
|
ocornut
|
d7c518e6cc
|
ShowStyleEditor: show font map / grid in more details.
|
8 years ago |
|
ocornut
|
1b5bbf725b
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
8 years ago |
|
ocornut
|
56cdbe434d
|
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842)
|
8 years ago |
|
ocornut
|
612b17ef57
|
Fixing minor english typos (#827)
|
8 years ago |
|
ocornut
|
ef10b984fe
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
9 years ago |
Max Thrun
|
4f389b7f6a
|
Add null terminator to ShowStyleEditor output_type combo options
Without a null terminator the Combo() function indexes outside of the "items_separated_by_zeros" string.
|
9 years ago |
|
ocornut
|
996eb080fa
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
9 years ago |
|
ocornut
|
de61fcc619
|
Minor bits
|
9 years ago |
|
ocornut
|
1ef7980e17
|
Merge branch 'master' into 2016-02-colorpicker
|
9 years ago |
|
ocornut
|
4fddfa4b5e
|
Demo: extra (somehow duplicate) Selectables+Columns demo
|
9 years ago |
|
ocornut
|
d6a5fd06d7
|
Demo: Added an extra 3-way columns demo
|
9 years ago |
|
ocornut
|
d1c073a199
|
Comments, tweaks
|
9 years ago |
|
ocornut
|
5d4cf1c3f3
|
Version 1.50 WIP
|
9 years ago |
|
ocornut
|
adb85d800d
|
Version 1.49
|
9 years ago |
|
ocornut
|
3ddb50a925
|
Merge branch 'master' into 2016-02-colorpicker
|
9 years ago |
|
ocornut
|
1483a69c11
|
Demo: Tree: showing how to align tree node label with current x position (#324, #581)
|
9 years ago |
|
ocornut
|
a0a48f6e59
|
Added TreeAdvanceToLabelPos() (#581)
|
9 years ago |
|
ocornut
|
806a146198
|
TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324, #581)
|
9 years ago |
|
ocornut
|
b5521a81d4
|
Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection (#581)
|
9 years ago |
|
ocornut
|
8f4b123e1b
|
SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints (#668)
|
9 years ago |
|
ocornut
|
e3d8055d90
|
Speculative 64-bit warning fix (#668)
|
9 years ago |
|
ocornut
|
b7ebeb1610
|
Added SetNextWindowSizeConstraint() + demo code (#668)
|
9 years ago |
|
ocornut
|
102d03a7eb
|
Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. (#668)
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
|
9 years ago |
|
ocornut
|
69a29e4715
|
Added NewLine() (very shy reminder that #97 isn't done)
|
9 years ago |
|
ocornut
|
7a28f5bb81
|
ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere (#662)
|
9 years ago |
|
ocornut
|
fa5ae60bce
|
Demo: added decorated label to some vertical sliders.
|
9 years ago |