ed088b00be
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707)
omar2018-01-25 18:50:30 +01:00
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)
omar2018-01-25 16:18:57 +01:00
e9070e768e
Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. (#787)
omar2018-01-25 16:17:36 +01:00
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)
omar2018-01-25 15:48:30 +01:00
5d31e1696f
Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. (#1363)
omar2018-01-25 15:37:24 +01:00
8bf0c89c0d
Internals: ImRect::Contains(ImRect&) include boundaries (whereas Contains(ImVec2) should not).
omar2018-01-25 14:24:57 +01:00
194850db31
Merge pull request #1572 from rainbru/build-examples-fix
omarandGitHub2018-01-25 13:58:27 +01:00
d404b93b6b
Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. (#787) + comments
omar2018-01-24 19:57:39 +01:00
89b0ca1f8f
Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. (#787)
omar2018-01-24 19:55:56 +01:00
c8def61f5c
Merge branch 'master' into navigation
omar2018-01-24 19:36:48 +01:00
f3776055d6
Merge branch 'master' into context
omar2018-01-24 19:31:11 +01:00
8c57d8cc1e
Natvis: Fix ImRect expanded height display being broken and dumb. (#1569)
omar2018-01-24 19:10:09 +01:00
6f27d6b5b8
Natvis: Made ImGuiWindow display shorter.
omar2018-01-24 18:52:26 +01:00
c2e92ab61b
Added imgui.natvis helper for visual studio users. Added to examples projects.
omar2018-01-24 18:40:54 +01:00
6f366fff6b
Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. (#787)
omar2018-01-24 17:08:37 +01:00
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787)
omar2018-01-24 16:57:16 +01:00
28671aa821
Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. (#787)
omar2018-01-24 16:37:20 +01:00
8227176c17
Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). (#787)
omar2018-01-24 15:03:59 +01:00
c09016b12a
Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. (#787)
omar2018-01-24 14:42:28 +01:00
bd278e958e
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787)
omar2018-01-24 14:38:33 +01:00
680162eb32
Merge branch 'master' into navigation
ocornut2018-01-24 17:41:14 +01:00
5148937d4d
Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (#1567, #1568)
omar2018-01-24 17:39:21 +01:00
823e1f0b94
Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments (#787)
omar2018-01-24 10:35:47 +01:00
64b786c2aa
Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) (#787) Note that this bit include badly hardcoded sizes, expecting an improvement later.
omar2018-01-24 10:31:54 +01:00
cea78cc576
Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. (#787)
omar2018-01-24 10:24:41 +01:00
d500113f1d
Merge branch 'master' into navigation
omar2018-01-23 19:16:43 +01:00
9a76fd30fd
Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
omar2018-01-23 19:13:49 +01:00
2645ab5f7f
Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084omar2018-01-23 17:05:15 +01:00
dd89c9ea59
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. (#1565)
omar2018-01-21 20:58:50 +01:00
9edf211c0e
Merge branch 'master' into navigation
omar2018-01-21 20:46:50 +01:00
d3e826c247
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (#1565, #586, #992, #1007, #1558)
omar2018-01-21 20:09:30 +01:00
5e2aa6185c
Reorganized context handling to be more explicit, - YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END. - removed Shutdown() function, as DestroyContext() serve this purpose. - you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance. - removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts. - removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts (#1565, #586, #992, #1007, #1558)
omar2018-01-21 19:58:32 +01:00
e45d7a7060
Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (#1565, #586, #992, #1007, #1558)
omar2018-01-21 18:54:22 +01:00
5a301c29dc
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565, #586, #992, #1007, #1558)
omar2018-01-20 21:41:46 +01:00
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939)
omar2018-01-20 20:25:12 +01:00
7e7c017b75
Examples: Simplified mouse wheel handling. (#1463)
omar2018-01-20 12:45:31 +01:00
7dea158175
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463)
omar2018-01-20 12:36:59 +01:00
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463)
omar2018-01-20 12:36:16 +01:00
d4bf9b4686
Renaming for consistency.
omar2018-01-19 15:47:10 +01:00
8877622fa8
Merge branch 'master' into navigation
omar2018-01-19 15:42:28 +01:00
e5a6e85f6d
Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345)
omar2018-01-19 15:37:25 +01:00
42a612d7c9
Begin: Removed asserts that got in the way of some flags combination. (#1345)
omar2018-01-19 15:33:35 +01:00
0978f00911
MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now.
omar2018-01-19 15:06:39 +01:00
f3e510a9bf
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. (#1559) Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
omar2018-01-19 10:46:54 +01:00
00351ee2ab
Examples: SDL: Minor renaming.
omar2018-01-19 09:53:55 +01:00
ba99900023
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
omar2018-01-19 09:48:23 +01:00
79dca9d5e6
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
omar2018-01-19 09:45:27 +01:00
15fd5b6c4c
Examples: SDL: Minor renaming.
omar2018-01-19 09:43:28 +01:00
ce17e0f274
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. (#1559)
omar2018-01-19 09:25:31 +01:00
74dc70c543
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559)
omar2018-01-19 09:16:26 +01:00
c2ffce3e5a
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143)
omar2018-01-18 17:39:40 +01:00
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143)
omar2018-01-18 17:32:34 +01:00
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments.
omar2018-01-18 10:06:58 +01:00
60d5dc7902
Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541)
omar2018-01-18 10:01:36 +01:00
d1f726cd9d
Comments about Begin/End pair and handling of return value.
omar2018-01-17 12:46:07 +01:00
cc15512bfc
InputText: Minor tweak.
omar2018-01-17 12:15:24 +01:00
7ccbb765e2
InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554)
omar2018-01-17 12:15:00 +01:00
2f15cc0855
Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)
omar2018-01-15 21:55:32 +01:00
514d30d8cd
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
omar2018-01-14 14:13:54 +01:00
db63e71f13
Internals: Exposed SetCurrentFont() in imgui_internal.h
omar2018-01-12 20:07:01 +01:00
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
omar2018-01-12 19:53:27 +01:00
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
omar2018-01-12 19:28:37 +01:00
c9be7d7254
Merge branch 'master' into navigation
omar2018-01-12 19:21:12 +01:00
16285603f2
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
omar2018-01-12 19:11:11 +01:00
omar