mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,729 Commits 9 Branches 125 Tags 306 MiB
Commit Graph

211 Commits

Author SHA1 Message Date
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS 2017-08-11 13:36:28 +08:00
omar be9628494a Demo: Rearranged everything under Widgets in a more consistent way. 2017-08-08 18:04:31 +08:00
omar d888de4483 Demo: Merged a few demo tweaks from navigation branch to minimize drift. 2017-08-08 17:49:12 +08:00
omar 942cb0e1f2 Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346) 2017-08-08 15:54:20 +08:00
omar d952a8d3bf Demo: Color widget demo tweaks (#346) 2017-08-08 14:49:45 +08:00
omar 1c991b525a Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2017-08-07 22:34:30 +08:00
omar e36b41cbd0 Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo. 2017-08-07 21:53:57 +08:00
omar 233a6efeba Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271) 2017-08-07 18:35:15 +08:00
omar cdea8ca94f Demo: Comment about 'static' and some tweaks (#1267) 2017-08-06 11:07:52 +08:00
omar f6460970c5 ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346) 2017-07-31 21:20:42 +08:00
omar 3075d8bcd4 ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346) 2017-07-30 23:08:43 +08:00
omar 91a4f5df25 Demo: Tweaks 2017-07-30 18:28:59 +08:00
omar 90fcd4a829 Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346) 2017-07-30 17:55:42 +08:00
omar 4d844ffde1 Demo: custom ColorPicker popup example tweaks (#346) 2017-07-30 17:43:19 +08:00
omar f040547a5f Demo: custom ColorPicker popup example (#346) 2017-07-30 17:37:28 +08:00
omar fef8aac523 ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346) 2017-07-30 16:15:52 +08:00
omar 35186a1165 Demo: Comments (#346) 2017-07-29 17:35:24 +08:00
omar 3926bd08e1 ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346) 2017-07-29 17:23:32 +08:00
omar 6bc1572d31 ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346) 2017-07-29 15:50:24 +08:00
omar 973d4a361b ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346) 2017-07-29 14:32:41 +08:00
omar cdcda9ff68 ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. (#346) 2017-07-29 14:01:05 +08:00
omar c36d59a42a ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. (#346) 2017-07-27 17:16:46 +08:00
omar b7a563276d ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346) 2017-07-27 11:07:46 +08:00
omar 2e37db9002 ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346) 2017-07-27 10:49:01 +08:00
omar 6796e771fd ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again. 2017-07-26 16:28:01 +08:00
omar d29a4c5e5c Demo: Removed the color button from the context menu example because it is misleading now that our color widget have tooltip/context menus themselves. (#346) 2017-07-26 16:00:47 +08:00
omar 7b2d79cffd ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. (#346) 2017-07-23 18:44:32 +08:00
omar 4def2ce339 ColorPicker: Demo tweaks (#346) 2017-07-23 17:55:39 +08:00
omar 790d0eb5be ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346) 2017-07-22 19:24:39 +08:00
omar 91bf8fd689 ColorPicker,ColorEdit: Demo code (#346) 2017-07-22 18:01:29 +08:00
omar c8553817d9 Merge branch 'master' into 2016-02-colorpicker 2017-07-21 02:34:19 +08:00
omar 100d30a0a1 Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169) 2017-07-20 23:12:58 +08:00
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker 2017-07-19 14:53:25 +08:00
omar 8261d9ff30 Comments (#1172, #1231) 2017-07-15 17:11:53 +08:00
omar 12d265fa31 Version 1.51 WIP tag 2017-06-13 11:30:22 +02:00
omar 5e1caaaef3 Version 1.50 2017-06-02 12:22:34 +02:00
omar c038339a4c Merge branch 'master' into 2015-02-colorpicker 2017-05-26 13:43:36 +02:00
omar 026d021df1 Demo: Fixed warnings introduced in 0828a1fd6c 2017-05-26 13:40:53 +02:00
omar 0828a1fd6c Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account 2017-05-14 16:27:10 +02:00
omar 497381dc3d Comments 2017-05-01 15:53:50 +02:00
omar 89b1497843 Merge branch 'master' into 2016-02-colorpicker 2017-05-01 12:37:34 +02:00
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is. 2017-03-17 21:29:57 +01:00
omar b6c0227add Merge branch 'master' into 2016-02-colorpicker 2017-01-11 21:03:35 +01:00
omar 714beb217c Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end. 2017-01-07 20:18:45 +01:00
ocornut 68df09cf47 Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse) 2017-01-01 20:11:40 +01:00
ocornut a60b2cc645 Merge branch 'master' into 2016-02-colorpicker 2016-12-23 12:15:58 +01:00
ocornut 52308a54f8 Demo: comments 2016-12-12 11:05:41 +01:00
ocornut f4cf972ea9 Merge branch 'master' into 2016-02-colorpicker 2016-11-27 18:21:14 +01:00
ocornut fdbad2708c Ignore GCC 6 warnings (#883) 2016-11-12 21:04:55 +01:00
ocornut 775ac24d45 Fixed overzealous GCC warnings (#883) + partly undo 8553bab241 2016-11-12 11:14:37 +01:00