Commit Graph

454 Commits

Author SHA1 Message Date
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 2015-07-05 22:09:15 -06:00
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 2015-07-05 22:03:46 -06:00
ocornut 2633325b9f Comments 2015-07-05 21:55:24 -06:00
ocornut 56553f33b8 AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes (#133) 2015-07-05 19:09:53 -06:00
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
2015-07-04 12:44:25 -06:00
ocornut d76bc3434e Added DragFloatRange2() DragIntRange2() helpers (#76) 2015-07-04 12:17:11 -06:00
ocornut e9b81dd5ab Comments 2015-07-03 15:32:10 -06:00
ocornut fd3c6067bf Add conditional #ifdef prior to imconfig.h to facilitate inclusion in build systems (#255) 2015-07-03 15:31:54 -06:00
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-02 21:47:48 -06:00
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user. 2015-07-02 21:43:07 -06:00
ocornut 6826ab3ffd Added GetKeyIndex() helper. 2015-07-02 21:32:29 -06:00
ocornut 42efc29def SetScrollFromCursorPos() -> SetScrollHere() (#150) final call ! 2015-07-02 21:03:15 -06:00
ocornut 4eba6cd470 Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). (#150) 2015-07-02 20:53:45 -06:00
ocornut b37a326163 Renamed GetScrollPosY() to GetScrollY(). (#150)
Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount.
2015-07-02 20:47:04 -06:00
ocornut 531d0ce7ce Moving tooltips and popup chunks of imgui.h below widgets (#219) 2015-07-02 14:55:30 -06:00
ocornut 0201fe6ed1 Comments 2015-07-02 14:49:38 -06:00
ocornut 9bedcb5304 Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content (#150) 2015-07-02 14:46:49 -06:00
ocornut bbc22ac8ca Comments + remove trailing comma 2015-07-02 11:26:35 -06:00
ocornut 90ec28f6de Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-02 10:23:21 -06:00
ocornut e0da1e0658 Split into CaptureKeyboardFromApp() / CaptureMouseFromApp() 2015-07-02 09:20:15 -06:00
ocornut 77fad80e9f Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing 2015-07-02 09:10:31 -06:00
ocornut eaaab0120a Moved Inputs utilities to their own section in imgui.h + additional comments 2015-07-02 08:57:17 -06:00
ocornut b74d8e4c87 SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate #150) 2015-07-01 17:51:44 -06:00
ocornut 067b7d909a Style: Added GrabRounding (works well with AA branch). Followup to #212 2015-06-30 15:02:59 -06:00
ocornut d3c0bfefb3 AA branch: render axis aligned rect bypassing the AA path 2015-06-30 14:51:25 -06:00
ocornut 47826830af Adding TitleBgActive color - still issues with popups/menus (#253) 2015-06-30 13:40:13 -06:00
ocornut 1318e1b74c AA branch: remove unused functions. 2015-06-30 13:30:25 -06:00
ocornut 4bb94a9e4d AA branch: more optimisations. 2015-06-30 13:27:35 -06:00
ocornut c3040dee35 AA branch: more inline. 2015-06-30 12:55:14 -06:00
ocornut 077285ae57 AA branch: tidying up, inline PathStroke PathFill 2015-06-30 12:51:52 -06:00
ocornut aaefe458df AA branch: cleanup 2015-06-30 12:44:03 -06:00
ocornut ebfe4637d4 Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
2015-06-30 12:43:26 -06:00
ocornut d57ee2458c AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion 2015-06-29 19:25:41 -06:00
ocornut 43dcd6ef47 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
2015-06-29 15:43:58 -06:00
ocornut 0bf90770b0 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
2015-06-29 15:40:38 -06:00
ocornut 4ac21aaa12 Version number 1.42 wip + todo list entries 2015-06-26 20:48:53 -06:00
ocornut ea2c824192 Version 1.41 2015-06-25 21:38:24 -06:00
ocornut 5436266963 Added SetNextWindowPosCenter() (#249) 2015-06-23 15:34:44 -06:00
ocornut 2a041cfbe1 Added GetGlyphRangesCyrillic() helper (#237) 2015-06-23 14:13:22 -06:00
ocornut fe17f6e735 Added modal window darkening of previous windows (#249) 2015-06-23 12:34:15 -06:00
ocornut 8c790a3234 BeginPopupModal() can have an optional close-window button (#249) 2015-06-23 11:08:19 -06:00
ocornut bce495c581 Added BeginPopupModal() with actual modal behaviour (WIP api) (#249) 2015-06-23 10:02:56 -06:00
ocornut f10bbbb851 Minor comment fix (#248) 2015-06-22 07:57:45 -06:00
ocornut 0b98d3eb26 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
2015-06-21 20:01:25 -06:00
ocornut 01cb0dc7f7 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
2015-06-21 19:58:30 -06:00
ocornut 0884cb51cd Added IsKeyReleased() (#248), added keyboard & mouse state panel in the demo window 2015-06-21 19:04:43 -06:00
ocornut 68534c2319 Added IsMouseReleased() helper (#248) 2015-06-21 18:15:31 -06:00
ocornut d0ea5942a9 InputTextMultiline() can clip + BeginChildFrame() returns bool. (#200) 2015-06-18 08:49:57 -06:00
ocornut 0795a60c6b InputText() fixed multi-line selection clipping. (#200) 2015-06-16 20:35:46 -06:00
ocornut 748837acfd Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit
Conflicts:
	imgui.h
2015-06-16 17:23:28 -06:00