Commit Graph

4452 Commits (00418d13e369bf53cc4b8f817eb10b8ce65f0904)
 

Author SHA1 Message Date
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
ocornut 1eafe86627 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
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
ocornut fa0f0f4507 ImVector: tweak growth strategy
ocornut 1fe2906923 Metrics: do not count free(NULL) calls. Settings: contiguous allocations for ImGuiIniData.
ocornut 900394a612 Metrics: metrics window shows popups list
ocornut 222a9231bb Examples: Console: example uses standard malloc/free, makes more sense as a copy & pastable example
ocornut d9ca8f3145 Added IO.MetricsAllocs counter (number of memory allocations
ocornut d9b2a90773 Popups: fixed child windows within popups vs handling of sub menus. Added examples.
ocornut 748072c045 Popups: identifying popups by their id to avoid conflict when recycling popup durnig same same (CloseCurrentPopup followed by Open+Begin)
ocornut e57ee2852a Comments
ocornut 1e4c22c206 Added io.MetricsActiveWindows counter ()
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. ()
ocornut 4b088ec7e8 ImFontAtlas: Fix toward allowing to add extra font without clearing existing one (need to comment out ClearInputData) ()
ocornut 9d9cf31972 ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit ()
ocornut ad79db32c7 Window title text centering tweaks, RenderTextClipped() now has different args for pos_max and clip_max
ocornut 30552ecfd6 Fixed comment (fix )
ocornut 356a37edcf Added window title text horizontal alignment option (),, ImGuiAlign_ type for future use.
ocornut 03720acaff Merge remote-tracking branch 'origin' into 2015-05-menus
ocornut 9be3319653 Tweaks, comments around ImFontAtlas
Removed unsigned int from API
ocornut 9e307d60e3 Merge remote-tracking branch 'origin' into 2015-05-menus
ocornut 515e0c6122 Cleanup, merged duplicate code into a function
ocornut 317744489f WIP Menus: sub-menu arrow alignment take account of extension by other widgets ()
ocornut 5082182790 Merge remote-tracking branch 'origin' into 2015-05-menus
Conflicts:
	imgui.h
ocornut ba7a4fc034 WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type ()
ocornut 7fb704d308 WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) ()
May remove the ImGuiWindowFlags_Menu alltogether
ocornut 79198fd6a5 Default item width for AlwaysAutoResize windows expressed as a factor of font height
ocornut 34aad73fd8 Added ImGuiCol_TextDisabled
ocornut 141ac8beab Tweaks
omar 33a2fd368a Merge pull request from paperManu/inputNFlags
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
Emmanuel Durand b3faed610d Renamed flags to extra_flags in last commit
ocornut fcd08ed8d4 BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip )
Emmanuel Durand 94b7c9e307 Input text flags added to InputFloatN and InputIntN
omar cd2ec7868c Merge pull request from Pagghiu/bugfix
Example fix PopStyleVar on Vertical Slider to avoid assertion
Stefano Cristiano 99a1a85f1f Example fix PopStyleVar on Vertical Slider to avoid assertion
Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize
ocornut 4a41ce9414 InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to ) + tidying
ocornut c2c43928a9 Untabifiy
omar 8ac9036db3 Merge pull request from ghassanpl/upstream
InputText(): make sure letter-key shortcuts have ONLY the control key pressed
ocornut 4913668ea4 Fixed implicit conversion of NULL constant to bool (fix )
ghassanpl bb2d3a8b41 * make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows)
ocornut 6c1084eaa1 Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts
ocornut f293bec97c Added style.ScrollbarRounding
ocornut d23709ce35 Merge remote-tracking branch 'origin' into 2015-05-menus
ocornut 9fe654c6e4 Assert on modifiers stack size mismatch between Begni()/End() pairs
Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error.
ocornut debe6522bb Examples: test for tooltip over popup.
ocornut 33e8fb85cf Allow stacking popups, not really useful yet (wip )
ocornut dd2a578012 Added ImGuiSetCond_Appearing to test the hidden->visible transition.
ocornut f46557d2d6 MenuItem() draft for popups, with Selected option (wip )
ocornut c36172ebef Tweak RenderCheckMark()
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.