Commit Graph
100 Commits
Author SHA1 Message Date
ocornut 09abf11e56 WIP Menus: BeginMenuBar() return false on window without a menu bar (#126) 2015-05-17 23:13:53 +01:00
ocornut 4bd43bdb35 Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu 2015-05-17 22:28:57 +01:00
ocornut 7f3f3891c0 WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted (#126) 2015-05-17 22:15:40 +01:00
ocornut 88d7b3de23 WIP Menus: fixed hovering handling of menus from menu bars (#126) 2015-05-17 17:21:49 +01:00
ocornut f2b738648f WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. (#126). 2015-05-17 17:13:45 +01:00
ocornut e0594340ff Moved internal window flags to higher bit-count 2015-05-17 16:29:00 +01:00
ocornut 6251d37987 WIP Menus: further fixes for resizing (#126) 2015-05-17 15:48:56 +01:00
ocornut f44526cc45 Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window 2015-05-17 13:09:46 +01:00
ocornut e912bcb36d Comments 2015-05-17 12:10:57 +01:00
ocornut ecda785cbc Popups: fix to allow child popups to be opened from a normal window without an intermediate popup window. 2015-05-15 23:57:43 +01:00
ocornut 4250357ed2 Selectable: using window->WindowPadding() to work within non-padded child windows 2015-05-15 22:39:52 +01:00
ocornut 79a95256e8 Window: fixed auto-fit calculation mismatch of whether a scrollbar will be added by maximum height clamping.
Also honor NoScrollBar in the case of height clamping, not adding extra
horizontal space.
2015-05-15 22:36:31 +01:00
ocornut 3115e546aa Style editor: fixed slider for indent spacing. 2015-05-15 21:55:54 +01:00
ocornut c1b55991c0 Window: fixed child window sizing lag + minimum size clamping lag 2015-05-15 21:40:45 +01:00
ocornut 70f83a3a65 Popups: child popups (menus) hidden on their first frame the same way as regular popup 2015-05-15 20:35:28 +01:00
ocornut 81937d34a8 Popups: made OpenPopup()/close loops reclaim focus and update popup position. It is generally a mistake but it's now more easy to understand 2015-05-15 17:29:42 +01:00
ocornut fa0f0f4507 ImVector: tweak growth strategy 2015-05-15 13:14:46 +01:00
ocornut 1fe2906923 Metrics: do not count free(NULL) calls. Settings: contiguous allocations for ImGuiIniData. 2015-05-15 12:45:35 +01:00
ocornut 900394a612 Metrics: metrics window shows popups list 2015-05-15 12:24:05 +01:00
ocornut 222a9231bb Examples: Console: example uses standard malloc/free, makes more sense as a copy & pastable example 2015-05-15 12:09:34 +01:00
ocornut d9ca8f3145 Added IO.MetricsAllocs counter (number of memory allocations 2015-05-15 12:05:05 +01:00
ocornut d9b2a90773 Popups: fixed child windows within popups vs handling of sub menus. Added examples. 2015-05-15 11:30:51 +01:00
ocornut 748072c045 Popups: identifying popups by their id to avoid conflict when recycling popup durnig same same (CloseCurrentPopup followed by Open+Begin) 2015-05-14 15:15:17 +01:00
ocornut 03720acaff Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-12 10:11:14 +01:00
ocornut 9be3319653 Tweaks, comments around ImFontAtlas
Removed unsigned int from API
2015-05-12 09:08:47 +01:00
ocornut 9e307d60e3 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-11 21:45:13 +01:00
ocornut 515e0c6122 Cleanup, merged duplicate code into a function 2015-05-11 21:44:50 +01:00
ocornut 317744489f WIP Menus: sub-menu arrow alignment take account of extension by other widgets (#126) 2015-05-11 20:58:07 +01:00
ocornut 5082182790 Merge remote-tracking branch 'origin' into 2015-05-menus
Conflicts:
	imgui.h
2015-05-11 20:39:19 +01:00
ocornut ba7a4fc034 WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type (#126) 2015-05-11 20:34:52 +01:00
ocornut 7fb704d308 WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) (#126)
May remove the ImGuiWindowFlags_Menu alltogether
2015-05-11 19:52:02 +01:00
ocornut 79198fd6a5 Default item width for AlwaysAutoResize windows expressed as a factor of font height 2015-05-11 19:47:01 +01:00
ocornut 34aad73fd8 Added ImGuiCol_TextDisabled 2015-05-11 19:36:32 +01:00
ocornut 141ac8beab Tweaks 2015-05-11 18:28:30 +01:00
ocornut fcd08ed8d4 BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126) 2015-05-11 15:57:02 +01:00
ocornut 4a41ce9414 InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to #214) + tidying 2015-05-11 09:29:10 +01:00
ocornut c2c43928a9 Untabifiy 2015-05-11 09:26:53 +01:00
ocornut 4913668ea4 Fixed implicit conversion of NULL constant to bool (fix #216) 2015-05-11 09:23:29 +01:00
ocornut 6c1084eaa1 Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts #207 2015-05-09 10:27:03 +01:00
ocornut f293bec97c Added style.ScrollbarRounding #212 2015-05-09 10:13:56 +01:00
ocornut d23709ce35 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-09 10:02:48 +01:00
ocornut 9fe654c6e4 Assert on modifiers stack size mismatch between Begni()/End() pairs #204
Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error.
2015-05-09 09:59:46 +01:00
ocornut debe6522bb Examples: test for tooltip over popup. 2015-05-07 19:00:17 +01:00
ocornut 33e8fb85cf Allow stacking popups, not really useful yet (wip #126) 2015-05-07 18:43:08 +01:00
ocornut dd2a578012 Added ImGuiSetCond_Appearing to test the hidden->visible transition. 2015-05-07 18:39:23 +01:00
ocornut f46557d2d6 MenuItem() draft for popups, with Selected option (wip #126) 2015-05-07 17:21:48 +01:00
ocornut c36172ebef Tweak RenderCheckMark() 2015-05-07 17:11:32 +01:00
ocornut 85b8967291 Added RenderCheckMark() helper following the font size
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
2015-05-07 17:06:07 +01:00
ocornut 13c3f11c66 Comments (#209) 2015-05-07 11:36:16 +01:00
ocornut fbbe7fee53 Fix "Debug" window stealing focus/popup #208 #209 @thevaber 2015-05-07 11:24:51 +01:00
ocornut 25d8c1af91 Removed inline marker #210 2015-05-07 10:48:05 +01:00
ocornut e7ffcea33d Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same). 2015-05-03 14:26:47 +01:00
ocornut b1b23d6ca9 Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that) 2015-05-03 13:52:53 +01:00
ocornut 0ca7926b94 Popup auto-border doesn't spread to its childs #197 2015-05-03 13:04:43 +01:00
ocornut a3a10d4a3c Popup have borders by default #197 attenuated border alpha in default theme 2015-05-03 12:17:53 +01:00
ocornut 47e875314b Plot: overlay label clipped within frame when bigger than frame 2015-05-03 11:32:39 +01:00
ocornut d84b5737a6 Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size.
Big change, needed reorder of Begin(). May trigger new bugs.
2015-05-02 18:22:46 +01:00
ocornut 99e315d2b2 Fix for width of child windows with scrollbar (broken 376a6a5af0) 2015-05-02 18:14:24 +01:00
ocornut 221f36e116 Comments, tweaks, metrics window tweak 2015-05-02 17:54:25 +01:00
ocornut a3560b274e Tidying up Begin(): using local copy of 'flags' for brevity 2015-05-02 17:45:54 +01:00
ocornut 6ca4b31bf8 Fixed popup resizing (broken 376a6a5af0) 2015-05-02 15:54:35 +01:00
ocornut a906738ba7 Renamed Visible->Active internally 2015-05-02 13:20:50 +01:00
ocornut 1b5795c96d InputText: fixed incorrect edit state after text buffer is modified by user through callback #206 2015-05-02 12:45:53 +01:00
ocornut 81bf614821 Fix window size after collapsing (broken 376a6a5af0) 2015-05-02 12:35:34 +01:00
ocornut 7fac4013a4 Build fix 2015-05-02 12:22:52 +01:00
ocornut 4e292bf67d Tidying up Begin(): separated blocks needed for auto-resize so it can be moved above position calculation later 2015-05-02 12:20:06 +01:00
ocornut 376a6a5af0 Tidying up Begin() separated blocks needed for auto-resize so it can be moved above position calculation later
Being cautious again. Hopefully didn't break anything.
2015-05-02 12:08:24 +01:00
ocornut 46f55fe6f6 Tidying up Begin() 2015-05-02 10:46:24 +01:00
ocornut 3f7f256752 Tidying up. Re-arranged the (first_begin_of_the_frame) blocks in Begin() for further changes.
Being cautious.
2015-05-02 10:32:32 +01:00
ocornut 19f7bf90f8 Examples: AutoResize demo doesn't use TextWrapped() 2015-05-01 21:01:54 +01:00
ocornut 07ebb14ce2 Tooltip: fit within display. Added style.DisplayWindowPadding, style.DisplaySafeAreaPadding now strictly for popups/menus. 2015-05-01 20:35:44 +01:00
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155) 2015-05-01 11:25:15 +02:00
ocornut 68ccdc4fb8 Comments 2015-05-01 11:07:30 +02:00
ocornut 8fbb42cc6f Added IsKeyDown() IsMouseDown() as convenience instead of reading into IO structures
Also their existence serves as implicit documentation of what
IsKeyPressed(), IsMouseClicked() does
2015-04-28 18:12:24 +02:00
ocornut 2440a30444 Columns() distinguish columns-set ID from other widgets as a convenience, added asserts, added more sailors 2015-04-28 18:09:38 +02:00
ocornut bd23c11a93 Separator() within group start on group horizontal offset #205 2015-04-27 22:19:14 +02:00
ocornut 1d90f099bd Tidying up
We still have an issue with ImVec4 vs ImRect
2015-04-26 13:17:56 +02:00
ocornut 6844952d56 Fixed build with Visual Studio 2008 or earlier (via PR #203) 2015-04-24 09:22:29 +02:00
ocornut 18a00c7060 Examples: DirectX9/11: Fixed key mapping for down arrow. 2015-04-24 09:18:56 +02:00
ocornut c93a562b06 Added ImGuiStorage::GetVoidPtrRef() 2015-04-21 10:12:17 +01:00
ocornut 9119f58ce5 Version number 1.39 WIP 2015-04-21 10:09:20 +01:00
ocornut 0123fc8c0f Removed comment 2015-04-19 23:56:35 +01:00
ocornut 37d8d78fc2 Selectable() render into AutoFitPadding only when full-fitting (fix aac99819d6) 2015-04-19 23:37:50 +01:00
ocornut 064b94721e Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4. 2015-04-19 23:28:57 +01:00
ocornut 05ee36baab Version number 1.38 2015-04-19 22:59:27 +01:00
ocornut 85e18c72d2 ShowTestWindow(): drag example + tooltip. 2015-04-19 22:57:39 +01:00
ocornut 731b003c9d Slider internals: removed unnecessary slider_bb parameter 2015-04-18 19:34:05 +01:00
ocornut acbd58627f ShowTestWindow(): added a custom label in the format for one of the slider example. 2015-04-18 17:35:40 +01:00
ocornut c46d5634d4 Columns: mouse dragging uses absolute mouse coords. Fixed dragging left-most column of an auto-resizable window. #125 2015-04-18 13:46:28 +01:00
ocornut c82f909be1 Active column (when dragged) not clipped so it can release its active state (extends 16ddd796f3) 2015-04-18 12:11:59 +01:00
ocornut 26e469af22 Documentation 2015-04-18 09:19:41 +01:00
ocornut 04a4433706 Update imconfig.h documentation 2015-04-18 09:16:32 +01:00
ocornut 02de9bd859 DragFloat, DragInt: if step/speed is zero defaults to 1% of range #180 2015-04-17 10:01:39 +01:00
ocornut 7fde17e15a ShowMetricsWindow(): renaming locals (not sure about the "shadows a local variable" warning?) 2015-04-16 23:30:48 +01:00
ocornut 0d4f29a317 Merge branch 'bkaradzic-master' 2015-04-16 23:28:58 +01:00
ocornut 64db50ba46 TODO list 2015-04-16 10:58:30 +01:00
ocornut aca85dbea4 Fixed hovering over a popup's child (popups disable hovering on other windows but not their childs) #197 2015-04-16 10:54:56 +01:00
ocornut f400ea4ec8 Examples: OpenGL3: backup/restore current program and texture #195 2015-04-15 10:14:51 +01:00
ocornut de3a154f38 Tweak date/credits 2015-04-14 12:00:12 +01:00
ocornut 71429d306e Examples: Simplified GLFW keyboard callbacks 2015-04-14 09:45:27 +01:00