131 Commits

Author	SHA1	Message	Date
ocornut	dd6163241c	Merge branch 'master' into 2016-02-colorpicker	2016-10-16 14:02:15 +02:00
ocornut	1810b3ff38	Added ImGuiCorner enum to clarify some internal code	2016-10-09 10:56:23 +02:00
ocornut	abaada4224	Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)	2016-10-09 10:31:39 +02:00
ocornut	404979e48d	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-10-07 09:52:00 +02:00
ocornut	f2699de242	Fix using IsItemActive() after EndGroup() or any widget using groups (#840, #479)	2016-09-25 14:18:10 +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	0f303d363a	Refactor text alignment options to use ImVec2, removed ImGuiAlign (#842, #222)	2016-09-25 12:19:15 +02:00
ocornut	de9f8944ea	Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*	2016-09-25 11:38:04 +02:00
ocornut	c5b8c6303a	Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842)	2016-09-25 11:06:14 +02:00
ocornut	b397fb507e	Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) (#829)	2016-09-13 09:18:17 +02:00
ocornut	996eb080fa	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-11 22:53:26 +02:00
ocornut	a7f6ea592f	Moved GetColorU32 out of imgui_internal.h to avoid inlining mess (#759)	2016-08-06 09:22:41 +02:00
ocornut	954c890c67	SameLine() with explicit X position is relative to left of group/columns (ref #746, #125, #630)	2016-07-30 23:41:44 +02:00
ocornut	d9e2e688e9	InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. (#725) ... Partial fix, won't stop ids from functioning because of a zombie id.	2016-07-13 01:18:59 +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	c4db79f34b	Member variable name renamed "ID" "Id" for casing consistency	2016-06-12 22:27:15 +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	9a751da136	Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files	2016-05-29 19:14:19 +02:00
ocornut	3ddb50a925	Merge branch 'master' into 2016-02-colorpicker	2016-05-29 19:07:23 +02:00
ocornut	45dacbf084	Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect. ... Relates to horizontal scrollbar, explicit contents size	2016-05-29 17:50:23 +02:00
ocornut	b7ebeb1610	Added SetNextWindowSizeConstraint() + demo code (#668)	2016-05-21 22:53:08 +02:00
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.	2016-05-21 20:50:15 +02:00
ocornut	b630cb5b42	ImGuiWindow: Storing ParentWindow (#615, #646)	2016-05-10 17:00:42 +02:00
ocornut	7b9c0a5c3f	Renamed ImGuiState -> ImGuiContext (#586, #269)	2016-05-07 19:55:51 +02:00
ocornut	8b428e8c74	Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586, #269)	2016-05-07 19:54:27 +02:00
ocornut	ce4d731486	Minor comments, tweaks	2016-05-07 18:10:32 +02:00
ocornut	313d388bba	Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows (#635)	2016-05-06 11:31:32 +02:00
ocornut	89d5026187	Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (#625, #579)	2016-05-02 12:32:16 +02:00
ocornut	9733f4fa24	Internal RenderBullet() helper.	2016-05-01 20:19:28 +02:00
ocornut	547f34cf22	Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516)	2016-05-01 17:43:51 +02:00
ocornut	df749e3f13	Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. (#600) ... New flag and declaration makes uses of SetNextTreeNode() functions on collapsing header more obvious as well (#579).	2016-05-01 14:34:55 +02:00
ocornut	7406d64c64	PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582)	2016-04-30 18:55:23 +02:00
ocornut	c5149cd53c	MenuItem(): checkmark render in disabled color when disabled	2016-04-27 23:34:24 +02:00
ocornut	6bcc31e575	Merge branch 'master' into 2016-02-colorpicker	2016-04-26 11:06:24 +02:00
ocornut	ea6b615179	Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610)	2016-04-26 11:03:51 +02:00
ocornut	41215534d5	Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),	2016-04-23 14:10:36 +02:00
ocornut	7ce6c18bbe	Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h (#600)	2016-04-21 09:55:02 +02:00
ocornut	ab4a69bcd4	Comments	2016-04-19 18:31:40 +02:00
ocornut	fc3b8d0a56	Relative order of Child windows creation is preserved during sort (#595)	2016-04-19 18:31:25 +02:00
ocornut	77177c18f0	Merge branch 'master' into 2016-02-colorpicker	2016-04-09 19:12:03 +02:00
ocornut	1588eda1ac	Version 1.49 WIP	2016-04-09 19:10:42 +02:00
ocornut	95cbcdca3f	Version 1.48	2016-04-09 17:46:48 +02:00
ocornut	4c1d4233b2	Merge branch 'master' into 2016-02-colorpicker	2016-04-03 01:10:26 +02:00
ocornut	d53c308852	Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394	2016-04-03 00:47:41 +02:00
ocornut	326c4e40f8	Merge branch 'master' into 2016-02-colorpicker	2016-03-28 23:17:13 +02:00
ocornut	cfbf06e394	Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)	2016-03-27 10:38:14 +02:00