omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
2018-01-31 16:00:25 +01:00 |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
2018-01-31 16:00:07 +01:00 |
|
omar
|
23c11e9764
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-31 15:43:19 +01:00 |
|
omar
|
dd41a1650a
|
Comments
|
2018-01-31 15:41:48 +01:00 |
|
omar
|
6c38aa2dc7
|
Examples: Apple: Tweak code and sync with other examples better (untested).
|
2018-01-31 00:16:44 +01:00 |
|
omar
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
2018-01-31 00:15:47 +01:00 |
|
omar
|
596b6d6de2
|
Style: Enable window border by default. (#707)
|
2018-01-31 00:03:11 +01:00 |
|
omar
|
955d86199f
|
Examples: Tweaks formatting.
|
2018-01-30 23:55:23 +01:00 |
|
omar
|
bebe03db05
|
Metrics: Minor formatting tweaks
|
2018-01-30 21:17:27 +01:00 |
|
omar
|
bd579e5429
|
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (#787). NavActive takes account of NavFlags enable flags.
|
2018-01-30 20:07:12 +01:00 |
|
omar
|
22f7de0fbd
|
Nav: Updated TODO list.
|
2018-01-30 19:20:20 +01:00 |
|
omar
|
9fc6f5907b
|
Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. (#787)
|
2018-01-30 18:34:32 +01:00 |
|
omar
|
1ed7bce3ed
|
Nav: Removed old unused code. (#787)
|
2018-01-30 18:34:17 +01:00 |
|
omar
|
a8763d14c5
|
Internals: Renaming.
|
2018-01-30 15:08:53 +01:00 |
|
omar
|
38197a236d
|
Internals: Renaming.
|
2018-01-30 15:07:20 +01:00 |
|
omar
|
a7ad5134e5
|
Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. (#787)
|
2018-01-30 15:05:46 +01:00 |
|
omar
|
acf21ee429
|
Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. (#787)
|
2018-01-30 15:05:32 +01:00 |
|
omar
|
bed6ef03f5
|
Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. (#787)
|
2018-01-29 23:59:47 +01:00 |
|
omar
|
c851b33352
|
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787)
|
2018-01-29 23:59:46 +01:00 |
|
omar
|
b40dc5c4f2
|
Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. (#787)
|
2018-01-29 23:59:43 +01:00 |
|
omar
|
020b153d35
|
Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. (#787)
|
2018-01-29 23:59:43 +01:00 |
|
omar
|
c8d8dc7f0a
|
Nav: Internals: Renamed RootNavWindow to NavRootWindow (#787)
|
2018-01-29 23:59:43 +01:00 |
|
omar
|
72485a5d04
|
Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. (#787) (+1 squashed commits)
+ store window inside result.
|
2018-01-29 23:59:42 +01:00 |
|
omar
|
1cf38d0334
|
Internals: Nav: Renamed ImGuiNavForward enum (#787)
|
2018-01-29 18:12:32 +01:00 |
|
omar
|
2933e6765c
|
Merge branch 'master' into navigation
|
2018-01-29 17:42:39 +01:00 |
|
omar
|
4654040bcb
|
Nav: Comments, added enum to clarify NavForward code. (#787)
|
2018-01-29 17:35:36 +01:00 |
|
omar
|
c8b9b2c6bd
|
Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. (#787)
|
2018-01-29 15:46:41 +01:00 |
|
omar
|
21771adb94
|
Nav: Debug overlay uses default font. (#787)
|
2018-01-29 15:35:51 +01:00 |
|
omar
|
6a25a8720a
|
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
|
2018-01-29 14:38:46 +01:00 |
|
omar
|
91d77be36e
|
Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)
|
2018-01-29 00:55:16 +01:00 |
|
Omar Cornut
|
3cdd2096ec
|
Examples: Use Clang in old Makefile.
|
2018-01-29 00:48:21 +01:00 |
|
omar
|
ddff378daf
|
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
|
2018-01-29 00:38:00 +01:00 |
|
Omar Cornut
|
858d75ab59
|
Examples: Apple: Fixed filenames in OSX xcode project.
|
2018-01-28 23:24:57 +01:00 |
|
omar
|
66d5712a8a
|
Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long)
|
2018-01-28 20:03:41 +01:00 |
|
omar
|
94090eb08f
|
Added IMGUI_USER_CONFIG to define a custom configuration filename. (#255, #1573, #1144, #41)
|
2018-01-28 17:47:28 +01:00 |
|
omar
|
3571ab8b88
|
imconfig.h comments
|
2018-01-28 17:40:48 +01:00 |
|
omar
|
578016d08b
|
ImVector comment (#1577)
|
2018-01-27 17:26:59 +01:00 |
|
omar
|
3ded262776
|
Merge branch 'master' into navigation
|
2018-01-26 16:07:43 +01:00 |
|
omar
|
2d9d7a10ca
|
Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. (#1574) Looks like a bug introduced in c36e586cce.
|
2018-01-26 11:43:43 +01:00 |
|
omar
|
1f3b66b10a
|
Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 (#246) tho at the time it is possible that SizeContents wasn't calculated as evenly.
Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();
|
2018-01-26 11:43:31 +01:00 |
|
omar
|
10a4a77b27
|
Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. (#787)
|
2018-01-25 20:39:34 +01:00 |
|
omar
|
04d5783ffd
|
Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. (#787)
|
2018-01-25 19:36:38 +01:00 |
|
omar
|
d088bd86ad
|
Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. (#787)
|
2018-01-25 19:25:30 +01:00 |
|
omar
|
486f0a8ba0
|
Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency)
|
2018-01-25 19:07:35 +01:00 |
|
omar
|
f2d5300408
|
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787)
|
2018-01-25 19:03:47 +01:00 |
|
omar
|
ed088b00be
|
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707)
|
2018-01-25 18:50:30 +01:00 |
|
omar
|
827f4b17d3
|
Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). (#787)
|
2018-01-25 16:18:57 +01:00 |
|
omar
|
e9070e768e
|
Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. (#787)
|
2018-01-25 16:17:36 +01:00 |
|
omar
|
3967ff58b2
|
Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). (#787)
|
2018-01-25 16:02:33 +01:00 |
|
omar
|
5d31e1696f
|
Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. (#1363)
|
2018-01-25 15:37:24 +01:00 |
|