omar
|
bd278e958e
|
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787)
|
7 years ago |
|
ocornut
|
680162eb32
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
5148937d4d
|
Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (#1567, #1568)
|
7 years ago |
|
omar
|
37ee99983f
|
Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd (#1567)
|
7 years ago |
|
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.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
eb7ec781dc
|
Nav: Tweak GetNavInputAmount(). Split debug defines.
|
7 years ago |
|
omar
|
f6ee8d30fb
|
Comments (#1567)
|
7 years ago |
|
omar
|
d500113f1d
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
9a76fd30fd
|
Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
|
7 years ago |
|
omar
|
13c407591e
|
Nav: Comments, tweaks
|
7 years ago |
|
omar
|
db2ba13154
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
7 years ago |
|
omar
|
9076366c17
|
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181)
|
7 years ago |
|
omar
|
1acb155419
|
Internals: Moved unnecessary MovingWindowMoveId field.
|
7 years ago |
|
omar
|
5097368bd5
|
Tweaked FAQ.
|
7 years ago |
|
omar
|
9edf211c0e
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
3ed2ddbfbe
|
Metrics: Removed context size display.
|
7 years ago |
|
omar
|
ac5b7a1bdf
|
Comments
|
7 years ago |
Panos Karabelas
|
7c8a19978d
|
Simplified return of ImGui::IsKeyReleased()
|
7 years ago |
|
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)
|
7 years ago |
|
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)
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
d4bf9b4686
|
Renaming for consistency.
|
7 years ago |
|
omar
|
8877622fa8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
e5a6e85f6d
|
Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345)
|
7 years ago |
|
omar
|
42a612d7c9
|
Begin: Removed asserts that got in the way of some flags combination. (#1345)
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
74dc70c543
|
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559)
|
7 years ago |
|
omar
|
63d47e8328
|
Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143)
|
7 years ago |
|
omar
|
932d3f0198
|
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
2f15cc0855
|
Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)
|
7 years ago |
|
omar
|
05885b2e6d
|
Merge fix.
|
7 years ago |
|
omar
|
472ba1394c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
28a76af185
|
Internal: DrawData: Tidying, renaming.
|
7 years ago |
|
omar
|
a77913054f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
1182174d81
|
Internals: DrawData: We don't need an intermediate layer for popups.
|
7 years ago |
|
omar
|
0c06b43e6b
|
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
|
7 years ago |
|
omar
|
038453258e
|
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
|
7 years ago |
|
omar
|
06eef2ce6f
|
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
|
7 years ago |
|
omar
|
6eff21ee5e
|
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)"
This reverts commit 03f5cd6ca1.
|
7 years ago |
|
omar
|
514d30d8cd
|
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
|
7 years ago |
Crunkle
|
daa38f2ad0
|
Fix cross compilers
|
7 years ago |
|
omar
|
db63e71f13
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
7 years ago |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
7 years ago |
|
omar
|
c85d7d6e49
|
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
|
7 years ago |
|
omar
|
c9be7d7254
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
0a98202714
|
Nav: Standardized FIXME-NAV marker.
|
7 years ago |
|
omar
|
cc173d7619
|
Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
7 years ago |
|
omar
|
5e9ae92ae9
|
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
7 years ago |
|
omar
|
f7b10fc954
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
6a1011cf53
|
MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
7 years ago |
|
omar
|
b74f24c3e5
|
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)"
This reverts commit 651538e13b.
|
7 years ago |
|
omar
|
1c95dea88c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
7d2a068dea
|
Begin: Shuffling bits of code around.
|
7 years ago |
|
omar
|
cd7e178eac
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
651538e13b
|
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
7 years ago |
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
7 years ago |
|
omar
|
67671c0ab5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
1eee10778b
|
Internals: Begin: Refactor some code into an UpdateManualResize() function.
|
7 years ago |
|
omar
|
483f9b0d07
|
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
|
7 years ago |
|
omar
|
03f5cd6ca1
|
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)
|
7 years ago |
|
omar
|
919fc548ad
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
6c583315e6
|
Begin: Moving some code around for the benefits of the wip viewport branch.
|
7 years ago |
|
omar
|
f610e25682
|
Internals: Using ImFloor().when appropriate.
|
7 years ago |
|
omar
|
fe919995da
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
933ee6cd5d
|
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541)
|
7 years ago |
|
omar
|
fd4d63a0c5
|
InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541)
|
7 years ago |
|
omar
|
168200f915
|
Popups: Comments, reorganize bits of the header section, renamed parameters.
|
7 years ago |
|
omar
|
a8e5542d78
|
BeginPopup: Exposed extra_flags publicly. (#1533)
|
7 years ago |
|
omar
|
3f4eccf154
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
3fc7cf190d
|
OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533)
|
7 years ago |
|
omar
|
deab2ab015
|
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
|
7 years ago |
|
omar
|
69ff65f054
|
Internals: Popup: Renaming fields.
|
7 years ago |
|
omar
|
3678307cd9
|
Popup, Menus: Tweaks and comments.
|
7 years ago |
|
omar
|
369189b675
|
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
|
7 years ago |
|
omar
|
e09852fc49
|
Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
|
7 years ago |
|
omar
|
63e4677b81
|
Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
|
7 years ago |
|
omar
|
c337cdcfd3
|
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
|
7 years ago |
|
omar
|
7ad169fa09
|
Merge branch 'master' into navigation + fix previous merge
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
d730a763f6
|
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
|
7 years ago |
|
omar
|
66b2ee6ea2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
a34490239c
|
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
|
7 years ago |
|
omar
|
5fd19f037f
|
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
|
7 years ago |
|
omar
|
2874aabb93
|
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
|
7 years ago |
|
omar
|
95b773370f
|
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9.
|
7 years ago |
|
omar
|
007f4034c9
|
Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
|
7 years ago |
|
omar
|
29c194b2a4
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
4fc9f44073
|
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
|
7 years ago |
|
omar
|
4b1240b2e1
|
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
|
7 years ago |
|
omar
|
b2ec0741f1
|
Internals: Settings api tweaks
|
7 years ago |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
0a0b252bb6
|
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
|
7 years ago |
|
omar
|
33f7769d85
|
Columns: Clear offsets data when columns count changed. (#1525)
|
7 years ago |
|
omar
|
f9b2058d5a
|
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
|
7 years ago |
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
7 years ago |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
7 years ago |
|
omar
|
7fcbd45500
|
Internals: NextWindow: Renamed, moved functions to member.
|
7 years ago |
|
omar
|
e339949de1
|
Internals: NextWindow: Using ImGuiCond for consistency.
|
7 years ago |