omar
|
97fccbdb73
|
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
|
2017-08-14 13:05:03 +08:00 |
|
omar
|
648f75b245
|
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019)
|
2017-08-14 13:04:32 +08:00 |
|
omar
|
6a4064e5f2
|
PathArcToFast: Minor renaming for clarification. Comments.
|
2017-08-14 12:25:35 +08:00 |
|
omar
|
8c61a4eb4c
|
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
|
2017-08-14 11:29:54 +08:00 |
|
omar
|
41076188ca
|
Merge pull request #1277 from luk1337/master
ColorPicker: Fix broken ImGuiColorEditFlags_NoAlpha flag check - not restoring Alpha when clicking on reference color.
|
2017-08-12 12:53:13 +08:00 |
|
LuK1337
|
8352d43a0c
|
Fix broken ImGuiColorEditFlags_NoAlpha flag check
* Fixes warning:
imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
|
2017-08-11 22:52:40 +02:00 |
|
omar
|
908b025c3c
|
Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks
|
2017-08-12 01:23:39 +08:00 |
|
omar
|
0f126a5b07
|
Update README.md (small wording bits, inspired by #1093)
|
2017-08-12 01:05:24 +08:00 |
|
omar
|
b4fe5d36a4
|
Examples: OpenGL3+SDL: Fix types to uses GlEnum (#1147)
|
2017-08-12 00:46:58 +08:00 |
|
omar
|
048322f3fd
|
Merge pull request #1147 from TinyTinni/master
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147)
|
2017-08-12 00:43:34 +08:00 |
|
omar
|
5eef7dd82f
|
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
|
2017-08-12 00:43:55 +08:00 |
|
omar
|
08265bfbd9
|
RenderArrow(): fix warning. re-orderer lines to match enum order.
|
2017-08-11 14:44:53 +08:00 |
|
omar
|
e3fae56089
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-08-11 14:30:17 +08:00 |
|
omar
|
d7cad903aa
|
Documentation tweaks
|
2017-08-11 14:29:27 +08:00 |
|
omar
|
73f9c9d80c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-08-11 13:44:25 +08:00 |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
2017-08-11 13:36:28 +08:00 |
|
omar
|
53d1b1e929
|
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. (#346)
|
2017-08-10 10:25:50 +08:00 |
|
omar
|
fed18d3203
|
Removed old ValueColor() helpers. (#346)
|
2017-08-09 23:04:26 +08:00 |
|
omar
|
fc5ab0cb8d
|
RenderCheckMark() tidying up
|
2017-08-09 22:56:01 +08:00 |
|
omar
|
4fd148f4f9
|
Added ImFontAtlas::GlyphRangesBuilder helper + doc
|
2017-08-09 22:42:03 +08:00 |
|
omar
|
43e2abbee3
|
Comments, FAQ entry (#586, #1105)
|
2017-08-09 20:27:59 +08:00 |
|
omar
|
55b99d753c
|
Minor string typo
|
2017-08-08 23:12:23 +08:00 |
|
omar
|
059e838b2c
|
Merge branch 'master' into navigation
|
2017-08-08 18:04:38 +08:00 |
|
omar
|
be9628494a
|
Demo: Rearranged everything under Widgets in a more consistent way.
|
2017-08-08 18:04:31 +08:00 |
|
omar
|
453ad17a09
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
2017-08-08 17:50:08 +08:00 |
|
omar
|
d888de4483
|
Demo: Merged a few demo tweaks from navigation branch to minimize drift.
|
2017-08-08 17:49:12 +08:00 |
|
omar
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-08-08 17:30:32 +08:00 |
|
omar
|
a78ef7a369
|
Comments
|
2017-08-08 16:07:17 +08:00 |
|
omar
|
942cb0e1f2
|
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
|
2017-08-08 15:54:20 +08:00 |
|
omar
|
d952a8d3bf
|
Demo: Color widget demo tweaks (#346)
|
2017-08-08 14:49:45 +08:00 |
|
omar
|
a4012fd5b2
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-08-08 11:30:10 +08:00 |
|
omar
|
23fae61109
|
Merge branch 'master' into 2016-07-navigation
# Conflicts:
# imgui.cpp
|
2017-08-08 11:29:54 +08:00 |
|
omar
|
b5ad88627d
|
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
|
2017-08-08 11:27:48 +08:00 |
|
omar
|
a1bcc8392e
|
Fixed GetScrollMaxX() debug left-over from 7096fd8500 (#1271)
|
2017-08-08 11:15:34 +08:00 |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2017-08-07 22:51:18 +08:00 |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2017-08-07 22:34:30 +08:00 |
|
omar
|
0ab722c3c5
|
Columns: First first column appearing wider than others (#1266)
|
2017-08-07 22:28:09 +08:00 |
|
omar
|
d43c25d8f4
|
SetScrollHere() tweak to make the code a little less confusing
|
2017-08-07 21:54:41 +08:00 |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
2017-08-07 21:53:57 +08:00 |
|
omar
|
7096fd8500
|
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. (#1271, #246)
|
2017-08-07 19:41:22 +08:00 |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
2017-08-07 18:35:15 +08:00 |
|
omar
|
6d60e0fc58
|
Fonts readme tweaks, links
|
2017-08-07 15:21:21 +08:00 |
|
omar
|
f4c0134f9f
|
Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment (#346)
|
2017-08-06 18:08:58 +08:00 |
|
omar
|
cdea8ca94f
|
Demo: Comment about 'static' and some tweaks (#1267)
|
2017-08-06 11:07:52 +08:00 |
|
omar
|
46c73cccff
|
Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) (#1252)
|
2017-08-05 19:47:52 +08:00 |
|
omar
|
d762f1dbfb
|
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). (#1262)
|
2017-08-05 19:15:03 +08:00 |
|
omar
|
95f2706d1c
|
Clipboard: [windows] Fixed not closing win32 clipboard on early return. (#1264)
|
2017-08-05 16:05:48 +08:00 |
|
omar
|
40ac84d701
|
DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. (#671)
|
2017-08-03 16:41:29 +08:00 |
|
omar
|
f6460970c5
|
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)
|
2017-07-31 21:20:42 +08:00 |
|
omar
|
fb54dce71c
|
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
|
2017-07-31 21:11:41 +08:00 |
|