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 |
|
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 |
|
omar
|
33a2fd368a
|
Merge pull request #218 from paperManu/inputNFlags
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
|
2015-05-11 16:54:12 +01:00 |
|
Emmanuel Durand
|
b3faed610d
|
Renamed flags to extra_flags in last commit
|
2015-05-11 11:40:08 -04: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 |
|
Emmanuel Durand
|
94b7c9e307
|
Input text flags added to InputFloatN and InputIntN
|
2015-05-11 10:15:22 -04:00 |
|
omar
|
cd2ec7868c
|
Merge pull request #217 from Pagghiu/bugfix
Example fix PopStyleVar on Vertical Slider to avoid assertion
|
2015-05-11 14:12:23 +01:00 |
|
Stefano Cristiano
|
99a1a85f1f
|
Example fix PopStyleVar on Vertical Slider to avoid assertion
Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize
|
2015-05-11 14:45:49 +02: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 |
|
omar
|
8ac9036db3
|
Merge pull request #214 from ghassanpl/upstream
InputText(): make sure letter-key shortcuts have ONLY the control key pressed
|
2015-05-11 09:26:00 +01:00 |
|
ocornut
|
4913668ea4
|
Fixed implicit conversion of NULL constant to bool (fix #216)
|
2015-05-11 09:23:29 +01:00 |
|
ghassanpl
|
bb2d3a8b41
|
* make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows)
|
2015-05-10 22:41:28 +02: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 |
|