ocornut
|
92ded00fd9
|
Merge remote-tracking branch 'origin' into 2015-05-menus
Conflicts:
imgui.h
|
2015-05-18 23:32:32 +01:00 |
|
Gordon McShane
|
6ee65fc5af
|
Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
|
2015-05-18 18:26:16 -04:00 |
|
ocornut
|
da53caf310
|
Moved ImVector<> after the main block (#219)
|
2015-05-18 22:33:43 +01:00 |
|
ocornut
|
b6f3c97e3b
|
Examples: DirectX11: explicitly set rasterizer state.
|
2015-05-18 21:38:17 +01:00 |
|
ocornut
|
0cdd050cd7
|
WIP Menus: fixed recycling menu level during the same frame (#126)
We could also enforce "clearing" the window and recycle immediate which
sort of work, but it would be a less tested code path.
|
2015-05-18 21:26:46 +01:00 |
|
ocornut
|
6da8a77fa3
|
WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) (#126)
|
2015-05-18 19:41:02 +01:00 |
|
ocornut
|
9bdacaf08d
|
WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar (#126)
|
2015-05-18 19:12:36 +01:00 |
|
ocornut
|
75ec4841df
|
WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site (#126)
|
2015-05-18 18:44:15 +01:00 |
|
ocornut
|
e674df8101
|
Merge remote-tracking branch 'origin' into 2015-05-menus
|
2015-05-18 16:45:55 +01:00 |
|
ocornut
|
097fe51f97
|
Hovering require to hover same child window. Reverted 860cf578f5 (December 3), replaced by a flag resize grip.
Might break something if you have childs overlapping non-childs.
|
2015-05-18 16:42:55 +01:00 |
|
ocornut
|
060f879816
|
Tweak internal ButtonBehavior() to ease passing extra options
|
2015-05-18 16:39:37 +01:00 |
|
ocornut
|
7184de24b8
|
WIP Menus: scrolling section of the window is clipped by the menu bar (#126)
|
2015-05-18 15:54:56 +01:00 |
|
ocornut
|
0e8c2f9d41
|
Comments
|
2015-05-18 14:10:59 +01:00 |
|
ocornut
|
a17c930d1f
|
WIP Menus: Added example menu, move app examples to a sub-menu (#126)
NB: menus do not react on click yet, with popup-style blocking of other
inputs yet
|
2015-05-17 23:19:05 +01:00 |
|
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
|
e9b6e437eb
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
imgui.h
|
2015-05-15 17:33:04 +01:00 |
|
ocornut
|
1eafe86627
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
2015-05-15 17:31:56 +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
|
e57ee2852a
|
Comments
|
2015-05-14 11:32:12 +01:00 |
|
ocornut
|
1e4c22c206
|
Added io.MetricsActiveWindows counter (#213)
|
2015-05-12 16:08:34 +01:00 |
|
ocornut
|
5df542c3c0
|
ImFontAtlas: doesn't clear input data, left to the application. (#224)
|
2015-05-12 15:16:12 +01:00 |
|
ocornut
|
4b088ec7e8
|
ImFontAtlas: Fix toward allowing to add extra font without clearing existing one (need to comment out ClearInputData) (#224)
|
2015-05-12 15:10:36 +01:00 |
|
ocornut
|
9d9cf31972
|
ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit (#224)
|
2015-05-12 14:53:29 +01:00 |
|
ocornut
|
ad79db32c7
|
Window title text centering tweaks, RenderTextClipped() now has different args for pos_max and clip_max #222
|
2015-05-12 14:02:45 +01:00 |
|
ocornut
|
30552ecfd6
|
Fixed comment (fix #223)
|
2015-05-12 11:51:22 +01:00 |
|
ocornut
|
356a37edcf
|
Added window title text horizontal alignment option (#222),, ImGuiAlign_ type for future use.
|
2015-05-12 11:49:24 +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 |
|