-
-
Notifications
You must be signed in to change notification settings - Fork 10.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added ImGuiTreeNodeFlags_UseFullWidth to allow using the full content width for the interaction area for unframed tree nodes. #2451
Conversation
a83ea87
to
ef4f6f5
Compare
… width for the interaction area for unframed tree nodes.
Linking to #2438 |
Well, as @ocornut said in #1897, this flag should be called Line 780 in 20188b1
|
Oops, I thought I had looked for existing issues but I either didn't or did a bad job. (Also that's what I get for glossing over the commented-out flags.) Since #2438 is basically functionally identical, I'll close this PR. @ocornut Is there something preventing the merge of #2438 that we can help resolve, or are you just busy recovering from GDC? |
Nothing specific, I haven't looked at either and I have a millon things to look that. I am not even sure And my intuition is that we could aim at making the currently explicit AllowOverlap the default everywhere in dear imgui and then those features might be enabled on by default. aka there are many things to think about. |
No worries, just wanted to double check. Thanks! |
Fixed now, added |
Integrated power saving mode in Allegro example. Fixed the cursor-blinking issue. It is now working as expected, i.e. only setting a frame rate requirement of 6fps when visibly blinking. Also refactored a bit such that ImGui uses a boolean flag instead of sharing the FrameRateRequirements object with user code. Renamed FrameRateRequirements -> UserFrameRateRequirements. Just so it's more explicit. Minor formatting fixes [noci] Implemented support for event waiting timeout in Win32. Simplified the implementation. This also addresses a design issue regarding how the application requests a specific frame rate. Get rid of the minimum frame rate. Implemented logic to always render at least 3 frames. Plus a bit of renaming/refactoring. Implemented the 3-frame update logic for the SDL example. Added support for 3-frame updates to Allegro example + refactoring of SDL/OpenGL3 example + refactoring and bug fix of Win32/DX11 example Added suppor for 3-frame updates to Glfw example. Rebased imstb_rectpack on stb_rect_pack v1.00. SliderScalar: Improved assert when using U32 or U64 types with a large v_max value. (ocornut#2765) + misc minor stuff. Demo: PlotLine example displays the average value. (ocornut#2759) + extra comments Added a mechanism to compact/free the larger allocations of unused windows (buffers are compacted when a window is unused for 60 seconds, as per io.ConfigWindowsMemoryCompactTimer = 60.0f). Note that memory usage has never been reported as a problem, so this is merely a touch of overzealous luxury. (ocornut#2636) Disable with ConfigWindowsMemoryCompactTimer < 0.0f (ocornut#2636) TabBar: improved shrinking for large number of tabs to avoid leaving extraneous space on the right side. Individuals tabs are given integer-rounded width and remainder is spread between tabs left-to-right. TabBar: feed desired width (sum of unclipped tabs width) into layout system to allow for auto-resize. (ocornut#2768) Before 1.71 tab bars fed the sum of current width which created feedback loops in certain situations. Amend f95c77e. DragInt, DragFloat, DragScalar: Using (v_min > v_max) allows locking any edit to the value. ColorEdit: Disable Hue edit when Saturation==0 instead of letting Hue values jump around. Fixed missing IMGUI_API for IsMouseDragPastThreshold(). Renamed SetMaxTimeBeforeNewFrame -> SetMaxWaitBeforeNextFrame Compute the proper time to flip the cursor, instead of using 6fps. Due to the 3-frame logic, this makes the effective cursor frame rate go from 15fps to 5fps. Refactored the event waiting implementation in SDL. Moved the waiting part into the common implementation file. This makes the platform+renderer binding simpler and not deviating much from the existing one, which should make merging/integration easier, especially for people maintaining their own copies. Renamed variable to match the method name. Refactored Win32 waiting code into common platform file + fix typo in SDL example Fixed build Avoid wasting frames by adding a small margin for the cursor. Fixed regression Win32 example: don't render 3 frames on timeouts + some refactoring Refactored+fixed the Allegro5 implementation Refactored+fixed Glfw example Refactored+fixed SDL example Refactoring (renaming) Some final cleanup/refactoring; make the diff better Refactored: no need to conditionally (not) poll after wait. Keep waiting when the window is hidden (or minimized). Implemented for Allegro, Glfw and SDL. (does not seem to work with Allegro on Linux) Implemented blocking when minimized/hidden for Win32 Minor formatting/doc changes. Knocked off the 3 TODO items implemented by this PR. Added missing Glfw callback (mouse pos) This is just to record the event. The mouse pos is still handled as before. Small optimization: added shortcut test when feature disabled This avoids paying the library/syscall cost when not needed. Backends: OpenGL3: Tweaked initialization code allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before ImGui_ImplOpenGL3_NewFrame() if for some reason they wanted. Fix DragScalar for unsigned types (ocornut#2780) decreasing the value was broken on arm64 Nav, Scrolling: Added support for Home/End key. (ocornut#787) Columns: Separator: Fixed a bug where non-visible separators within columns would alter the next row position differently than visible ones. Fixed rounding issues also leading to change of ScrollMax depending on visible items (in particular negative coordinate would be rounded differently) Fix signed types warning in pasteboard handler (ocornut#2786) Examples: SDL/GLFW + OpenGL3: Fixes for Makefile (ocornut#2774) - append CXXFLAGS instead of overwriting them - add glad.c build rule BeginTabItem: Fixed case where right-most tab would create an extraneous draw calls (probably related to other tab fitting code in 1.73 wip) Remove trailing spaces (grep for ' \r?$' in visual studio) Internal: Offset STB_TEXTURE_K_ defines to remove that change from ocornut#2541 + sponsors update. Font: implement a way to draw narrow ellipsis without relying on hardcoded 1 pixel dots. (ocornut#2775) This changeset implements several pieces of the puzzle that add up to a narrow ellipsis rendering. `ImFontConfig` and `ImFont` received `ImWchar EllipsisCodePoint = -1;` field. User may configure `ImFontConfig::EllipsisCodePoint` a unicode codepoint that will be used for rendering narrow ellipsis. Not setting this field will automatically detect a suitable character or fall back to rendering 3 dots with minimal spacing between them. Autodetection prefers codepoint 0x2026 (narrow ellipsis) and falls back to 0x0085 (NEXT LINE) when missing. Wikipedia indicates that codepoint 0x0085 was used as ellipsis in some older windows fonts. So does default Dear ImGui font. When user is merging fonts - first configured and present ellipsis codepoint will be used, ellipsis characters from subsequently merged fonts will be ignored. Rendering a narrow ellipsis is surprisingly not straightforward task. There are cases when ellipsis is bigger than the last visible character therefore `RenderTextEllipsis()` has to hide last two characters. In a subset of those cases ellipsis is as big as last visible character + space before it. `RenderTextEllipsis()` tries to work around this case by taking free space between glyph edges into account. Code responsible for this functionality is within `if (text_end_ellipsis != text_end_full) { ... }`. There are cases when font does not have ellipsis character defined. In this case RenderTextEllipsis() falls back to rendering ellipsis as 3 dots, but with reduced spacing between them. 1 pixel space is used in all cases. This results in a somewhat wider ellipsis, but avoids issues where spaces between dots are uneven (visible in larger/monospace fonts) or squish dots way too much (visible in default font where dot is essentially a pixel). This fallback method obsoleted `RenderPixelEllipsis()` and this function was removed. Note that fallback ellipsis will always be somewhat wider than it could be, however it will fit in visually into every font used unlike what `RenderPixelEllipsis()` produced. Font: Narrow ellipsis: various minor stylistic tweaks (ocornut#2775) Font: Narrow ellipsis: once we know an ellipsis is going to be drawn, we can claim the space between pos_max.x and ellipsis_max.x which gives us enough extra space to not requires the further (and otherwise valid) optimizations. Gets us vastly simplified code, yay. (ocornut#2775) Style: Allow style.WindowMenuButtonPosition to be set to ImGuiDir_None to hide the collapse button. (ocornut#2634, ocornut#2639) + Fix ocornut#2775 ImDrawListSplitter: fixed an issue merging channels if the last submitted draw command used a different texture. (ocornut#2506) Fixed unused static function warning for some compilers. (ocornut#2793) TreeNode: Added ImGuiTreeNodeFlags_SpanAvailWidth and ImGuiTreeNodeFlags_SpanFullWidth flags (ocornut#2451, ocornut#2438, ocornut#1897) Added demo bits. Warning fix. ColorPicker / ColorEdit: restore Hue when zeroing Saturation. (ocornut#2722, ocornut#2770) Issue is fixed by storing last active color picker color and last hue value when active color picker takes rgb as input. Then if current color picker color matches last active color - hue value will be restored. IDs are not used because ColorEdit4() and ColorWidget4() may call each other in hard-to-predict ways and they both push their own IDs on to the stack. We need hue restoration to happen in entire stack of these widgets if topmost widget used hue restoration. Since these widgets operate on exact same color value - color was chosen as a factor deciding which widgets should restore hue. ColorPicker / ColorEdit: restore Hue when zeroing Saturation. (ocornut#2722, ocornut#2770) - changelog, fixed uninitialized variables, tweaks, renaming. Fixed mouse event forwarding in macos example (ocornut#2710, ocornut#1961) Readme, Wiki: Image loading examples.
This PR adds a new flag to allow using the full width of the content area for the interaction area of a tree node, resolving this 3 year old comment.
I opted to retain the behavior of
ImGuiTreeNodeFlags_Framed
similar toImGuiTreeNodeFlags_FramePadding
. As such, this does not change current behavior. I also modified the "advanced tree node" demo to use the feature so those learning from the demo will find it easier.I wasn't 100% sure on protocol for updating the changelog, so I went ahead an updated it.