mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,126 Commits 10 Branches 119 Tags 239 MiB
Commit Graph

345 Commits

Author SHA1 Message Date
ocornut 15113f682e Added TextDisabled(), TextDisabledV() helpers. 2015-05-26 21:10:16 +01:00
ocornut 3a6e6645e6 WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. (#126) 2015-05-26 20:33:48 +01:00
ocornut 6b3ccd3edf WIP Menus: Added support for disabled sub-menu (#126) 2015-05-26 18:02:42 +01:00
ocornut 0db122bc3b Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases (#126) 2015-05-26 17:48:28 +01:00
ocornut fd0108dbef Comments 2015-05-25 23:37:08 +01:00
ocornut 3498617a3c Comments. 2015-05-24 22:16:34 +01:00
ocornut 14bcfef041 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.cpp
 2015-05-24 17:32:10 +01:00
ocornut 8cfae35042 Added Dummy() helper 2015-05-24 17:30:59 +01:00
ocornut 89d1340225 WIP Menus: Added Enabled/Disabled option for MenuItem() (#126) 2015-05-23 13:54:57 +01:00
ocornut 485832fe06 WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples. 2015-05-23 13:43:45 +01:00
ocornut 92ded00fd9 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.h
 2015-05-18 23:32:32 +01:00
ocornut da53caf310 Moved ImVector<> after the main block (#219) 2015-05-18 22:33:43 +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 e674df8101 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-18 16:45:55 +01:00
ocornut 0e8c2f9d41 Comments 2015-05-18 14:10:59 +01:00
ocornut 4bd43bdb35 Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu 2015-05-17 22:28:57 +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 fa0f0f4507 ImVector: tweak growth strategy 2015-05-15 13:14:46 +01:00
ocornut d9ca8f3145 Added IO.MetricsAllocs counter (number of memory allocations 2015-05-15 12:05:05 +01:00
ocornut 1e4c22c206 Added io.MetricsActiveWindows counter (#213) 2015-05-12 16:08:34 +01:00
ocornut 9d9cf31972 ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit (#224) 2015-05-12 14:53:29 +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 5082182790 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.h
 2015-05-11 20:39:19 +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 34aad73fd8 Added ImGuiCol_TextDisabled 2015-05-11 19:36:32 +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
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 f293bec97c Added style.ScrollbarRounding #212 2015-05-09 10:13:56 +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 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 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 221f36e116 Comments, tweaks, metrics window tweak 2015-05-02 17:54:25 +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 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 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 064b94721e Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4. 2015-04-19 23:28:57 +01:00