 omar
|
35186a1165
|
Demo: Comments (#346)
|
2017-07-29 17:35:24 +08:00 |
|
|
omar
|
db436b183b
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-29 17:24:06 +08:00 |
|
|
omar
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)
|
2017-07-29 17:23:32 +08:00 |
|
|
omar
|
e84224bcd5
|
ColorEdit4: Can open context menu from inputs/drags as well (#346)
|
2017-07-29 17:00:56 +08:00 |
|
|
omar
|
6c82572a35
|
ColorEdit4: Fixed not returning true when clicking on the Original/Ref color in Picker spawned from ColorEdit4 + shallow tidying up (#346)
|
2017-07-29 16:11:20 +08:00 |
|
|
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)
|
2017-07-29 15:54:45 +08:00 |
|
|
omar
|
6bc1572d31
|
ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346)
|
2017-07-29 15:50:24 +08:00 |
|
|
omar
|
973d4a361b
|
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346)
|
2017-07-29 14:32:41 +08:00 |
|
|
omar
|
cdcda9ff68
|
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. (#346)
|
2017-07-29 14:01:05 +08:00 |
|
|
omar
|
c36d59a42a
|
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. (#346)
|
2017-07-27 17:16:46 +08:00 |
|
|
omar
|
b1cbd87a94
|
ColorEdit4: Minor tidying up. (#346)
|
2017-07-27 16:49:57 +08:00 |
|
|
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)
|
2017-07-27 16:26:32 +08:00 |
|
|
omar
|
a9df6bfe86
|
ColorButton: Fixed rounding corners artefact when there is a single cell.
|
2017-07-27 14:04:58 +08:00 |
|
|
omar
|
b7a563276d
|
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)
|
2017-07-27 11:07:46 +08:00 |
|
|
omar
|
c1c2b2400a
|
ColorButton: Undo ce203f99f5
|
2017-07-27 11:04:39 +08:00 |
|
|
omar
|
2e37db9002
|
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)
|
2017-07-27 10:49:01 +08:00 |
|
|
omar
|
27e5b09af1
|
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview (#346)
|
2017-07-26 23:07:35 +08:00 |
|
|
omar
|
69dd1ed583
|
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346)
|
2017-07-26 22:20:43 +08:00 |
|
|
omar
|
76bae2f015
|
ColorEdit, ColorPicker: Fixed broken build due to commiting an undesirable change in 78a8f798c5 (#346)
|
2017-07-26 17:46:48 +08:00 |
|
|
omar
|
19c6a9c0e0
|
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( (#346) + comments
|
2017-07-26 17:38:33 +08:00 |
|
|
omar
|
6796e771fd
|
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again.
|
2017-07-26 16:28:01 +08:00 |
|
|
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)
|
2017-07-26 16:00:47 +08:00 |
|
|
omar
|
c84acf3f56
|
Comments
|
2017-07-26 15:59:57 +08:00 |
|
|
omar
|
ce203f99f5
|
ColorButton: Push a text baseline offset if higher than g.FontSize. (#346)
|
2017-07-26 15:52:17 +08:00 |
|
|
omar
|
78a8f798c5
|
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)
|
2017-07-26 15:24:09 +08:00 |
|
|
omar
|
df56879883
|
imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.
|
2017-07-26 14:53:15 +08:00 |
|
|
omar
|
9d0e5beaa7
|
GetColorU32(ImGuiCol): avoid using GImGui twice since some implementation make it a TLS-ish variable with non-trivial accessors.
|
2017-07-26 14:35:50 +08:00 |
|
|
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.
|
2017-07-26 14:34:59 +08:00 |
|
|
omar
|
f39cd61bf0
|
Reorder ImGuiColorEditFlags_ (#346)
|
2017-07-23 19:08:58 +08:00 |
|
|
omar
|
4f1f251bd2
|
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. (#346)
|
2017-07-23 19:02:26 +08:00 |
|
|
omar
|
8d32e8dae6
|
ColorPicker: Handle out of 0..1 range colors when displaying the cross hair. (#346)
|
2017-07-23 18:48:45 +08:00 |
|
|
omar
|
7b2d79cffd
|
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. (#346)
|
2017-07-23 18:44:32 +08:00 |
|
|
omar
|
4def2ce339
|
ColorPicker: Demo tweaks (#346)
|
2017-07-23 17:55:39 +08:00 |
|
|
omar
|
645875a240
|
Examples: Enable vsync by default in example applications (#1213, #1151)
|
2017-07-23 16:13:17 +08:00 |
|
|
omar
|
166e8f6261
|
Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility (#1116)
|
2017-07-23 15:57:39 +08:00 |
|
|
omar
|
c8794c246e
|
Examples: Vulkan: Batch file builds both debug and release
|
2017-07-23 15:22:21 +08:00 |
|
|
omar
|
a8b202782f
|
ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)
|
2017-07-22 19:37:13 +08:00 |
|
|
omar
|
790d0eb5be
|
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346)
|
2017-07-22 19:24:39 +08:00 |
|
|
omar
|
4355b2e422
|
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments (#346)
|
2017-07-22 19:04:10 +08:00 |
|
|
omar
|
91bf8fd689
|
ColorPicker,ColorEdit: Demo code (#346)
|
2017-07-22 18:01:29 +08:00 |
|
|
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)
|
2017-07-22 18:01:16 +08:00 |
|
|
omar
|
dd9c2f97a8
|
ColorPicker: Renamed _NoSliders to _NoInputs (#346)
|
2017-07-22 17:38:38 +08:00 |
|
|
omar
|
eba33deaf3
|
ColorPicker: Longer white line for hue/alpha selection, scale down according to ItemInnerSpacing. (#346)
|
2017-07-22 17:35:18 +08:00 |
|
|
omar
|
1edeea2f5a
|
ColorPicker: Removed extraneous ImGui:: prefixes + minor comments (#346)
|
2017-07-22 16:58:28 +08:00 |
|
|
omar
|
e79d7553b0
|
ColorPicker: Don't use Alpha setting when enabling all 3 sliders (#346)
|
2017-07-22 16:52:41 +08:00 |
|
|
omar
|
97bedd704c
|
Better, unified color tooltip (#346)
|
2017-07-21 03:06:25 +08:00 |
|
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-21 02:34:19 +08:00 |
|
|
omar
|
138a9dbaeb
|
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) (#862)
|
2017-07-21 02:21:48 +08:00 |
|
|
omar
|
100d30a0a1
|
Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169)
|
2017-07-20 23:12:58 +08:00 |
|
|
omar
|
e4007f7145
|
Internals: Move GetVisibleRect() a few functions above so it gets to hang out with its peers.
|
2017-07-20 22:30:56 +08:00 |
|
|
omar
|
85d9c8fb46
|
Internals: renaming IndexWithinParent to OrderWithinParent
|
2017-07-20 21:25:31 +08:00 |
|
|
omar
|
25f3717a1c
|
Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. (#1237)
|
2017-07-20 20:57:46 +08:00 |
|
|
omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-19 14:53:25 +08:00 |
|
|
omar
|
d1145e990d
|
Comments tweak (#1231)
|
2017-07-16 13:07:11 +08:00 |
|
|
omar
|
41f944238b
|
Comments about GlyphExtraSpacing (#1192)
|
2017-07-15 18:03:43 +08:00 |
|
|
omar
|
1987e23ce5
|
ImDrawList::PrimReserve() minor renaming of locals to make things clearer
|
2017-07-15 17:52:52 +08:00 |
|
|
omar
|
f3cf5e0322
|
Examples: SDL+GL3: Fixed old comments (#1229)
|
2017-07-15 17:50:01 +08:00 |
|
|
omar
|
8261d9ff30
|
Comments (#1172, #1231)
|
2017-07-15 17:11:53 +08:00 |
|
|
omar
|
be7fa76fdd
|
Fixed Clang unknown-warning-ignored warning by ignoring it..... we are truly living in a special time (#1090)
|
2017-07-15 13:27:44 +08:00 |
|
|
omar
|
52df0032a5
|
Travis: Blind fix for SDL+GL3 project on the Travis build setup.
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229, #1209)
|
2017-07-15 13:19:13 +08:00 |
|
|
omar
|
358e667b7a
|
Travis: Adding the SDL+GL3 project on the Travis build setup (for both Linux and OSX).
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229, #1209)
|
2017-07-15 13:13:09 +08:00 |
|
|
omar
|
0fe5728971
|
Examples: SDL+GL3: Makefile fix for Linux (#1229, #1209)
|
2017-07-15 13:07:43 +08:00 |
|
|
omar
|
03e6bfe84a
|
Comments
|
2017-07-14 19:49:11 +08:00 |
|
|
omar
|
cb6d893a13
|
Comments (#383, #1224)
|
2017-07-14 18:12:40 +08:00 |
|
|
omar
|
afae9398cb
|
Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.
|
2017-07-14 17:49:42 +08:00 |
|
|
omar
|
d3f4309491
|
Comments about ImGuiStyleVar enum (#1198)
|
2017-06-24 13:11:46 +02:00 |
|
|
omar
|
1e981f00e5
|
Comments
|
2017-06-21 13:50:31 +02:00 |
|
|
omar
|
a5e0210902
|
Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. (#1184)
|
2017-06-19 21:19:48 +02:00 |
|
|
omar
|
e47cf79773
|
Comments tweaks, typos (#1188)
|
2017-06-17 19:30:30 +02:00 |
|
|
omar
|
4c8d87d3fb
|
Comments (#1188)
|
2017-06-17 19:25:58 +02:00 |
|
|
omar
|
978c84d2e9
|
Removed dependency on int64_t type (unvailable in VS2008) by rewording an assert (#1184)
|
2017-06-16 14:08:17 +02:00 |
|
|
omar
|
12d265fa31
|
Version 1.51 WIP tag
|
2017-06-13 11:30:22 +02:00 |
|
|
omar
|
a2f7c40e30
|
Fixed comment (#1178)
|
2017-06-13 11:29:21 +02:00 |
|
|
omar
|
5e1caaaef3
|
Version 1.50
|
2017-06-02 12:22:34 +02:00 |
|
|
omar
|
7ad84b22f8
|
Comments
|
2017-06-02 12:13:47 +02:00 |
|
|
omar
|
99ff2ec6fb
|
Examples: DirectX9/10/11: Comments
|
2017-06-02 11:28:48 +02:00 |
|
|
omar
|
2acbd1ac2d
|
Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear
|
2017-06-02 11:25:45 +02:00 |
|
|
omar
|
51c200ac0d
|
Examples: DirectX9: Clarified texture release code (#1163)
|
2017-06-02 11:25:45 +02:00 |
|
|
omar
|
62c4698a73
|
Further clarifications of the key indices passed to IsKeyXXX functions (#1159)
|
2017-05-27 17:55:48 +02:00 |
|
|
omar
|
c038339a4c
|
Merge branch 'master' into 2015-02-colorpicker
|
2017-05-26 13:43:36 +02:00 |
|
|
omar
|
9da53bcecd
|
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
|
2017-05-26 13:42:36 +02:00 |
|
|
omar
|
026d021df1
|
Demo: Fixed warnings introduced in 0828a1fd6c
|
2017-05-26 13:40:53 +02:00 |
|
|
omar
|
c5c77a3476
|
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
|
2017-05-26 13:36:52 +02:00 |
|
|
omar
|
0828a1fd6c
|
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
|
2017-05-14 16:27:10 +02:00 |
|
|
omar
|
bd9868f447
|
Scrollbar: Avoid rendering when sizes are negative to reduce glitches (not sure how this ever slipped through - perhaps because of WindowMinSize settings).
|
2017-05-13 20:25:09 +02:00 |
|
|
omar
|
df52f46b13
|
Comments, documentation (#1121)
|
2017-05-02 10:43:00 +02:00 |
|
|
omar
|
9614552eba
|
README.md added link to Nicolas Guillemot flashtalk (#1099)
|
2017-05-01 17:16:40 +02:00 |
|
|
omar
|
b0db625cab
|
Examples: Vulkan: Fixed an extra validation (tested on Windows with VulkanSDK 1.0.46.0) (#1042)
|
2017-05-01 17:07:53 +02:00 |
|
|
omar
|
f87b152522
|
Examples: Vulkan: Various very minor stylistic fixes, fixing typos in comments, etc. (#1042 #1043)
|
2017-05-01 17:07:05 +02:00 |
|
|
omar
|
89d03d5cca
|
Examples: Vulkan: Disable IMGUI_VULKAN_DEBUG_REPORT by default. Update .bat files for newer VulkanSDK.
|
2017-05-01 16:46:57 +02:00 |
|
|
omar
|
55be2f0722
|
Merge branch 'ParticlePeter-g_FrameIndex_not_used_fix'
|
2017-05-01 16:23:27 +02:00 |
|
|
omar
|
9fd3ba871b
|
Merge branch 'g_FrameIndex_not_used_fix' of https://github.com/ParticlePeter/imgui into ParticlePeter-g_FrameIndex_not_used_fix
|
2017-05-01 16:21:43 +02:00 |
|
|
omar
|
5418bb19ff
|
Examples: Vulkan: windows batch file for 64-bits.
|
2017-05-01 16:14:13 +02:00 |
|
|
omar
|
497381dc3d
|
Comments
|
2017-05-01 15:53:50 +02:00 |
|
|
omar
|
23e7cdcee8
|
Merge branch 'martty-vk_small_fix'
|
2017-05-01 15:27:05 +02:00 |
|
|
omar
|
ac2eb4b960
|
Merge branch 'vk_small_fix' of https://github.com/martty/imgui into martty-vk_small_fix
|
2017-05-01 15:26:29 +02:00 |
|
|
omar
|
c3d9e0a6eb
|
Examples: SDL2: Tweaked batch files for Win32.
|
2017-05-01 15:00:42 +02:00 |
|
|
omar
|
b3d237a5ce
|
Examples: SDL2: Added build .bat files for win32.
|
2017-05-01 13:47:59 +02:00 |
|
|
omar
|
dbfd5d6e9a
|
Ignoring unreasonnable Clang -wformat-pedantic warning (#1090)
See e.g.
http://clang-developers.42468.n3.nabble.com/The-p-conversion-and-cast-to-void-td4044226.html
|
2017-05-01 12:55:47 +02:00 |
|
|
omar
|
89b1497843
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-05-01 12:37:34 +02:00 |
|