omar
|
b618629d99
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-22 12:34:59 +01:00 |
|
omar
|
7d09a0ae99
|
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
|
2017-11-22 12:33:59 +01:00 |
|
omar
|
aafa6cece5
|
Tweak expression to be less weird (how did that ever happen?)
|
2017-11-22 11:26:16 +01:00 |
|
Giuseppe Barbieri
|
21b456e567
|
Update imgui.cpp
|
2017-11-22 11:19:52 +01:00 |
|
omar
|
68b26b4867
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-22 11:04:00 +01:00 |
|
omar
|
176d8fbe74
|
Fixed unreferenced variable warnings.
|
2017-11-22 11:02:42 +01:00 |
|
omar
|
302757447a
|
Internals: Added SplitterBehavior(). (#319)
|
2017-11-20 19:41:17 +01:00 |
|
omar
|
195abc3d17
|
Begin: Fix border size latch when rounding uses Child or Popup value. (#707)
|
2017-11-20 15:19:54 +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
|
7f447c8270
|
Color picker: Tweak vertex shading code, since we aren't shading between PrimReserve and PrimVert the code can be expressed more naturally. (#346)
|
2017-11-20 13:16:57 +01:00 |
|
omar
|
9848a7023b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-11-19 16:21:21 +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
|
c433bc971f
|
Reorder fields for consistency.
|
2017-11-19 14:58:10 +01:00 |
|
omar
|
39137ccc3e
|
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. (#707)
|
2017-11-19 13:52:40 +01:00 |
|
omar
|
9a44d447cd
|
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)
|
2017-11-19 12:06:45 +01:00 |
|
omar
|
538a704143
|
NewFrame(): using literal strings in the most-frequently firing IM_ASSERT expression to increase the odd of programmers seeing them (especially those who don't use a debugger).
|
2017-11-19 12:00:07 +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
|
8a7f03cbf9
|
Combo: Offset popup position by border size so that a double border isn't so visible. (#707)
|
2017-11-19 00:29:59 +01:00 |
|
omar
|
d7af1a218e
|
Style: Added PopupRounding setting. (#1112)
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
067605052d
|
Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. (#823)
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
6f7b1bf2e1
|
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
58345b11e1
|
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. (#707)
|
2017-11-18 23:44:16 +01:00 |
|
omar
|
29e0078b66
|
Internals: Window minor internal renaming + added WindowRounding latch.
|
2017-11-18 19:06:11 +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
|
da2be7bbdc
|
Style: ScaleAllSizes() helper rounds down every values so they are aligned on integers.
|
2017-11-17 21:29:37 +01:00 |
|
omar
|
834fa52c8e
|
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. (#1444, #125)
|
2017-11-16 17:34:34 +01:00 |
|
omar
|
44c590393c
|
Merge branch 'master' into navigation
|
2017-11-16 13:28:10 +01:00 |
|
omar
|
29d962069d
|
Internals: Updating condition/allow flags with a function.
|
2017-11-16 13:28:01 +01:00 |
|
omar
|
4ad414c8d4
|
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
|
2017-11-16 13:23:50 +01:00 |
|
omar
|
7c4be0a000
|
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
|
2017-11-16 13:11:49 +01:00 |
|
omar
|
6817f3a3d9
|
Merge branch 'master' into navigation
|
2017-11-15 23:44:50 +01:00 |
|
omar
|
e9a7e73bba
|
Windows with MenuBar have a larger minimum height to avoid artefacts (I fixed most of the vertical/horizontal artefacts, but the ones in rounded corners were too hard to fix).
|
2017-11-15 23:42:18 +01:00 |
|
omar
|
f36037b384
|
Menu: Fixed minor rendering issues on the right size with rounded window when resizing a window small.
|
2017-11-15 23:38:17 +01:00 |
|
omar
|
9b82d9fbef
|
Scrollbar: Minor graphical fix for when scrollbar don't have enough visible space to display the full grab.
|
2017-11-15 23:14:23 +01:00 |
|
omar
|
f5bdf443c9
|
Minor comments, tweaks
|
2017-11-15 22:37:43 +01:00 |
|
omar
|
5ea6e80da1
|
Make it possible to use SetNextWindowPos() on a child window. Useful internally.
|
2017-11-15 22:23:33 +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
|
64e79035d5
|
Scrollbar flicker fix for menus/popups (fixes 4d00dd8326 and 2df8fa95df). Hopefully right this time.
|
2017-11-14 23:17:28 +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
|
852ece3a0e
|
Fixed build (3e06450d27 not meant for master branch, but ok)
|
2017-11-13 16:04:03 +01:00 |
|
omar
|
2275cb8b83
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-13 15:19:43 +01:00 |
|
omar
|
3e06450d27
|
Internals: Added ArrowButton() helper.
|
2017-11-13 15:18:31 +01:00 |
|
omar
|
4d00dd8326
|
Fixed scrollbar flickering on/off when uncollapsing a window (fixes 2df8fa95df)
|
2017-11-13 15:15:48 +01:00 |
|
omar
|
30bf40195b
|
io.OptNoCursorBlink -> io.OptCursorBlink (#1427)
|
2017-11-12 16:06:44 +01:00 |
|
omar
|
669498ff26
|
Added io.OptNoCursorBlink option to disable cursor blinking. (#1427). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. (#473, #650)
|
2017-11-12 16:03:09 +01:00 |
|
Branimir Karadžić
|
9daac64ff8
|
Clean g.WindowsById storage on shutdown.
|
2017-11-11 10:01:50 +01:00 |
|
omar
|
06075f20ba
|
Merge branch 'master' into navigation
|
2017-11-10 11:42:08 +01:00 |
|
omar
|
ba09de3a39
|
Begin: Fixed appending into a child window with a second Begin() from a different window stack querying the wrong window for the window->Collapsed test.
|
2017-11-10 11:38:01 +01:00 |
|