354 Commits

Author	SHA1	Message	Date
omar	0a3db267c3	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2017-12-12 14:58:53 +01:00
omar	6190ab0084	Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()	2017-12-12 14:14:58 +01:00
omar	08b72eb5c0	IsWindowFocused() refactor will flags. (#1382) ... Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow). Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).	2017-12-12 14:07:12 +01:00
omar	8d8f4934fb	Demo: mouse dragging demo tweaks	2017-12-12 13:11:40 +01:00
omar	4a555d35f0	IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382)	2017-12-12 12:50:42 +01:00
omar	38bfdb357e	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-12-11 16:28:47 +01:00
Branimir Karadžić	e67f3809ed	Replaced obsolete function with new one.	2017-12-11 09:57:05 +01:00
omar	d1db229907	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2017-12-10 19:01:59 +01:00
omar	71296910a0	Demo: Tweaks and spacing. Stopped using rand() function in demo code.	2017-12-10 18:49:47 +01:00
omar	4b8857d536	Demo: About box tweaks.	2017-12-10 18:45:05 +01:00
omar	20ba79aa56	Demo: Added "No close" option.	2017-12-10 17:02:41 +01:00
omar	871a5cecc1	Merge branch 'master' into navigation	2017-12-08 18:32:46 +01:00
omar	c9f0275e22	Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.	2017-12-08 18:32:12 +01:00
omar	e6215b6ca0	Merge branch 'master' into navigation + merge fix ... # Conflicts: # imgui.cpp	2017-12-07 16:42:52 +01:00
omar	abe5ad3c7a	Demo: Added display for IsMouseDragging() function.	2017-12-07 13:27:55 +01:00
omar	94bf12f14b	Demo: Display better mouse cursor info for debugging backends.	2017-12-07 13:27:49 +01:00
omar	81cbaef806	Merge branch 'master' into navigation	2017-11-29 23:49:17 +01:00
omar	0d53c8d480	Demo: Console: Fixed incorrect positioning which was hidden by a minor scroll issue (this would affect people who copied the console code as is)	2017-11-29 23:48:32 +01:00
omar	a20fe279c5	Demo: Layout: Removed unnecessary BeginChild/EndChild calls	2017-11-29 23:48:32 +01:00
omar	9191b17218	Merge branch 'master' into navigation	2017-11-28 17:28:08 +01:00
omar	532f564fd3	ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().	2017-11-27 19:02:00 +01:00
omar	2543807e56	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-11-20 13:54:06 +01:00
omar	3f5b2a3fe3	Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).	2017-11-20 13:53:16 +01:00
omar	3c5e64db78	Demo: Tweaked Image() code.	2017-11-20 13:30:25 +01:00
omar	9848a7023b	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2017-11-19 16:21:21 +01:00
omar	28a31997b7	Style Editor: Simplified settings also show PopupBorderSize as a checkbox. (#707, #1019)	2017-11-19 16:03:42 +01:00
omar	abbf836fd0	Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. (#707, fix #819, #1031, ref #1019, ref #447)	2017-11-19 15:56:51 +01:00
omar	4cdd998be8	Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (#1450, #1451)	2017-11-19 00:49:23 +01:00
omar	d211a0e338	Merge branch 'master' into navigation (with style breakable) ... # Conflicts: # imgui.cpp # imgui_draw.cpp	2017-11-19 00:39:37 +01:00
omar	d7af1a218e	Style: Added PopupRounding setting. (#1112)	2017-11-19 00:29:29 +01:00
omar	0a61b7195c	Style: Added a default StyleColorsLight(). (#707)	2017-11-19 00:29:29 +01:00
omar	e7e81b265d	Demo: Tweaks.	2017-11-18 23:44:16 +01:00
omar	1c41603b31	Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. (fix #1211)	2017-11-18 23:44:16 +01:00
omar	c1b5eab868	Style Editor: Sneakily adding a combo box to change colors (#707)	2017-11-18 23:18:18 +01:00
omar	bd4bc929ce	Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.	2017-11-18 18:28:21 +01:00
omar	6817f3a3d9	Merge branch 'master' into navigation	2017-11-15 23:44:50 +01:00
omar	27fd1b913b	Made it guaranteed by API that after calling Begin() the last Item represent the title bar. (#823)	2017-11-15 14:35:45 +01:00
omar	64031852de	Merge branch 'master' into navigation	2017-11-14 23:17:58 +01:00
omar	6001d9c7a4	Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). (#125) ... Demo: Columns: Adding a billion of extra lines and using clipper.	2017-11-14 22:41:54 +01:00
omar	0858c3d7cb	Demo: Custom Rendering: Fixed clipping rectangle extruding out of parent window.	2017-11-14 22:21:38 +01:00
omar	a297cbafdb	Merge branch 'master' into navigation	2017-11-08 23:17:14 +01:00
omar	8e6adc78af	Examples: Constrained Resize: Added more test cases (for #1417)	2017-11-07 11:38:39 +01:00
omar	0d4c320f88	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_draw.cpp	2017-11-06 23:58:28 +01:00
omar	ff4d4ca651	IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) (#1382, #1404)	2017-11-02 16:44:24 +01:00
omar	63f6f2dd13	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-11-01 15:09:23 +01:00
omar	59323b54da	Demo: Comments (#1408)	2017-11-01 12:57:12 +01:00
omar	6ab20ff9bf	Minor tweaks to the user guide.	2017-11-01 12:33:58 +01:00
omar	edafbcd630	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-10-27 20:04:51 +02:00
omar	77df1ba9e0	Version 1.53 WIP	2017-10-27 19:54:56 +02:00
omar	c0b366b316	Merge branch 'master' into navigation ... # Conflicts: # imgui.h	2017-10-27 17:27:53 +02:00