e4ba6e525b
Columns:: columns set with no implicit id include the columns count into the id to avoid collisions (#125)
ocornut2015-11-28 15:35:10 +00:00
807d4ff92c
Columns: minor tidying up while investigating severe issues with indenting within columns (#414)
ocornut2015-11-28 12:14:50 +00:00
c0ec9f4e63
Merge pull request #416 from zryan3/bugfix/sdl2_typos
omar2015-11-28 09:36:06 +00:00
aa6cb32bd4
fixed text referencing GLFW library in SDL examples
zryan32015-11-27 23:04:35 -07:00
980ca286fe
Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. (fix#392)
ocornut2015-10-30 15:44:47 +01:00
6ffe0fddbf
Examples: Fixed crash when both buttons are held (#393)
ocornut2015-10-30 15:01:26 +01:00
1a42a3f91b
Refactor internal SliderBehavior() to take flags instead of a bool.
ocornut2015-10-30 11:43:23 +01:00
3eabad0321
Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers.
ocornut2015-10-30 11:36:51 +01:00
e858d229a0
Examples: update all examples with same comment (#389)
ocornut2015-10-30 10:45:16 +01:00
d0afb23a3f
Merge pull request #389 from dougbinks/master
omar2015-10-30 10:39:59 +01:00
e1bc0dd7d5
Font merge demo and documentation minor additions. Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
Doug Binks2015-10-25 16:06:42 +00:00
0b0c460324
Travis CI: revert, giving up update for now.
omar2015-10-19 20:10:43 +01:00
7245599f04
Travis CI: test upgrading to container-based build (3)
omar2015-10-19 20:05:02 +01:00
d86dd37091
Travis CI: test upgrading to container-based build
omar2015-10-19 19:59:53 +01:00
f11adc1c08
Travis CI: test upgrading to container-based build
omar2015-10-19 19:57:46 +01:00
217ef444d4
ColorEdit4: Fixed broken tooltip on hovering the color button (actually fixes#373, #380)
ocornut2015-10-19 12:02:52 +01:00
5f0db60a57
Version number 1.47 WIP
ocornut2015-10-18 20:13:01 +01:00
42529f1270
Merge pull request #378 from Gargaj/patch-1
omar2015-10-18 18:11:54 +01:00
e4d916a4b3
NULL out font texture on invalidate
Gargaj2015-10-18 19:05:04 +02:00
7a61b7dd57
Renamed Window LastFrameDrawn to LastFrameActive, more correct
ocornut2015-10-18 16:57:10 +01:00
465e6839a4
ColorEdit4: hovering the color button shows correct alpha (fix#373)
ocornut2015-10-18 16:24:44 +01:00
5b7a2149fc
ColorConvertFloat4ToU32() round the floats instead of truncating them.
ocornut2015-10-18 16:09:37 +01:00
43ff5a41be
InputText(): always use live input data for display in read-only mode (fix#360)
ocornut2015-10-18 15:50:46 +01:00
a0d24ac03d
Scrollbar: background color less translucent in default style (flattened alpha) so it works better on non-WindowBg colored background.
ocornut2015-10-18 15:36:39 +01:00
64b6e87f54
Scrollbar: fixed vertical alignment with border + no menu bar (following #365)
ocornut2015-10-18 15:35:27 +01:00
b090d711e2
InputText: removed the need for text_end pointer in the cursor position calculation loop, allows switching buffers
ocornut2015-10-18 15:25:36 +01:00
bc34ac882f
InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo
ocornut2015-10-18 10:57:29 +01:00
2b3fb5c0f7
Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style (#375)
ocornut2015-10-15 12:44:30 +02:00
81927b073e
Merge pull request #375 from gzito/master
omar2015-10-15 11:32:13 +01:00