omar
|
2fc9a2e6e7
|
Fixed nav branch merge issue.
|
2017-12-06 15:20:36 +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
|
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
|
c860a0a85c
|
Internals: ImRect: Added IsFinite() helper.
|
2017-12-01 17:39:13 +01:00 |
|
omar
|
aea3fe41b9
|
Style: Tweaks Dark and Light styles. (#707)
|
2017-11-30 23:15:55 +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
|
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
|
a20fe279c5
|
Demo: Layout: Removed unnecessary BeginChild/EndChild calls
|
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
|
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
|
c8b5b569da
|
Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
|
2017-11-28 11:26:14 +01:00 |
|
omar
|
e5ebe42207
|
Settings: Make ImGuiWindow settings always first in the list.
|
2017-11-28 10:49:43 +01:00 |
|
omar
|
4c4f1b0224
|
ImVector: Added ImVector::push_front helper.
|
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
|
e000ee0116
|
Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). (#1464)
|
2017-11-28 10:48:01 +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
|
0f955b818d
|
Fixed DroidSans font link (#1460)
|
2017-11-26 11:44:52 +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
|
ef5dd30625
|
Sisyphus says: tweaked comments about not using old-style OpenGL examples (#1459, #1394 etc.)
|
2017-11-24 09:27:45 +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
|
06a32a2b00
|
Merge pull request #1455 from elect86/patch-3
Update imgui_draw.cpp, fixed light colors order
|
2017-11-22 13:21:33 +01:00 |
|
Giuseppe Barbieri
|
1b2ec35b8d
|
Update imgui_draw.cpp
|
2017-11-22 12:58:11 +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 |
|
omar
|
3141df1459
|
Merge pull request #1454 from elect86/patch-2
Tweak
|
2017-11-22 11:24:20 +01:00 |
|
Giuseppe Barbieri
|
21b456e567
|
Update imgui.cpp
|
2017-11-22 11:19:52 +01:00 |
|