e045eddd77
Minor tweaks. Using ImGuiAxis defines.
2017-12-07 21:13:23 +01:00
92f7bd3605
Fixed 64-bit warnings.
2017-12-07 21:06:15 +01:00
cc2c023880
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
2017-12-07 17:04:53 +01:00
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
2017-12-07 16:42:52 +01:00
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
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
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
2017-12-07 12:49:52 +01:00
6deb865f78
Nav: Merge fix.
2017-12-06 17:48:28 +01:00
2fc6a82665
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-06 17:44:40 +01:00
8f41508c52
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
2017-12-06 17:42:28 +01:00
2fc9a2e6e7
Fixed nav branch merge issue.
2017-12-06 15:20:36 +01:00
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
ecacaf7f2d
Lower-right resize grip only appears when hovered. ( #822 )
2017-12-06 15:13:45 +01:00
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-06 15:13:45 +01:00
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
e103fe8c1f
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-06 15:13:45 +01:00
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
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-05 22:56:35 +01:00
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-05 22:53:58 +01:00
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
b9dc0caee3
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-05 22:44:52 +01:00
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
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-05 16:15:05 +01:00
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
16d9fa30b2
Merge branch 'master' into drag_and_drop
2017-12-05 09:21:07 +01:00
5f7cd7fb1c
Internals: Splitter Behavior doesn't show a border. ( #319 )
2017-12-01 17:39:50 +01:00
be6384eb2a
Style: Tweaked default WindowRounding value from 9 to 7 ( #707 )
2017-12-01 17:39:31 +01:00
6ea744d8f4
Drag and Drop: Added DragSource from color square. Added DragTarget on ColorEdit4 widget. ( #143 )
2017-11-30 16:54:39 +01:00
81cbaef806
Merge branch 'master' into navigation
2017-11-29 23:49:17 +01:00
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
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
25c159fac8
Internals: Removed unnecessary duplicate scrolling code + added extra infos to Metrics window.
2017-11-29 21:10:59 +01:00
52e475230f
Settings: Internals: Renaming.
2017-11-28 23:16:09 +01:00
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
7ae71e4984
Settings: Internals: Added FindSettingsHandler()
2017-11-28 21:04:38 +01:00
35eb5c5c99
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
2017-11-28 21:04:38 +01:00
963259d128
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
2017-11-28 21:04:38 +01:00
63712d5f5c
Merge branch 'master' into drag_and_drop
2017-11-28 17:28:45 +01:00
9191b17218
Merge branch 'master' into navigation
2017-11-28 17:28:08 +01:00
4a43632163
Build fix
2017-11-28 17:27:54 +01:00
1a8a7c9d17
Settings: Import old style .ini file
2017-11-28 16:23:46 +01:00
e5ebe42207
Settings: Make ImGuiWindow settings always first in the list.
2017-11-28 10:49:43 +01:00
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
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
d552cabd15
Settings: Internal renaming of structure and fields names.
2017-11-27 23:57:10 +01:00
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
2017-11-27 20:59:05 +01:00
ade09b9e3c
Settings: Basic internal refactor to have functions for saving from/to memory (not exposed)
2017-11-27 19:02:40 +01:00
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
2017-11-27 19:02:00 +01:00
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
2017-11-24 16:56:17 +01:00
46e994de4e
Nav: Do not clear last navigation id stored in a hidden child window. ( #787 )
2017-11-24 16:55:57 +01:00
