182 Commits

Author	SHA1	Message	Date
omar	91bf8fd689	ColorPicker,ColorEdit: Demo code (#346)	2017-07-22 18:01:29 +08:00
omar	c8553817d9	Merge branch 'master' into 2016-02-colorpicker	2017-07-21 02:34:19 +08:00
omar	100d30a0a1	Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169)	2017-07-20 23:12:58 +08:00
omar	3e4cb40d45	Merge branch 'master' into 2016-02-colorpicker	2017-07-19 14:53:25 +08:00
omar	8261d9ff30	Comments (#1172, #1231)	2017-07-15 17:11:53 +08:00
omar	12d265fa31	Version 1.51 WIP tag	2017-06-13 11:30:22 +02:00
omar	5e1caaaef3	Version 1.50	2017-06-02 12:22:34 +02:00
omar	c038339a4c	Merge branch 'master' into 2015-02-colorpicker	2017-05-26 13:43:36 +02:00
omar	026d021df1	Demo: Fixed warnings introduced in 0828a1fd6c	2017-05-26 13:40:53 +02:00
omar	0828a1fd6c	Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account	2017-05-14 16:27:10 +02:00
omar	497381dc3d	Comments	2017-05-01 15:53:50 +02:00
omar	89b1497843	Merge branch 'master' into 2016-02-colorpicker	2017-05-01 12:37:34 +02:00
omar	e10ceebd36	ImFont: Store the texture surface used to get an idea of how costly each font is.	2017-03-17 21:29:57 +01:00
omar	b6c0227add	Merge branch 'master' into 2016-02-colorpicker	2017-01-11 21:03:35 +01:00
omar	714beb217c	Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.	2017-01-07 20:18:45 +01:00
ocornut	68df09cf47	Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)	2017-01-01 20:11:40 +01:00
ocornut	a60b2cc645	Merge branch 'master' into 2016-02-colorpicker	2016-12-23 12:15:58 +01:00
ocornut	52308a54f8	Demo: comments	2016-12-12 11:05:41 +01:00
ocornut	f4cf972ea9	Merge branch 'master' into 2016-02-colorpicker	2016-11-27 18:21:14 +01:00
ocornut	fdbad2708c	Ignore GCC 6 warnings (#883)	2016-11-12 21:04:55 +01:00
ocornut	775ac24d45	Fixed overzealous GCC warnings (#883) + partly undo 8553bab241	2016-11-12 11:14:37 +01:00
ocornut	8553bab241	Ignoring overzealous GCC warnings (#883)	2016-11-11 20:17:35 +01:00
ocornut	ccb3db94da	Merge branch 'master' into 2016-02-colorpicker	2016-11-09 15:17:20 +01:00
ocornut	faafcf418d	Demo: Comments, even though nobody appears to read the comments.	2016-11-07 17:33:46 +01:00
ocornut	b2f0ea6c0d	Font: Default font given explicit name "ProggyClean.ttf"	2016-11-06 21:51:20 +01:00
ocornut	b376b68326	Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code	2016-11-06 21:50:18 +01:00
ocornut	357167f917	Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.	2016-11-06 18:13:14 +01:00
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	2016-10-16 12:21:38 -04:00
ocornut	404979e48d	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-10-07 09:52:00 +02:00
Jeongseok Lee	1d7e05327b	Fix clang warning: unknown warning group '-Wreserved-id-macro'	2016-10-06 14:48:47 -04:00
Michał Cichoń	1999c01db8	Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.	2016-09-26 12:00:33 +02:00
ocornut	82dcdc9dfc	ShowStyleEditor: tweak font map display to show glyph details when hovered.	2016-09-25 15:52:04 +02:00
ocornut	d7c518e6cc	ShowStyleEditor: show font map / grid in more details.	2016-09-25 15:22:41 +02:00
ocornut	1b5bbf725b	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-09-25 12:57:22 +02:00
ocornut	56cdbe434d	Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842)	2016-09-25 12:53:13 +02:00
ocornut	612b17ef57	Fixing minor english typos (#827)	2016-09-11 22:02:35 +02:00
ocornut	ef10b984fe	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-23 17:00:47 +02:00
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.	2016-08-18 11:00:23 -07:00
ocornut	996eb080fa	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-11 22:53:26 +02:00
ocornut	de61fcc619	Minor bits	2016-06-25 17:03:49 +02:00
ocornut	1ef7980e17	Merge branch 'master' into 2016-02-colorpicker	2016-06-15 10:05:17 +02:00
ocornut	4fddfa4b5e	Demo: extra (somehow duplicate) Selectables+Columns demo	2016-06-07 09:05:36 +02:00
ocornut	d6a5fd06d7	Demo: Added an extra 3-way columns demo	2016-06-07 08:46:50 +02:00
ocornut	d1c073a199	Comments, tweaks	2016-05-31 00:00:44 +02:00
ocornut	5d4cf1c3f3	Version 1.50 WIP	2016-05-30 19:38:36 +02:00
ocornut	adb85d800d	Version 1.49	2016-05-29 19:16:44 +02:00
ocornut	3ddb50a925	Merge branch 'master' into 2016-02-colorpicker	2016-05-29 19:07:23 +02:00
ocornut	1483a69c11	Demo: Tree: showing how to align tree node label with current x position (#324, #581)	2016-05-28 19:30:01 +02:00
ocornut	a0a48f6e59	Added TreeAdvanceToLabelPos() (#581)	2016-05-28 18:15:54 +02:00
ocornut	806a146198	TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324, #581)	2016-05-28 17:12:13 +02:00