omar
|
74f42baf3e
|
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
|
2017-12-08 15:00:56 +01:00 |
|
omar
|
541dfd7901
|
Combo: Comments + fixed missing lower window padding.
|
2017-12-08 15:00:02 +01:00 |
|
omar
|
9872297a84
|
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
|
2017-12-08 14:59:49 +01:00 |
|
omar
|
7bf85db6c4
|
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)
|
2017-12-08 12:48:53 +01:00 |
|
omar
|
b6b940c8ee
|
Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
# Conflicts:
# imgui.cpp
|
2017-12-08 09:35:23 +01:00 |
|
omar
|
e118239f69
|
IsItemHovered() comments (#1382)
|
2017-12-08 09:34:05 +01:00 |
|
omar
|
553b0fcf8f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-07 21:20:16 +01:00 |
|
omar
|
ca0bb000ad
|
Begin: Factored out a bit of code to CalcSizeContents()
|
2017-12-07 21:14:54 +01:00 |
|
omar
|
f658edc72a
|
Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
|
2017-12-07 21:14:49 +01:00 |
|
omar
|
45466a8cf9
|
Internals: BeginCombo() added dummy ImGuiComboFlags.
|
2017-12-07 21:14:41 +01:00 |
|
omar
|
97edd42fc0
|
Indent(), Unindent(): Allow passing negative values.
|
2017-12-07 21:14:25 +01:00 |
|
omar
|
7f2b9ea4c0
|
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
|
2017-12-07 21:14:13 +01:00 |
|
omar
|
8dcc1a8a20
|
Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
|
2017-12-07 21:14:00 +01:00 |
|
omar
|
e045eddd77
|
Minor tweaks. Using ImGuiAxis defines.
|
2017-12-07 21:13:23 +01:00 |
|
omar
|
92f7bd3605
|
Fixed 64-bit warnings.
|
2017-12-07 21:06:15 +01:00 |
|
omar
|
cc2c023880
|
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
|
2017-12-07 17:04:53 +01:00 |
|
omar
|
e6215b6ca0
|
Merge branch 'master' into navigation + merge fix
# Conflicts:
# imgui.cpp
|
2017-12-07 16:42:52 +01:00 |
|
omar
|
3c9f9a455e
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
|
2017-12-07 16:36:07 +01:00 |
|
omar
|
8959c64b33
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
|
2017-12-07 13:29:14 +01:00 |
|
omar
|
20c7aab60c
|
Exposed GetOverlayDrawList(). (~#545, ~#530)
|
2017-12-07 12:49:52 +01:00 |
|
omar
|
6deb865f78
|
Nav: Merge fix.
|
2017-12-06 17:48:28 +01:00 |
|
omar
|
2fc6a82665
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-06 17:44:40 +01:00 |
|
omar
|
8f41508c52
|
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
|
2017-12-06 17:42:28 +01:00 |
|
omar
|
2fc9a2e6e7
|
Fixed nav branch merge issue.
|
2017-12-06 15:20:36 +01:00 |
|
omar
|
beda5fc5a0
|
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
ecacaf7f2d
|
Lower-right resize grip only appears when hovered. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
3b7e4eaf38
|
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
531e559e49
|
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. (#822) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
e103fe8c1f
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
90ae1c59c4
|
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
729333293c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-05 22:56:35 +01:00 |
|
omar
|
0f119865a6
|
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822)
|
2017-12-05 22:53:58 +01:00 |
|
omar
|
5686c72bbd
|
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. (#822) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
|
2017-12-05 22:47:20 +01:00 |
|
omar
|
b9dc0caee3
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-05 22:44:52 +01:00 |
|
omar
|
2ca4f9e862
|
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822)
|
2017-12-05 22:42:57 +01:00 |
|
omar
|
364251146b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-05 16:15:05 +01:00 |
|
omar
|
77d1a4b636
|
Fixed a one frame glitch, when window claiming focus themselves on appear, the title bar wouldn't use the focused color on that frame.
|
2017-12-05 16:12:45 +01:00 |
|
omar
|
16d9fa30b2
|
Merge branch 'master' into drag_and_drop
|
2017-12-05 09:21:07 +01:00 |
|
omar
|
5f7cd7fb1c
|
Internals: Splitter Behavior doesn't show a border. (#319)
|
2017-12-01 17:39:50 +01:00 |
|
omar
|
be6384eb2a
|
Style: Tweaked default WindowRounding value from 9 to 7 (#707)
|
2017-12-01 17:39:31 +01:00 |
|
omar
|
6ea744d8f4
|
Drag and Drop: Added DragSource from color square. Added DragTarget on ColorEdit4 widget. (#143)
|
2017-11-30 16:54:39 +01:00 |
|
omar
|
81cbaef806
|
Merge branch 'master' into navigation
|
2017-11-29 23:49:17 +01:00 |
|
omar
|
b513fdce48
|
Scrolling: SetScrollFromPosY() tweak to match change in a0d53fee81084a547bf21f46e736ea89f79fffb5 with similar desirable jump/discontinuity at each limit to skip the (ItemSpacing>WindowPadding) difference (followup to 0e5b64ecd2, #150)
|
2017-11-29 23:48:32 +01:00 |
|
omar
|
c36e586cce
|
Style, Scrolling: Fixed padding and scrolling asymetry where lower/right sides of a window wouldn't use WindowPadding properly + causing minor scrolling glitches.
|
2017-11-29 23:48:32 +01:00 |
|
omar
|
25c159fac8
|
Internals: Removed unnecessary duplicate scrolling code + added extra infos to Metrics window.
|
2017-11-29 21:10:59 +01:00 |
|
omar
|
52e475230f
|
Settings: Internals: Renaming.
|
2017-11-28 23:16:09 +01:00 |
|
omar
|
2e1013a0c6
|
Settings: Internals: Simplifying code a bit. Creating Settings structure during first save. Windows where ImGuiWindowFlags_NoSavedSettings was late toggled will save settings correctly. (#1000)
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
7ae71e4984
|
Settings: Internals: Added FindSettingsHandler()
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
35eb5c5c99
|
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
963259d128
|
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
63712d5f5c
|
Merge branch 'master' into drag_and_drop
|
2017-11-28 17:28:45 +01:00 |
|
omar
|
9191b17218
|
Merge branch 'master' into navigation
|
2017-11-28 17:28:08 +01:00 |
|
omar
|
4a43632163
|
Build fix
|
2017-11-28 17:27:54 +01:00 |
|
omar
|
1a8a7c9d17
|
Settings: Import old style .ini file
|
2017-11-28 16:23:46 +01:00 |
|
omar
|
e5ebe42207
|
Settings: Make ImGuiWindow settings always first in the list.
|
2017-11-28 10:49:43 +01:00 |
|
omar
|
f3ec608c19
|
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
|
2017-11-28 10:49:43 +01:00 |
|
omar
|
7e2d0d734c
|
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
|
2017-11-27 23:57:11 +01:00 |
|
omar
|
d552cabd15
|
Settings: Internal renaming of structure and fields names.
|
2017-11-27 23:57:10 +01:00 |
|
omar
|
ade09b9e3c
|
Settings: Basic internal refactor to have functions for saving from/to memory (not exposed)
|
2017-11-27 19:02:40 +01:00 |
|
omar
|
532f564fd3
|
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
|
2017-11-27 19:02:00 +01:00 |
|
omar
|
d9c5d72962
|
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
|
2017-11-24 16:56:17 +01:00 |
|
omar
|
46e994de4e
|
Nav: Do not clear last navigation id stored in a hidden child window. (#787)
|
2017-11-24 16:55:57 +01:00 |
|
omar
|
4e3c7f1557
|
Nav: Exposed NavInitWindow() in imgui_internal (#787)
|
2017-11-24 16:55:49 +01:00 |
|
omar
|
f5c47faee8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-24 16:55:31 +01:00 |
|
omar
|
6bd3b45b34
|
Sisyphus says: tweaked comments about not using old-style OpenGL examples (#1459, #1394 etc.)
|
2017-11-24 09:23:17 +01:00 |
|
omar
|
7763ab3fcc
|
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 15:58:20 +01:00 |
|
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
|
dc2768503f
|
Fix for drag and drop branch.
|
2017-11-19 16:24:17 +01:00 |
|
omar
|
92212b17aa
|
Merge branch 'master' into drag_and_drop
|
2017-11-19 16:23:37 +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
|
4022ada843
|
Merge branch 'master' into drag_and_drop
|
2017-11-19 00:36:32 +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
|
7746dd104c
|
Merge branch 'master' into drag_and_drop
|
2017-11-16 13:28:22 +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 |
|