ocornut
|
680162eb32
|
Merge branch 'master' into navigation
|
ago%!(EXTRA string=8 years) |
|
omar
|
5148937d4d
|
Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (#1567, #1568)
|
ago%!(EXTRA string=8 years) |
|
omar
|
37ee99983f
|
Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd (#1567)
|
ago%!(EXTRA string=8 years) |
|
omar
|
823e1f0b94
|
Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments (#787)
|
ago%!(EXTRA string=8 years) |
|
omar
|
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.
|
ago%!(EXTRA string=8 years) |
|
omar
|
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)
|
ago%!(EXTRA string=8 years) |
|
omar
|
eb7ec781dc
|
Nav: Tweak GetNavInputAmount(). Split debug defines.
|
ago%!(EXTRA string=8 years) |
|
omar
|
f6ee8d30fb
|
Comments (#1567)
|
ago%!(EXTRA string=8 years) |
|
omar
|
d500113f1d
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
ago%!(EXTRA string=8 years) |
|
omar
|
9a76fd30fd
|
Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
|
ago%!(EXTRA string=8 years) |
|
omar
|
2645ab5f7f
|
Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084
|
ago%!(EXTRA string=8 years) |
|
omar
|
13c407591e
|
Nav: Comments, tweaks
|
ago%!(EXTRA string=8 years) |
|
omar
|
db2ba13154
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
ago%!(EXTRA string=8 years) |
|
omar
|
9076366c17
|
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181)
|
ago%!(EXTRA string=8 years) |
|
omar
|
1acb155419
|
Internals: Moved unnecessary MovingWindowMoveId field.
|
ago%!(EXTRA string=8 years) |
|
omar
|
5097368bd5
|
Tweaked FAQ.
|
ago%!(EXTRA string=8 years) |
|
omar
|
9edf211c0e
|
Merge branch 'master' into navigation
|
ago%!(EXTRA string=8 years) |
|
omar
|
3ed2ddbfbe
|
Metrics: Removed context size display.
|
ago%!(EXTRA string=8 years) |
|
omar
|
ac5b7a1bdf
|
Comments
|
ago%!(EXTRA string=8 years) |
omar
|
8b64d50cc4
|
Merge pull request #1564 from PanosK92/master
Simplified return of ImGui::IsKeyReleased().
|
ago%!(EXTRA string=8 years) |
Panos Karabelas
|
7c8a19978d
|
Simplified return of ImGui::IsKeyReleased()
|
ago%!(EXTRA string=8 years) |
|
omar
|
5eb293c879
|
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
|
ago%!(EXTRA string=8 years) |
|
omar
|
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)
|
ago%!(EXTRA string=8 years) |
|
omar
|
7e7c017b75
|
Examples: Simplified mouse wheel handling. (#1463)
|
ago%!(EXTRA string=8 years) |
|
omar
|
7dea158175
|
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463)
|
ago%!(EXTRA string=8 years) |
|
omar
|
0b1fecb792
|
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463)
|
ago%!(EXTRA string=8 years) |
|
omar
|
6f6b6194b2
|
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
|
ago%!(EXTRA string=8 years) |
|
omar
|
d4bf9b4686
|
Renaming for consistency.
|
ago%!(EXTRA string=8 years) |
|
omar
|
8877622fa8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
ago%!(EXTRA string=8 years) |
|
omar
|
e5a6e85f6d
|
Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345)
|
ago%!(EXTRA string=8 years) |
|
omar
|
42a612d7c9
|
Begin: Removed asserts that got in the way of some flags combination. (#1345)
|
ago%!(EXTRA string=8 years) |
|
omar
|
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.
|
ago%!(EXTRA string=8 years) |
|
omar
|
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.
|
ago%!(EXTRA string=8 years) |
|
omar
|
00351ee2ab
|
Examples: SDL: Minor renaming.
|
ago%!(EXTRA string=8 years) |
|
omar
|
ba99900023
|
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
|
ago%!(EXTRA string=8 years) |
|
omar
|
79dca9d5e6
|
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
|
ago%!(EXTRA string=8 years) |
|
omar
|
15fd5b6c4c
|
Examples: SDL: Minor renaming.
|
ago%!(EXTRA string=8 years) |
|
omar
|
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)
|
ago%!(EXTRA string=8 years) |
|
omar
|
74dc70c543
|
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559)
|
ago%!(EXTRA string=8 years) |
|
omar
|
c2ffce3e5a
|
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143)
|
ago%!(EXTRA string=8 years) |
|
omar
|
63d47e8328
|
Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143)
|
ago%!(EXTRA string=8 years) |
|
omar
|
932d3f0198
|
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments.
|
ago%!(EXTRA string=8 years) |
|
omar
|
60d5dc7902
|
Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541)
|
ago%!(EXTRA string=8 years) |
|
omar
|
d1f726cd9d
|
Comments about Begin/End pair and handling of return value.
|
ago%!(EXTRA string=8 years) |
|
omar
|
cc15512bfc
|
InputText: Minor tweak.
|
ago%!(EXTRA string=8 years) |
|
omar
|
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)
|
ago%!(EXTRA string=8 years) |
|
omar
|
2f15cc0855
|
Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)
|
ago%!(EXTRA string=8 years) |
|
omar
|
05885b2e6d
|
Merge fix.
|
ago%!(EXTRA string=8 years) |
|
omar
|
a221d253f3
|
Nav: Comment.
|
ago%!(EXTRA string=8 years) |
|
omar
|
472ba1394c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
ago%!(EXTRA string=8 years) |
