ocornut
e32b72c12c
Begin: WIP consistent Begin/End behavior, ListBoxHeader() fix.
2020-12-09 21:19:10 +01:00
ocornut
f0c7981b01
WIP NoDiscard
2020-12-09 21:19:10 +01:00
ocornut
0920ad9f04
Begin: WIP consistent Begin/End behavior, BeginTooltip API (one issue with BeginDragDropSource)
2020-12-09 21:19:10 +01:00
ocornut
698743c849
Begin: WIP consistent Begin/End behavior, docking bits
2020-12-09 21:19:10 +01:00
ocornut
1848480798
Begin: WIP consistent Begin/End behavior, more fixes.
2020-12-09 21:19:10 +01:00
omar
f4edca3e65
Begin: WIP consistent Begin/End behavior.
2020-12-09 21:19:10 +01:00
omar
8035405481
Begin: Move code from BeginChild() to EndChild() to allow End() calling EndChild() in new-begin experiments.
2020-12-09 21:08:44 +01:00
ocornut
dd4ca70b0d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
2020-12-04 19:22:15 +01:00
ocornut
9874077fc0
Merge branch 'tables'
2020-12-04 19:17:13 +01:00
ocornut
0b14dd9e55
Tables: fixed propagation of line height from outside the table. Added outer-width demo.
2020-12-04 19:15:27 +01:00
ocornut
6e38026627
Tables: changelog. removed TableGetHoveredColumn() from public API in favor of using TableGetColumnFlags(). renamed ImGuiTableSortSpecsColumn to ImGuiTableColumnSortSpecs.
2020-12-04 19:15:27 +01:00
ocornut
7a61f3407b
Tables: support internal TableResetSettings(), clarify lifetime, fixed missing auto-fit on column unhidden after first run, fixed resize assert when changing column sizing policy to stretch mid-frame (before of -1.0f weight)
2020-12-04 19:15:27 +01:00
ocornut
b194df413c
Tables: exposed status flags via TableGetColumnFlags(), removed TableGetColumnIsSorted()
...
Scoped width auto calc.
2020-12-04 19:15:27 +01:00
ocornut
984c4cb5f8
Tables: distinguishing per-column IsVisible from IsRequestOutput which is returned to user. Clarified clipping rules/requirements. Comments.
2020-12-04 19:15:27 +01:00
ocornut
f70bf69e3b
Tables: comments and tweaks on TableUpdateLayout(). changed "apply final width" loop to use natural column order.
2020-12-04 19:15:26 +01:00
ocornut
155b8bb816
Tables: Shared menu item id for "Size all" variations. Avoid allocation on single sort specs. Fix TableGetColumnIsEnabled(). Massage TableHeaderRows().
2020-12-04 19:15:26 +01:00
ocornut
e126a64782
Tables: using a typedef in internal code to specify column/draw channel index storage.
2020-12-04 19:15:26 +01:00
ocornut
6aa8388e9f
Tables: index tweaks, fixed some inconsistent spacings.
2020-12-04 19:15:26 +01:00
ocornut
5877b9d722
Tables: moved TablePushBackgroundChannel(), TablePopBackgroundChannel(), TableDrawBorders() to their own section.
2020-12-04 19:15:26 +01:00
ocornut
5180025de5
Tables: moved + renamed TableSetupDrawChannels(), TableMergeDrawChannels() to their own section.
2020-12-04 19:15:26 +01:00
ocornut
b7c83e4bac
Tables: moved TableGetSortSpecs(), TableGetColumnIsSorted(), TableFixColumnSortDirection(), TableSetColumnSortDirection() to their own section.
2020-12-04 19:15:26 +01:00
ocornut
d6b1f0d13d
Tables: moved TableHeadersRow(), TableHeader() to their own section.
2020-12-04 19:15:26 +01:00
ocornut
592fc69054
Tables: moved TableDrawContextMenu(), TableOpenContextMenu() to their own section.
2020-12-04 19:15:26 +01:00
ocornut
7aed4b152b
Tables: improve index, file structure tweaks.
2020-12-04 19:15:26 +01:00
ocornut
082f1d10d0
Tables: renamed TableBeginUpdateColumns to TableBeginApplyRequests, moved code to TableUpdateLayout, in order to ensure that enable state is not inconsistent due to TableSetupColumn column hiding requests.
...
All the fields moved from TableBeginUpdateColumns to TableUpdateLayout are not used before.
2020-12-04 19:15:26 +01:00
ocornut
79c9eaa78e
Tables: Internals: renamed Visible to Enabled to avoid confusion with visibility checks.
2020-12-04 19:15:26 +01:00
ocornut
5ef7b831c2
Tables: removed ImGuiTableSortSpecs::ColumnsMask because it needlessly exposes our 64-columns limitation which we'd eventually would like to lift
...
+ shuffle declarations in internals
2020-12-04 19:15:26 +01:00
ocornut
e09454aec4
Tables: removed TableGetColumnIsVisible from public api, re-specced as TableGetColumnIsHidden() returning same flag as setter, clipper increase CurrentRow.
2020-12-04 19:15:26 +01:00
ocornut
a70c6aae9f
Tables: demo synced tables + fix resizing indented synced tables.
2020-12-04 19:15:26 +01:00
ocornut
0c9ab0acdd
Tables: setup and maintain ItemWidth per column.
2020-12-04 19:15:26 +01:00
ocornut
8f126d5d95
Tables: rename ImGuiTableFlags_SizingPolicyStretchX to ImGuiTableFlags_ColumnsWidthStretch, ImGuiTableFlags_SizingPolicyFixedX to ImGuiTableFlags_ColumnsWidthFixed.
2020-12-04 19:15:26 +01:00
ocornut
41f89e0f59
Tables: added ImGuiTableFlags_SameWidths, used in demo. Reordered columns flags and exposed them all in Columns Flags section.
2020-12-04 19:15:26 +01:00
ocornut
3a2f0bfc04
Tables: demo inner_size + scrollx + stretch, added TableGetRowIndex(), renamed _WidthAlwaysAutoResize to _WidthAutoResize.
2020-12-04 19:15:25 +01:00
ocornut
3b3503e60f
Tables: decent support for auto-resize of stretch columns (trickier than it sounds)
...
Four cases:
1. visible columns are all stretch, resize all : "size all to default" reset to default weight
2. visible columns are all stretch, resize one: "size one to fit" set weight, reapply weight (todo: improve weight redistribution in case of >1 siblings)
3. visible columns are mixed, resize all: "size all to fit/default" reset stretchs to default weight, set fixed to auto width
4. visible columns are mixed, resize one: "size one to fit", redistribute weight the same way as a manual resize
+ TableSetupColumn() more consistently clear AutoFitQueue.
+ zero-clear RowCellData buffer.
2020-12-04 19:15:25 +01:00
ocornut
c5dcf2fde1
Tables: rework keep-visible/max-width code to be less incorrect, but right-most column may effectively has few pixels less of visible cliprect width.
...
See table_width_distrib and table_width_keep_visible tests.
+ fix minor left-side clipping on post-frozen column
+ made TableHeader() use reliable column->MaxX
2020-12-04 19:15:25 +01:00
ocornut
197e9c085b
Tables: separate bg0 and bg1 draw channels, selectable above bg color + will facilitate drawing of borders in EndTable().
...
+ unused code to strip out dummy draw channel calls.
2020-12-04 19:15:25 +01:00
ocornut
52f24df668
Tables: comments, tweaks, added internal TableSetColumnVisible(), merged the two TableSetColumnWidth().
2020-12-04 19:15:25 +01:00
ocornut
bf197c74f6
Tables: storing WorkMaxX, made offset_x == MinX to be clearer, clip rect merge uses ClipRect.max.x directly, removed unused ShrinkWidth code, metrics.
2020-12-04 19:15:25 +01:00
ocornut
5465d30d67
Tables: added ImGuiTableFlags_PreciseStretchWidths.
2020-12-04 19:15:25 +01:00
ocornut
10db896813
Tables: store RawData in a simple void* pointer, rename ContentMinX > WorkMinX, misc tidying up.
...
Removed unnecessary casts when using CheckboxFlags().
2020-12-04 19:15:25 +01:00
ocornut
82cf41d804
Tables: tooltip on clipped TableHeader() (amended)
2020-12-04 19:15:25 +01:00
ocornut
507db499e4
Tables: work on background draw channel handling (amend "create a separate background draw channel") + Selectable disable spacing when spanning.
2020-12-04 19:15:25 +01:00
ocornut
fe6131168a
Tables: Additionally commentary about clipper in the demo + minor padding tweak.
2020-12-04 19:15:25 +01:00
ocornut
94d99f9d0b
Tables: Fixed crash when increaasing columns count with bound settings.
2020-12-04 19:15:25 +01:00
ocornut
24a7c45b02
Tables: Fix for 64 columns (maximum of 131 temporary draw channels).
2020-12-04 19:15:25 +01:00
ocornut
e5a5256971
Tables: Garbage collection to relieve draw splitter buffers + for test engine: compact settings, remove table.
2020-12-04 19:15:25 +01:00
ocornut
f80097ca96
Tables: Fix applying WorkRect in non-scrolling tables. Fix inverted BackgroundClipRect being passed to ImDrawCmd.
2020-12-04 19:15:25 +01:00
ocornut
557253e776
Tables: create a separate background draw channel for rows below the frozen line.
2020-12-04 19:15:24 +01:00
ocornut
fae362fd0b
Tables: fixed auto-fitting columns not marking settings as dirty + fixed CellBg fill not narrow clipping on ScrollX + freeze.
2020-12-04 19:15:24 +01:00
ocornut
9918b2f147
Tables: Shuffled ordering of draw channels merge group so vertically unfrozen ones come, allowing us to split background channels in two.
2020-12-04 19:15:24 +01:00
ocornut
d3222086f0
Tables: Moved TableSetupScrollFreeze(), TableUpdateDrawChannels() lower in more adequate spots.
...
+ rename IsFreezeRowsPassed to IsUnfrozen.
2020-12-04 19:15:24 +01:00
ocornut
d9ca3939e1
Tables: Tidy up comments. Replaced some Columns by Tables in demo. Removed ImGuiTableFlags_Scroll (combining ScrollX/ScrollY) because each axis inccur different requirements/constraints.
2020-12-04 19:15:24 +01:00
ocornut
51abdd53e3
Tables: renamed somehow-duplicate ContentWidth members (implicitly == Max - Min), renamed StartX to ContentMinX for consistency.
2020-12-04 19:15:24 +01:00
ocornut
1731ae5a09
Tables: Reworked padding/spacing/width.
...
All widths are stored without padding.
Decorelate padding from presence of border.
Added ImGuiTableFlags_Pad/NoPad flags.
Added demo.
Merge StartXHeaders and StartXRows into StartX.
Distinguish CellSpacingX1 and CellSpacingX2 for clarity and to avoid loss of width on non-even spacing values.
2020-12-04 19:15:24 +01:00
ocornut
75c5f534e8
Tables: Avoid allocating into ColumnsName for empty strings, changed TableGetColumnName() to return "" on missing name, generally more friendly.
2020-12-04 19:15:24 +01:00
ocornut
f4800db178
Tables: Extracted parts of BeginTable() into TableFixFlags() and TableBeginInitMemory().
2020-12-04 19:15:24 +01:00
ocornut
ac5b1648e6
Tables: Various internal renaming + merge StartXHeaders/StartXRows into StartX.
2020-12-04 19:15:24 +01:00
ocornut
77e561aaf3
Tables: Made demo options consistently compact, replaced constants with font-based sizes, added comments on memory allocations.
2020-12-04 19:15:24 +01:00
ocornut
02b27b75a4
Tables: Added ImGuiTableFlags_NoBordersInBody, ImGuiTableFlags_NoBordersInBodyUntilResize, removed ImGuiTableFlags_BordersFullHeightV.
2020-12-04 19:15:24 +01:00
ocornut
172704c079
Tables: Add demo code. Remove dead code + seemingly duplicate border in TableDrawBorders().
2020-12-04 19:15:24 +01:00
ocornut
2ee20fdb7c
Tables: Frozen rows/columns in nav menu layer, fixed conflict between column id and holding child id.
2020-12-04 19:15:24 +01:00
ocornut
e66b28693a
Tables: Added ImGuiTableFlags_ContextMenuInBody flag.
...
Worked to get TableOpenContextMenu() in public API but kept it internal.
2020-12-04 19:15:24 +01:00
ocornut
6182973bde
Tables: (Breaking) Rename TableNextCell() to TableNextColumn(), made TableNextRow() NOT enter into first column.
2020-12-04 19:15:24 +01:00
ocornut
b1ebf964f5
Tables: Moved TableSetColumnIndex() next to TableNextCell() since they are so similar + made NextCell() crash proof.
2020-12-04 19:15:24 +01:00
ocornut
248960d64c
Tables: Fix ImGuiTableColumnFlags_WidthAlwaysAutoResize columns when clipped (which would be default behavior without _Resizable and when clipping/scrolling)
2020-12-04 19:15:23 +01:00
omar
25b5cc2f95
Tables: Fixes to support any number of frozen rows (over modifications to clipper code in master) + make clipper run eval after clipect update
2020-12-04 19:15:23 +01:00
ocornut
cc12ea084b
Tables: Added TableSetColumnSortDirection() + added in default context menu code (disabled, feels unnecessary, but work is done to ensure programmatic access)
2020-12-04 19:15:23 +01:00
ocornut
9b37087fbe
Tables: (Breaking) Rename TableAutoHeaders() to TableHeadersRow() + added TableGetColumnCount().
2020-12-04 19:15:23 +01:00
ocornut
3021608392
Tables: (Breaking) Add TableSetupScrollFreeze() api, remove ImGuiTableFlags_ScrollFreezeXXX flags, tweak comments, move columns block.
...
Avoid awkwardly named ScrollFreeze flags, raise limit over 3, and will allow for future api maybe freezing bottom/right side.
2020-12-04 19:15:23 +01:00
ocornut
36b2f3b4f1
Tables: renamed ImGuiTableFlags_NoClipX to ImGuiTableFlags_NoClip, clarified purpose, moved lower in the list as it doesn't need to be so prominent.
2020-12-04 19:15:23 +01:00
omar
8ec05fc034
Tables: Fixed holding on table pointers accross resize/invalidation of the pool buffer.
2020-12-04 19:15:23 +01:00
omar
931829f701
Tables: (Breaking change) Sorting: Made it users responsability to clear SpecsDirty back to false, so TableGetSortSpecs() doesn't have side-effect any more. + comments
2020-12-04 19:15:23 +01:00
ocornut
f6800e9d3b
Tables: Extend outer-most clip limits to match those of host when merging draw calls.
...
Generally clarify/simplify ClipRect extending/merging code in TableReorderDrawChannelsForMerge().
Amend/fix Sep 23
2020-12-04 19:15:23 +01:00
ocornut
3d573103b6
Tables: Fixed lower clipping when using ImGuiTableFlags_NoHostExtendY.
2020-12-04 19:15:23 +01:00
omar
8e97cdf8e8
Tables: Fix for calling TableSetBgColor(ImGuiTableBgTarget_CellBg) multiple times on the same cell.
2020-12-04 19:15:23 +01:00
ocornut
45a80716b1
Tables: Fixed three bugs + metrics tweaks.
...
- Fixed bug when ending a table within another (outer table column offset was overwritten instead of restored).
- Fixed assert when settings data has mismatching column count.
- Fixed restoring g.CurrentTable when calling EndChild() from inside table inner window.
- Made inactive tables grey in metrics.
- Fix warning.
(amended twice)
2020-12-04 19:15:23 +01:00
ocornut
9372601322
Tables: Fixed stacked popups incorrectly accessing g.CurrentTable of parent-in-stack windows.
2020-12-04 19:15:23 +01:00
omar
eb18636e02
Tables: Fix settings not being saved in child window (issue 3367) + fix for change in master.
2020-12-04 19:15:23 +01:00
omar
9d8b40414a
Tables: Added TableSetBgColor() api with color for RowBg and CellBg colors.
2020-12-04 19:15:23 +01:00
omar
b6405a291d
Tables: Fixed TableHeader() not declaring its height properly. Do NOT declare width.
2020-12-04 19:15:23 +01:00
omar
0847373b98
Tables: Comments on Sizing Policies + Rename border V/H flags HInner -> InnerH + offset every flags by two.
2020-12-04 19:15:23 +01:00
omar
30e21eb280
Tables: non-resizable columns also submit their requested width for auto-fit,
2020-12-04 19:15:22 +01:00
omar
a0e6aa1766
Tables: Fix calculation of auto-fit (remove padding). Demo setting a width in columns setup + ImGuiTableFlags_NoKeepColumnsVisible.
2020-12-04 19:15:22 +01:00
omar
c96c84b6dc
Tables: Store submitted column width and avoid saving default default widths.
2020-12-04 19:15:22 +01:00
omar
57916b891b
Tables: Simplified TableHeader() and not relying on Selectable(), fixed various padding issues. Added work-around for CellRect.Min.x offset by CellSpacing.x.
2020-12-04 19:15:22 +01:00
omar
fcdfde2bc6
Tables: Extracted border size into a named variable.
2020-12-04 19:15:22 +01:00
omar
03c8bfaf23
Tables: Removed extra +1.0f pixels initially allocated to make right-most column visible, fix visible padding asymmetry. Tweaked debug code in demo.
...
Seems visible enough without. Whole thing is/was fishy, may return to it but right cleaning up seems viable.
2020-12-04 19:15:22 +01:00
omar
353bb68e90
Tables: Demo custom per-popup popups, demonstrate TableGetHoveredColumn() and ImGuiPopupFlags_NoOpenOverExistingPopup.
2020-12-04 19:15:22 +01:00
omar
745d8cdb49
Tables: Made TableHeader() responsible for opening per-column context menu to move responsibility away from TableAutoHeaders().
2020-12-04 19:15:22 +01:00
ocornut
27e779b3ef
Tables: Removed dubious window->SkipItem assignment in TableAutoHeaders().
2020-12-04 19:15:22 +01:00
ocornut
7ca70dcb81
Tables: Using same seed ID regardless of when using a child window or not.
2020-12-04 19:15:22 +01:00
ocornut
798aed729a
Tables: Added TableGetHoveredColumn(), extracted some context menu code out, simplifying TableAutoHeaders() toward aim of it being a user-land function.
2020-12-04 19:15:22 +01:00
ocornut
4c4882ffe4
Tables: Fixed channel merge when resizing columns with headers. Disable unnecessary and broken merge when using _NoClipX.
2020-12-04 19:15:22 +01:00
omar
8530b6af3d
Tables: Not flagging whole column as SkipItems based on clipping visibility (breaks layout)
2020-12-04 19:15:22 +01:00
omar
363eae94e6
Tables: Further fix #3293 , #3163 + fixed for row unfreezing border not always showing due to unset clip rect.
2020-12-04 19:15:22 +01:00
omar
b741639468
Tables: Fix rendering of row bg and line separators ( #3293 , broken by fixes #3163 , code was accidently relying on SetCurrentChannel not updating rectangle)
...
+ Used shortcut in PushTableBackground/PopTableBackground
2020-12-04 19:15:22 +01:00
ocornut
58411f27cb
Tables: Avoid TableGetSortSpecs() having a side-effect on sort specs sanitization.
2020-12-04 19:15:22 +01:00
ocornut
dc915c86ca
Tables: Fixed a manual resize path not marking settings as dirty, TableSortSpecsSanitize() doesn't need to test table->IsInitializing
2020-12-04 19:15:22 +01:00
Rokas Kupstys
8690d1f9ce
Tables: Fix sort specs sometimes incorrectly reporting sort spec count when table loses _MultiSortable flag during runtime.
2020-12-04 19:15:22 +01:00
ocornut
af992d1321
Tables: Tweak settings functions to more prominently clarify the two levels of function.
2020-12-04 19:15:22 +01:00
omar
7513842284
Tables: Fix assert/crash when a visible column is clipped in a multi clip group situation.
2020-12-04 19:15:22 +01:00
omar
e41fc7b5b0
Tables: Fix TableDrawMergeChannels() mistakenly merging unfrozen columns cliprect with host cliprect. Comments, debug.
2020-12-04 19:15:21 +01:00
omar
fec9d7d226
Tables: Rescale fixed widths when font size change to support varying dpi scale at runtime and on .ini reload.
2020-12-04 19:15:21 +01:00
omar
6bc0bbccf3
Tables: Restore width/weight saving/loading code. Non-weighted width currently not font/DPI change friendly.
2020-12-04 19:15:21 +01:00
omar
af52a0cea2
Tables: Resizing weighted column preserve sum of weights. Fix ResizedColumn init leading to undesirable TableSetColumnWidth() on first run. Rework TableSettingsHandler_ReadLine() structure to allow other types of line.
2020-12-04 19:15:21 +01:00
omar
bc170e7325
Tables: Renamed ResizeWeight->WidthStretchWeight, WidthRequested->WidthFixedRequest, clarififications, comments.
2020-12-04 19:15:21 +01:00
omar
23c60b2814
Tables: Renamed internal fields: Active->Visible, Visible->VisibleUnclipped to be less misleading.
2020-12-04 19:15:21 +01:00
omar
dff26191bd
Tables: Try to report contents width to outer window, generally better auto-fit.
2020-12-04 19:15:21 +01:00
omar
466b6e619a
Tables: Fixed incorrect application of CursorMaxPos.x (3162)
2020-12-04 19:15:21 +01:00
omar
95c273618e
Tables: Allow hot-reload of settings (merge policy), tidying up settings code
2020-12-04 19:15:21 +01:00
omar
9b6d0fdb7a
Tables: Fixed ignoring DefaultHide or DefaultSort data from flags when loading settings that don't have them.
2020-12-04 19:15:21 +01:00
omar
9f43aae226
Tables: Calculating ideal total width, some renaming, comments. Clarify that inner_width is unused with ScrollX=0. Clip many comments to 120 columns.
2020-12-04 19:15:21 +01:00
omar
b7ff85d9ad
Tables: Browse settings list in Metrics (outside of Table entry).
2020-12-04 19:15:21 +01:00
omar
8eb1c925f0
Tables: Internals: Added FindTableByID(), removing trailing spaces.
...
# Conflicts:
# imgui_internal.h
2020-12-04 19:15:21 +01:00
omar
e60b5a3f75
Tables: Internals: Added TableGetColumnResizeID(), renamed InstanceNo > InstanceCurrent.
2020-12-04 19:15:21 +01:00
omar
104b11051f
Tables: Added ImGuiTableColumnFlags_NoReorder.
2020-12-04 19:15:21 +01:00
omar
b7fa96679e
Tables: Locking IndentX per-row so multiple columns with IndentEnabled don't get indent shearing.
2020-12-04 19:15:21 +01:00
omar
5ffc9e0846
Tables: Renaming Table's DisplayOrder[] -> DisplayOrderToIndex[], Columns's IndexDisplayOrder -> DisplayOrder
2020-12-04 19:15:21 +01:00
omar
a956629b40
Tables: Using same allocation for our Columns and DisplayOrder array. Mostly designed to facilitate adding new arrays.
2020-12-04 19:15:21 +01:00
omar
6dff061309
Internals: added ImSpanAllocator<> helper.
2020-12-04 19:15:20 +01:00
omar
182115409a
Internals: added ImSpan helper structure + 2020/10/01 stricter bound checking
2020-12-04 19:15:20 +01:00
ocornut
054c67079a
Tables: Fix scrolling with more than 32 columns (3058). Fix limit of 63 columms instead of 64. Added BitArray.
2020-12-04 19:15:20 +01:00
ocornut
d37cef40f2
Tables: Tidying up TableDrawMergeChannels() with a struct. (3058)
2020-12-04 19:15:20 +01:00
ocornut
7277ab6530
Tables: Comments, renamed merge_set_xxx to merge_group_xxx. Removed unused array and incorrect assert, replaced with earlier correct assert. (3058)
2020-12-04 19:15:20 +01:00
ocornut
0190b619cf
Tables: Fixed demo layout when clipped. Fixed warnings.
2020-12-04 19:15:20 +01:00
ocornut
f130db51ae
Tables: Added TableSetColumnWidth() api variant aimed at becoming public facing.
2020-12-04 19:15:20 +01:00
Omar
ae6fc48f60
Tables: Fix sort direction (issue 3023). Remove SortOrder from ImGuiTableSortSpecsColumn. Made sort arrow smaller. Added debug stuff in metrics.
2020-12-04 19:15:20 +01:00
omar
643cf6fc8c
Tables: Added ImGuiTableFlags_NoKeepColumnsVisible wip flag useful for layout purpose. (WIP)
2020-12-04 19:15:20 +01:00
omar
104ec408a8
Tables: Fixed content size calculation creating feedback loops. Fixed handling of _DefaultSort with _PreferSortXXXflags (@parbo). Comments.
2020-12-04 19:15:20 +01:00
omar
787a309445
Tables: Fixed headers closing popups.
2020-12-04 19:15:20 +01:00
omar
f5eee210a0
Tables: TableHeader() uses provided row min header rather than incremental one to allow multi-item multi-line in header cells. Demo TableHeader() - will caveat, comments.
2020-12-04 19:15:20 +01:00
omar
5431cbd3f0
Tables: Honor width/weight passed to TableSetupColumn() after .ini load since we don't actually restore that data currently.
...
Demo: Remove filter from Advanced Table demo since it's breaking with clipping.
2020-12-04 19:15:20 +01:00
omar
0e7b3f2f2f
Tables: Made only first column honor Indent by default (like Columns api) and exposed flags. Added simple Tree demo.
2020-12-04 19:15:20 +01:00
omar
2958e37310
Tables: Storing per-column SkipItems as a shortcut. Comments, Spacings.
...
# Conflicts:
# imgui_internal.h
2020-12-04 19:15:20 +01:00
omar
31de161066
Tables: Fix for hiding first column (fix fcceff5c + reading PrevLineTextBaseOffset in EndCell of inactive column).
2020-12-04 19:15:20 +01:00
omar
164caa2db7
Tables: Support for multi-line columns name. Renaming of some fields from BackupXXX to HostXXX. Comments.
2020-12-04 19:15:20 +01:00
omar
e85c226da4
Tables: Fix reordering across hidden columns. Fix for frozen columns to never be larger than scrolling visible rect width.
2020-12-04 19:15:20 +01:00
omar
416e9bb38d
Tables: Clarify internal calculations of row height so that TableGetCellRect() include expected paddings. Add demo code. Comments.
...
Remove misleading commented-out flags for now.
2020-12-04 19:15:20 +01:00
omar
325b4c69ba
Tables: Moved border colors to the Style (maybe temporarily?) instead of hardcoding them.
2020-12-04 19:15:19 +01:00
omar
17578e215a
Tables: Separating inner/outer borders flags per axis so it is possible to remove outer vertical borders to mimic old columns.
...
VInner or VOuter only don't have correct padding/spacing.
2020-12-04 19:15:19 +01:00
omar
1db8d421cf
Tables: Fix scroll when releasing resize for multi-instances. Comments. Renaming.
2020-12-04 19:15:19 +01:00
omar
47b39f6371
Tables: Demo: Moved Columns section into Tables & Columns section under a Legacy section.
2020-12-04 19:15:19 +01:00
omar
78b12068d9
Tables: Disable initial output prior to NextRow call to avoid misleading users.
...
Fixed some inconsistency with BeginTable/EndTable without row.
Move some of the TableBegin() code in TableBeginUpdateColumns().
Allow to submit multiple header lines.
2020-12-04 19:15:19 +01:00
omar
046fad01f1
Tables: Return false when window is Collapsed (consistent + helpful for doc) + Fix empty context menu.
2020-12-04 19:15:19 +01:00
omar
81453ac42c
Tables: Comments, better assert, moved some internal flags out of the way.
2020-12-04 19:15:19 +01:00
omar
0c3d7bb154
Tables: Double-clicking on fixed column to resize. Extracted code BeginTableEx().
...
# Conflicts:
# imgui_internal.h
2020-12-04 19:15:19 +01:00
omar
883c236eda
Tables: Handle columns clipped due to host rect
...
Return false in user functions, set SkipItems in window, redirect to dummy draw channel.
2020-12-04 19:15:19 +01:00
omar
eee82e0451
Tables: Columns with no policy in a scrolling table will default to WidthFixed instead of WidthAlwaysAutoResize if an explicit value is passed to TableSetupColumn()
2020-12-04 19:15:19 +01:00
omar
e06a36ab12
Tables: Support for multiple Tables using same id where most settings are synced.
...
(some minor one-frame lack of sync when e.g. toggling visibility in context menu)
2020-12-04 19:15:19 +01:00
omar
a09954bdaf
Tables: Initial demo code.
2020-12-04 19:15:19 +01:00
omar
8da7d3c3e5
Tables: Initial commit. [Squashed 123+5 commits from tables_wip/]
2020-12-04 19:15:19 +01:00
ocornut
818e1a4eb4
Tables: Moving legacy Columns code
2020-12-04 19:15:19 +01:00
omar
9c8671e7b0
Tables: Add empty file, skeleton.
2020-12-04 19:15:19 +01:00
ocornut
f9b873662b
Backends: Win32: Fixed setting of io.DisplaySize to invalid/uninitialized data when after hwnd has been closed.
...
GetClientRect() fails on closed hwnd which left the rectangle uninitialized and copied to DisplaySize. Ensure it is zero + similar failsafe in io.WantSetMousePos path.
2020-12-04 11:48:17 +01:00
ocornut
657589ab47
Backends: Vulkan+Viewports: fixed build, removed extraneous pipeline creation ( 770c9953, e8447dea, 6a0e85c5) ( #3459 , #3579 )
2020-12-04 11:29:53 +01:00
ocornut
c1ffac2fee
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2020-12-03 20:05:49 +01:00
ocornut
998d7303b1
Log/Capture: fix capture to work on clipped child windows.
...
+ Tweak ErrorCheckEndFrameRecover() to use local window pointer.
2020-12-03 15:14:32 +01:00
vaiorabbit
2afdfa602f
Rebuild ImFontAtlas::GetGlyphRangesJapanese offset table ( #3627 )
...
- GetGlyphRangesJapanese now supports
- 2136 'Joyo (meaning "for regular use" or "for common use")' Kanji
- 863 'Jinmeiyo" (meaning "for personal name")' Kanji
2020-12-02 12:02:29 +01:00
ocornut
d20f2bc90a
Rename example_emscripten/ to example_emscripten_opengl3/ ( #3632 )
2020-12-02 11:23:56 +01:00
ocornut
ae3e2406ec
Misc tweaks/fixes (see details).
...
Combo: ultra minor fix for popup positioning policy mismatch depending on ImGuiComboFlags_PopupAlignLeft flag.
Made ImHashXXX functions return ImGuiID.
IsWindowNavFocusable use !WasActive.. it worked because it was only called in NewFrame()->NavUpdate() before the transition loop + EndFrame() only.
Fix unused variable warning.
2020-11-30 12:47:14 +01:00
ocornut
9801c8c1c5
Texture-based thick lines: comment out dead code (amend b5bae978). ( #3245 )
2020-11-26 19:35:56 +01:00
ocornut
e0cae25c3c
Clarify usage of right-aligned items in Layout>Widgets Width. Tweaks FAQ, added missing syntax coloring.
2020-11-20 17:24:18 +01:00
ocornut
4da92b89ed
Viewports: fix incorrect whitening of popups above a modal if both use their own viewport + fix pvs warning.
2020-11-19 18:31:13 +01:00
ocornut
3dcbcd8bf0
Internals: added IsWindowAbove() for use for modal/viewport bugfix.
2020-11-19 18:31:10 +01:00
ocornut
d4f08d893e
InputText: Fixed swiching from single to multi-line while preserving same ID.
2020-11-19 18:30:14 +01:00
ocornut
97265602c4
Internals: added IsWindowAbove() for use for modal/viewport bugfix.
2020-11-19 16:59:21 +01:00
ocornut
cecf6b4209
Viewports: made standalone modals appear in taskbar + new window perform z-check before merging in main host viewport. ( #3511 , #1542 )
...
This should fix a good amount of "lost modal" problems, however it is still possible to loose a modal in a host viewport if secondary viewports are configured as children above the host.
2020-11-19 16:07:07 +01:00
ocornut
9712bff0bb
Internals: added experimental ErrorCheckEndFrameRecover() to unroll/end/pop. ( #1651 , #3600 )
2020-11-19 15:43:42 +01:00
ocornut
c0ac4fb788
Columns/Internals: (Breaking): Renamed data structures. ( #125 , #513 , #913 , #1204 , #1444 , #2142 , #2707 )
2020-11-18 23:42:44 +01:00
ocornut
72de6f3360
Columns/Internals: (Breaking) renamed ImGuiColumnsFlags_* to ImGuiOldColumnFlags_*. ( #125 , #513 , #913 , #1204 , #1444 , #2142 , #2707 )
...
Affected: ImGuiColumnsFlags_None, ImGuiColumnsFlags_NoBorder, ImGuiColumnsFlags_NoResize, ImGuiColumnsFlags_NoPreserveWidths, ImGuiColumnsFlags_NoForceWithinWindow, ImGuiColumnsFlags_GrowParentContentsSize. Added redirection enums. Did not add redirection type.
2020-11-18 23:02:14 +01:00
Borislav Stanimirov
fcc2b71724
CI: Fix testing for Windows DLL builds + fix broken DLL build. ( #3603 , #3601 )
2020-11-18 22:45:44 +01:00
ocornut
2e64ee050d
Removed duplicate typedef for ImGuiButtonFlags
...
https://github.com/cimgui/cimgui/issues/166
2020-11-18 19:28:30 +01:00
ocornut
b2a91dc390
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-11-13 22:04:28 +01:00
ocornut
71cc636696
Metrics: Rebranded as "Dear ImGui Metrics/Debugger". Fix Show Window Rectangle. Fix Clang OSX warnings. Amend #3592 for Mingw only.
2020-11-13 21:30:19 +01:00
ocornut
e736039538
Nav: Fixed IsItemFocused() from returning false when Nav highlight is hidden because mouse has moved. ( #787 )
2020-11-13 21:10:03 +01:00
ocornut
8119759329
Internals: extracted stack checking code into a ImGuiStackSizes helper struct + added test for FocusScope
...
+ renamed g.ColorModifiers > g.ColorStack, g.StyleModifiers > g.StyleVarStack
2020-11-13 16:33:33 +01:00
ocornut
6e94013a3d
Made ItemFlagsStack and GroupStack shared stacks.
2020-11-13 16:33:33 +01:00
ocornut
12ba6f4606
Fix PushFocusScopeID() + using shared stack. Renamed GetFocusScopeID() to GetFocusedFocusScope() - the two existing functions name are very error prone.
2020-11-13 16:26:59 +01:00
Rokas Kupstys
a3e8dc3f34
CI: Fix deployment of PVS-Studio license + fix reported error.
2020-11-13 12:51:55 +01:00
ocornut
a138855d56
Hotfix for PushFocusScope() being utterly wrong (until we split the stacks), Added asserts on PopID to help catch bugs, Added GC trigger.
2020-11-12 22:59:05 +01:00
ocornut
78f1d2d319
ImDrawListSplitter: create first draw cmd on demand + Internals: fix incorrect ImBitArraySetBitRange() (only used by tables)
...
Make it cheaper to allocate unused draw cmd, can't measure perf difference other our stress tests.
2020-11-12 18:17:17 +01:00
ocornut
13258f5957
Internals: zero-clearing ImGuiWindow / ImGuiWindowTempData for simplicity. (amend)
...
All the non-zero fields previously initialized in ImGuiWindowTempData() are in fact setup in Begin: FocusCounterRegular, FocusCounterTabStop, TextWrapPos, LayoutType, ParentLayoutType
2020-11-12 12:19:50 +01:00
ocornut
7a135a763c
Fix format warnings when using gnu printf extensions in a setup that supports them (gcc/mingw). ( #3592 )
2020-11-12 11:56:21 +01:00
ocornut
dcfb986fa8
Made EndFrame() assertion for key modifiers being unchanged during the frame more lenient. ( #3575 )
2020-11-11 18:17:33 +01:00
Rokas Kupstys
a3f79104df
Examples: Apple+Metal: Forward events to OS key combinations like CMD+Q can work. ( #3554 )
2020-11-11 15:30:08 +01:00
Brandon DeRosier
6a0e85c561
Backends: Vulkan: Add override for the subpass to reference during VkPipeline creation. ( #3579 )
...
This allows for binding the pipeline/sending draw commands
(via `ImGui_ImplVulkan_RenderDrawData`) against any subpass, rather than
being restricted to only the first subpass.
Without this, attempting to bind the pipeline against a subpass other than
the first one results in validation layer errors and, at worst, some drivers
failing if the subpass attachments differ.
2020-11-11 15:20:43 +01:00
ocornut
61825c7735
Tab Bar: Fixed minor/unlikely bug skipping over a button when scrolling left with arrows + InputText: minor optimization.
2020-11-11 12:04:35 +01:00
顾起威
2785ac0ee3
InputText: Fixed updating cursor/selection position when a callback alters the buffer in a way where the byte count is unchanged but the decoded character count changes. ( #3587 )
2020-11-11 11:36:53 +01:00
ocornut
ac08593b96
Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-11-05 21:36:22 +01:00
ocornut
5789e69a62
Checkbox: Added CheckboxFlags() helper with int* type. Demo: removed extraneous casts.
2020-11-05 21:32:05 +01:00
ocornut
5f97809cab
Misc tidying up (zero-clear structures, more unused default in ClipRetFullscreen, NavApplyItemToResult() coding style fix)
...
Zero-clearing more structures
Remove arbitrary default ClipRetFullscreen value in ImDrawListSharedData.
Nav extracted NavApplyItemToResult() function.
Coding style fixes in OSX Backends.
2020-11-05 13:24:27 +01:00
ocornut
046057cebb
Selectable: Avoid pushing span-column background if clipped.
2020-11-04 20:11:34 +01:00
ocornut
7a27b2a282
Update Readme, links to Useful Widgets, updated a gif.
2020-11-04 20:11:21 +01:00
ocornut
2bf5ca7ef2
ImDrawListClipper: avoid over reserving memory.
2020-11-04 18:05:51 +01:00
ocornut
d6a2f7e95e
Reduced padding + unused storage in ImDrawList (224->192 bytes) + zero-init ImDrawListSplitter and ImDrawList
...
+ Readme tweak
2020-11-04 13:56:04 +01:00
ocornut
2fa00656a4
Fix for IMGUI_DISABLE_METRICS_WINDOW
2020-11-03 15:46:29 +01:00
Albin Odervall
b934b9bb86
Backends: OSX, Metal: Fix -Wshadow, -Wimplicit-float-conversion, and -Wsign-conversion warnings. ( #3555 )
2020-11-03 15:38:59 +01:00
Rokas Kupstys
9cca1b2e97
Replace UTF-8 decoder with one based on branchless version by Christopher Wellons. (not branchless anymore tho)
...
Decoding performance increase ~30%
2020-11-03 14:43:08 +01:00
ocornut
3777fbbd81
Renamed io.ConfigWindowsMemoryCompactTimer to io.ConfigMemoryCompactTimer as the feature will apply to other data structures.
2020-11-03 14:43:08 +01:00
ocornut
e3ac52630a
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
2020-10-31 00:47:57 +01:00
ocornut
047d4c4500
Metrics: Extracted most functions.
...
+ avoid using full namesapce prefix
2020-10-30 23:48:58 +01:00
ocornut
044ed22379
Metrics: Fixed mishandling of ImDrawCmd::VtxOffset in wireframe mesh renderer + omitting trailing empty ImDrawCmd in count + relying on IdxOffset value.
2020-10-30 22:56:29 +01:00
M. Frink ~ Lemur
a129621292
Doc: mention IMGUI_USE_WCHAR32 in fonts documentation ( #3562 )
2020-10-29 18:21:06 +01:00
Rokas Kupstys
6f57d58e82
Backends: OSX: Fix KeyPadEnter on MacOS. ( #3554 )
2020-10-28 12:31:10 +01:00
ocornut
df35157397
Drag and Drop: Fix losing drop source ActiveID (and often source tooltip) when opening a TreeNode() or CollapsingHeader() while dragging. ( #1738 )
...
Amend 7b3d379 , 8241cd62 etc.
2020-10-26 14:40:44 +01:00
ocornut
b7530e5d04
Revert "Replace UTF-8 decoder with branchless version by Christopher Wellons." ( #3558 )
...
This reverts commit b3576dd354 .
2020-10-25 16:27:43 +01:00
Rokas Kupstys
b3576dd354
Replace UTF-8 decoder with branchless version by Christopher Wellons.
...
Decoding performance increase ranges from 30-40%.
Changes:
* Errors handling near the end of string changed. If input does not contain enough bytes, decoder returns `IM_UNICODE_CODEPOINT_INVALID`, consuming all remaining bytes while old decoder consumed only one byte.
Guarantees:
* At least one byte is consumed, if input had at least one byte available.
* Number of consumed bytes will never seek past end of string.
Requirements:
* `in_text` is a valid pointer.
* String pointed by `in_text` must be zero-terminated, or `in_text_end` is not NULL.
2020-10-23 13:10:37 +02:00
Warren Moore
bca4749346
Examples: Apple: Consolidated example_apple_metal to reduce class and file count ( #1873 , #3543 )
2020-10-23 11:33:08 +02:00
ocornut
5292320110
Amend ffe8f0177f ( #3544 ) + readme fixes
2020-10-23 11:25:26 +02:00
Louis Schnellbach
ffe8f0177f
Backends: OpenGL3: Backup/restore GL_PRIMITIVE_RESTART state ( #3544 )
2020-10-23 11:17:56 +02:00
Bill Six
acb8ef2006
Examples: Vulkan: Fixed CMake include path. ( #3550 )
...
The backends directory was not included, so the build was failing.
2020-10-21 09:13:54 +02:00
ocornut
455c21df71
Merge branch 'master' into docking + dockspace demo comments
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
# imgui_internal.h
# imgui_widgets.cpp
2020-10-19 15:08:32 +02:00
ocornut
e6b99a420b
Tab Bar: Do not display a tooltip if the name already fits over a given tab. ( #3521 )
2020-10-19 15:01:24 +02:00
ocornut
fbe74ed50c
Tab Bar: zero clear more structures.
2020-10-19 12:10:31 +02:00
ocornut
8c9b3c9013
Tab Bar: Fixed using more than 128 tabs in a tab bar.
...
Using ImS16 consistently + some better packing to avoid struct growing size.
2020-10-19 12:01:15 +02:00
ocornut
748bd1ba9c
Tab Bar: Restore cursor position in EndTabBar() when amending (amend f2f32602) + made LastTabItemIdx consistent ImS8 as other tab storage relies on same type
2020-10-19 11:49:37 +02:00
Black Cat!
c9fafd5ea4
Drag and Drop: Fix drag and drop to tie same-size drop targets by choosen the later one. Fixes dragging into a full-window-sized dockspace inside a zero-padded window. ( #3519 , #2717 )
2020-10-15 20:20:35 +02:00
ocornut
d015004f45
Rename colored>color in comments where possible ( #3528 )
2020-10-15 20:05:35 +02:00
xndcn
127f132447
Backends: OpenGL3: Add compatibility of GL_VERSION for GL 2.x ( #3530 )
...
GL_MAJOR_VERSION and GL_MINOR_VERSION are available on GL 3.0 and above.
So we have to parse GL_VERSION under GL 2.x
2020-10-15 19:48:45 +02:00
ocornut
31a144b60c
Fix comments ( #3534 )
2020-10-15 19:37:18 +02:00
ocornut
d3a80d9f1b
Internals: Docking: More fixes to make DockNodeBeginAmendTabBar() viable (probably some issues left)
2020-10-15 15:02:05 +02:00
ocornut
b26f1530b7
Internals: Docking, Tab Bar: Add DockNodeBeginAmendTabBar() and work toward making hybrid dock node with windows tab bars somehow work (not done).
2020-10-15 12:18:20 +02:00
ocornut
bae2240eda
Tab Bar: Made it possible to append to an existing tab bar by calling BeginTabBar()/EndTabBar() again.
...
# Conflicts:
# imgui_widgets.cpp
2020-10-14 18:36:03 +02:00
ocornut
f2f326024c
Tab Bar: Made it possible to append to an existing tab bar by calling BeginTabBar()/EndTabBar() again.
2020-10-14 18:34:33 +02:00
ocornut
042a3b01d2
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/README.txt
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2020-10-14 14:44:03 +02:00
ocornut
b1a18d82e3
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
2020-10-14 14:42:00 +02:00
ocornut
a2a3d80f04
Moving backends code from examples/ to backends/ (step 5: move documentation to MD files)
2020-10-14 14:41:40 +02:00
ocornut
a2d845f9dd
Moving backends code from examples/ to backends/ (step 4: update documentation, much improvement)
2020-10-14 14:41:40 +02:00
ocornut
a7e21fb05f
Moving backends code from examples/ to backends/ (step 3: fixing project files)
2020-10-14 14:41:40 +02:00
ocornut
428f4fce70
Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft)
2020-10-14 14:41:40 +02:00
ocornut
d9b2fb7338
Moving backends code from examples/ to backends/ (step 1: moving source files)
2020-10-14 14:41:40 +02:00
ocornut
124c2608f1
Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.
2020-10-12 17:54:52 +02:00
ocornut
041ef01b33
Removed redirecting functions/enums names that were marked obsolete in 1.61: InputFloat, InputFloat2, InputFloat3, InputFloat4 with int decimal_precision parameter. ( #648 , #712 )
2020-10-12 15:09:21 +02:00
ocornut
0f13fdd177
Removed redirecting functions/enums names that were marked obsolete in 1.60: io.RenderDrawListsFn, IsAnyWindowFocused(), IsAnyWindowHovered(), etc.
2020-10-12 13:17:05 +02:00
ocornut
04de5ef819
Version 1.80 WIP
2020-10-12 13:04:34 +02:00
ocornut
a38c6dfcc8
Internals: Added support for context hooks (for test engine or other extensions)
2020-10-09 17:13:03 +02:00
ocornut
682249396f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-10-08 16:05:55 +02:00
ocornut
e5cb04b132
Version 1.79
...
+ Update readme and mission statement.
Removed "Minimize screen reel-estate usage", removed details on memory consumption (still very valid, just too much noise in a mission statement)
2020-10-08 16:01:59 +02:00
Rokas Kupstys
c6f9c558ec
CI: Use our own discord notifier.
2020-10-08 14:23:55 +02:00
Christian
ae5b4991be
Docs: update gallery links. ( #3514 )
2020-10-08 13:56:05 +02:00
ocornut
03b1e643b4
Docs: Funding link, Tweaks, Gallery links.
2020-10-08 10:47:10 +02:00
ocornut
12d9505534
CheckboxFlags: Display mixed-value/tristate marker when passed flags that have multiple bits set and stored value matches neither zero neither the full set.
2020-10-07 15:13:04 +02:00
ocornut
4fd43a8b64
Internals: removed NavLayerCurrentMask (redundant, add extra shift in ItemAdd().
2020-10-05 14:52:18 +02:00
ocornut
014e5078a8
Demo: add a small easter egg when the 4x4 board of Selectable is filled + tweaked the demo.
2020-10-05 13:08:32 +02:00
ocornut
01cc666039
ImGuiListClipper: Renamed constructor parameters which created an ambiguous alternative to using the ImGuiListClipper::Begin() function, with misleading edge cases.
2020-10-05 12:28:28 +02:00
Bartosz Taudul
6469b94304
Silence memset warning. ( #3505 )
...
Compiling the code as-is results in the following warning:
-->8--
imgui_freetype.cpp:341:72: warning: ‘void* memset(void*, int, size_t)’
clearing an object of type ‘struct ImFontBuildSrcDataFT’ with no
trivial copy-assignment; use assignment or value-initialization
instead [-Wclass-memaccess]
341 | memset(src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes());
| ^
imgui_freetype.cpp:302:8: note: ‘struct ImFontBuildSrcDataFT’ declared here
302 | struct ImFontBuildSrcDataFT
| ^~~~~~~~~~~~~~~~~~~~
--8<--
This is caused by presence of ImVector<> directly in ImFontBuildSrcDataFT data
structure, as well as in the child ImBitVector. Since ImVector<> has a
constructor, the compiler infers that initialization by memset is not valid.
Such initialization is not a bug, however, as the default ImVector<> ctor just
sets the structure data members to 0, which is exactly what the memset does.
Casting the data structure address to void* pointer silences this warning.
2020-10-02 19:12:53 +02:00
ocornut
7b1ab5b275
ImVector: Stricter bound-checking asserts. Fix warnings: trailing comma (old compilers), zealous preprocessor warnings.
2020-10-01 14:48:19 +02:00
ocornut
958e58b06b
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_apple_opengl2/main.mm
# imgui.cpp
2020-10-01 13:33:08 +02:00
ocornut
5f336ce8f8
Tab Bar: Fixed buffer underflow in TabBarLayout, introduced by 4a57a982b ( #3501 , #3291 )
...
+ Link to CI actions added in 3be352f
2020-10-01 13:31:53 +02:00
Rokas Kupstys
3be352fc80
CI: Add discord notifications.
2020-09-30 14:58:18 +02:00
ocornut
179dc04d8a
Examples: Added missing comments in example_apple_metal. ( #3400 )
2020-09-30 14:55:09 +02:00
ocornut
c49330fc52
Docking: Fix handling of WindowMenuButtonPosition == ImGuiDir_None in Docking Nodes. ( #3499 )
2020-09-30 14:11:22 +02:00
ocornut
52c0b1a340
ImGuiListClipper: internal rework and tidying up to facilitate supporting frozen rows in tables + stop promoting using constructors parameters.
2020-09-28 17:25:34 +02:00
ocornut
324e0310ad
Renamed ImGuiSliderFlags_ClampOnInput to ImGuiSliderFlags_AlwaysClamp. ( #1829 , #3209 , #946 , #413 )
2020-09-25 13:34:31 +02:00
ocornut
fbabf651f4
Style: Renamed style.TabMinWidthForUnselectedCloseButton to style.TabMinWidthForCloseButton. Fixed README links.
2020-09-25 13:22:28 +02:00
ocornut
fa004ae79a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_examples.sln
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
# imgui_widgets.cpp
2020-09-22 17:00:57 +02:00
ocornut
1ec464eb9a
Tab Bar: Further simplification of section/clip rect handling. ( #3291 )
2020-09-22 16:43:40 +02:00
ocornut
6b76781c66
Tab Bar: Tidying up. Rework ShrinkWidths to allow marking tabs as not shrinkable (unused yet) + don't unnecessarily move data within ShrinkWidthBuffer. ( #3291 )
2020-09-22 16:43:39 +02:00
Louis Schnellbach
99f69eb185
Tab Bar: Moved up TabBarScrollingButtons function call. ( #3291 )
2020-09-22 16:43:39 +02:00
ocornut
205874f5b1
Tab Bar: Fix reorderable tab bars. Fix misleading use of tab_max_width in TabBarLayout(). Misc amends, shortening. ( #3291 )
2020-09-22 16:43:39 +02:00
Louis Schnellbach
3422cb1308
Tab Bar: Various fixes. Tried to reduce code complexity. ( #3291 )
2020-09-22 16:43:39 +02:00
ocornut
5e5f25e2dd
Tab Bar: Rename named sections members into array. Various tidying up. ( #3291 )
2020-09-22 16:43:39 +02:00
Louis Schnellbach
7ac16c02cc
Tab Bar: Fix multiple width and position computation issue. ( #3291 )
2020-09-22 16:43:38 +02:00
ocornut
f23c39c395
Tab Bar: Fixed handling of scrolling policy with leading/trailing tabs. + warning fixes + bunch of renaming. ( #3291 )
...
Demo tweaks.
2020-09-22 16:43:38 +02:00
Louis Schnellbach
4a57a982be
Tab Bar: Added TabItemButton(), ImGuiTabItemFlags_Leading, ImGuiTabItemFlags_Trailing + demo. ( #3291 )
...
(squashed various commits by 2 authors)
2020-09-22 16:43:38 +02:00
ocornut
29836412e1
Internals, CollapsingHeader, TabItem: Standardized using a #CLOSE id prefix for TabItem and ColllapsingHeader (same as window)
2020-09-22 15:49:47 +02:00
ocornut
27d0c3afa9
Tab Bar: Fixed a small bug where scrolling buttons (with ImGuiTabBarFlags_FittingPolicyScroll) would generate an unnecessary extra draw call.
2020-09-21 20:00:25 +02:00
ocornut
afc1099fb5
Tab Bar: Fixed a small bug where closing a tab that is not selected would leave a tab hole for a frame.
2020-09-21 18:52:20 +02:00
ocornut
795cf6fcb5
Removed return value from OpenPopupOnItemClick(). Use IsWindowAppearing() after BeginPopup() for a similar result.
2020-09-21 15:05:04 +02:00
ocornut
a58a727781
Renamed OpenPopupContextItem() back to OpenPopupOnItemClick(), reverting 99ab5210
2020-09-21 14:45:35 +02:00
Louis Schnellbach
ec945f44b5
InputText: Added support for Page Up/Down in InputTextMultiline. ( #3430 )
...
+ fix stb_textedit.h to build with C language (amend fbf70070 )
2020-09-18 14:15:17 +02:00
omar
8eca736a7a
Update binary link
...
(contents of 20200412.zip's dx11.exe is flagged by Windows Defender, can't currently repro)
2020-09-18 10:05:12 +02:00
ocornut
c206a19373
Removed ImFont::DisplayOffset in favor of ImFontConfig::GlyphOffset. ( #1619 )
...
+ Fonts: AddFontDefault() adjust its vertical offset based on floor(size/13) instead of always +1.
2020-09-17 16:45:21 +02:00
Louis Schnellbach
fbf70070bb
InputText: Fixed minor inconsistency when pressing Down on the last line when it doesn't have a carriage return (it used to move to the end of the line)
...
+ fixed two of our typos in stb_textedit.h
2020-09-17 12:21:31 +02:00
ocornut
c47bcb25ed
Fix popup and tooltip positioning when not fitting in the screen. Amend fa42ccea8.
...
# Conflicts:
# docs/CHANGELOG.txt
2020-09-17 11:02:04 +02:00
Rokas Kupstys
b7b08f52a4
Fix popup and tooltip positioning when not fitting in the screen.
2020-09-17 11:01:15 +02:00
ocornut
825f699bde
Backends: OpenGL3: Amends ( #3467 , #1985 )
2020-09-17 09:55:58 +02:00
Sven Balzer
42575d4a99
Viewports, Backends: Win32: Fix toggling of ImGuiViewportFlags_TopMost ( #3477 )
2020-09-17 09:47:04 +02:00
Julian Webb
2460f2abe3
Backends: OpenGL3: Fix to avoid calling glBindSampler() with version <= 3.2 ( #3467 , #1985 )
...
(nb: GLEW sets the define we previously used)
2020-09-17 09:34:11 +02:00
ocornut
645a6e0342
Bypass unnecessary formatting when using the TextColored()/TextWrapped()/TextDisabled() helpers with a "%s" format string. ( #3466 )
2020-09-16 18:36:42 +02:00
Bartosz Szreder
d2939ce0a1
Columns: Make sure the ClipRect is valid. ( #3475 )
2020-09-16 16:52:57 +02:00
ocornut
6bc526676c
Viewports: Comments, removed unnecessary use of ViewportFrontMostStampCount (the LastFrontMostStampCount is enough)
2020-09-16 12:29:46 +02:00
omar
e230ec5a01
Viewports, Backends: DX12: Make secondary viewport format match main viewport one ( #3462 ) {@BeastLe9enD]
2020-09-16 11:05:02 +02:00
Pierre-Loup Pagniez
a1597cff08
Backends: DX12: Fix D3D12 Debug Layer warning if scissor rect is 0 width or 0 height. ( #3472 , #3462 )
...
In the event where the scissor rect is 0 width or 0 height, don't call Draw, as it generates warnings if the D3D12 Debug Layer is enabled, and nothing would have been drawn anyway.
2020-09-16 10:43:17 +02:00
omar
a8f409a848
Examples: DX12: Enable breaking on any warning/error when debug interface is enabled. ( #3462 , #3472 ) + misc comments & minor fixes.
2020-09-16 10:40:06 +02:00
omar
770c995365
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2. ( #3459 ) + Add ImGui_ImplVulkanH_CreateWindowSwapChain in ImGui_ImplVulkanH_CreateOrResizeWindow().
2020-09-08 22:44:24 +02:00
omar
e8447dea45
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2. ( #3459 )
2020-09-08 22:39:53 +02:00
omar
d8d58b038e
Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. ( #301 )
2020-09-08 20:03:34 +02:00
omar
78f753ffff
Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code ( #3455 , #3459 )
2020-09-08 17:02:58 +02:00
Michel Lesoinne
41e2aa2e7a
Backends: Vulkan: Separate the pipeline of the dear imgui created windows from the one created with the user's render-pass. ( #3455 , #3459 )
...
This is mostly for the benefit of multi-viewports.
2020-09-08 16:54:48 +02:00
xndcn
6a546a500f
ImVector: fix max_size() for signed int value. Amend 444873404 ( #3429 , #3460 )
2020-09-08 13:37:23 +02:00
HALX99
8a9ee9cded
Add const qualifier for parameter ImFontConfig of ImFont::AddGlyph ( #3461 )
2020-09-08 12:18:28 +02:00
omar
206d78a524
InputText: Fixed minor glitch when erasing trailing lines in InputTextMultiline(). Fixed cursor being partially covered after using Ctrl+End key.
...
Removed unncessary one-empty-line-worth-of-scrolling.
2020-09-08 11:42:13 +02:00
omar
36af398056
Sliders: Fixed using ImGuiSliderFlags_ClampOnInput with reverse sliders. ( #3432 , #3449 )
2020-09-07 19:52:11 +02:00
Rokas Kupstys
b2039aac67
Slider: Fixed to reach maximum value with inverted integer min/max ranges, both with signed and unsigned types. Added reverse Sliders to Demo. ( #3432 , #3449 )
2020-09-07 17:57:23 +02:00
omar
6461fd40ab
Examples: Fixed SDL+OpenGL2 and SDL+Vulkan examples not processing SDL_WINDOWEVENT_CLOSE events which tends to be needed in multi-viewport setting.
2020-09-07 12:23:26 +02:00
Michel Lesoinne
b25756be4a
Examples: Vulkan: Switch validation layer. Fix CMakeLists to find Vulkan the standard way. ( #3459 )
2020-09-07 11:43:57 +02:00
Doug Binks
aa8e09d7f1
Backends: GLFW: workaround for cases where glfwGetMonitorWorkarea fails ( #3457 )
2020-09-07 10:49:34 +02:00
ocornut
751d153ca9
InputText: Fixed callback's helper DeleteChars() function when cursor is inside the deleted block. ( #3454 ).
2020-09-03 19:09:57 +02:00
ocornut
70289ab42c
Scrolling: Fixed edge snapping being applied prior to knowing ContentSize. ( #3452 )
...
Fix 473a01adb .
2020-09-03 17:38:51 +02:00
ocornut
8db94cd992
Internals: Scroll related, comments & shallow tweaks.
2020-09-03 17:07:03 +02:00
ocornut
36c331ff74
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
# imgui_internal.h
2020-09-02 12:47:07 +02:00
ocornut
b73305be11
Examples: Vulkan: Reworked buffer resize handling, amend df89a16d ( #3390 , #2626 )
2020-09-02 12:43:23 +02:00
ocornut
8dacb4da20
Docking: Fixed DockNode tab bar initial order broken by 8c80d533d
2020-09-02 12:11:45 +02:00
Valentin Vanelslande
9a9ee7f813
NavInitWindow: Change IMGUI_DEBUG_LOG to IMGUI_DEBUG_LOG_NAV ( #3450 )
2020-09-01 23:19:33 +02:00
ocornut
f4d062fa11
Nav: Added debug logging, extract bits of code into NavUpdateInitResult().
2020-09-01 18:45:39 +02:00
ocornut
fc625d249f
Internals: Begin: update ->Hidden flags only on first begin of the frame. (ignore whitespace to see simple diff)
...
# Conflicts:
# imgui.cpp
2020-09-01 15:28:06 +02:00
ocornut
a456d17dfc
Internals: Begin: update ->Hidden flags only on first begin of the frame. (ignore whitespace to see simple diff)
2020-09-01 15:24:24 +02:00
ocornut
34077c0140
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2020-09-01 12:07:35 +02:00
ocornut
ce230fc370
Internals: TabBar renaming and shuffling stuff around.
...
+ sneaking a readme change
2020-08-31 17:49:18 +02:00
ocornut
600b8f60b4
Docking: Fixed crash in metrics.
2020-08-28 20:20:28 +02:00
ocornut
13f718337a
Internals: Added support for overriding locale decimal point, undocumented. ( #2278 ) + Misc doc update.
...
Doc: Mention IMGUI_VERSION_NUM in recent api breaking changes + textwrap some demo code.
2020-08-28 18:38:31 +02:00
ocornut
901d432cb7
Nav: Fixed using Alt to toggle the Menu layer when inside a Modal window. ( #787 ) Tidying up todo items.
2020-08-27 19:51:35 +02:00
ocornut
302896d488
Basic optimization for ShadeVertsLinearColorGradientKeepAlpha() - especially for debug overhead - since it's used massively by some of our experiments.
2020-08-27 12:19:13 +02:00
ocornut
093afd4f7f
Internals: Added Name to ImGuiDataTypeInfo + minor misc comments in BeginGroup().
2020-08-26 21:00:43 +02:00
ocornut
45499b8f2f
Window: Fixed using non-zero pivot in SetNextWindowPos() when the window is collapsed. ( #3433 )
2020-08-26 20:18:54 +02:00
Louis Schnellbach
8c80d533d9
Tab Bar: Fixed a small bug where toggling a tab bar from Reorderable to not Reorderable would leave tabs reordered in the tab list popup.
2020-08-26 16:36:57 +02:00
ocornut
b30d33378d
Nav: Activate InputSource as Gamepad when pressing any of the digital d-pad button.
2020-08-26 12:41:05 +02:00
ocornut
8d71bc2132
Internals: Nav: shallow refactor.
2020-08-26 12:39:34 +02:00
Rokas Kupstys
833eb771f2
Nav: Fix navigation resuming on first visible item when using gamepad.
...
In cases where navigation was requested with focused item out of view, clipping of current item rect resulted in an inverted rect, which was completely discarded and ImRect(0,0,0,0) was used as current point from which navigation scoring was calculated. IsInverted() check is completely removed as rect can no longer be inverted. Since rects are not initialized to ImRect(0,0,0,0) - old .Min.x != FLT_MAX check (which was changed in c7835dd189 ) is not necessary either.
2020-08-26 11:30:08 +02:00
ocornut
1e8b9f84da
Nav: Removed stateful NavMoveFromClampedRefRect and made it more explicit that nav move request from gamepad start from a clipped location.
2020-08-26 11:28:35 +02:00
ocornut
4448734041
ImVector: added max_size() to facilitate usage with sol2 binding generator ( #3429 )
2020-08-26 11:03:55 +02:00
ocornut
32be6c064b
InputText: Fixed using ImGuiInputTextFlags_Password with InputTextMultiline(). ( #3427 , #3428 )
2020-08-25 20:08:24 +02:00
ocornut
e9053515bb
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
2020-08-25 19:29:06 +02:00
ocornut
5919a6fa89
Tab Bar: Keep tab item close button visible while dragging a tab (independent of hovering state).
...
Improve 08108cf
2020-08-25 19:28:29 +02:00
ocornut
30f0900b1c
Docking: Fix honoring payload filter with overlapping nodes. (we incorrectly over-relied on g.HoveredDockNode when making change for #3398 )
...
Essentially undo part of 85a661d (#3398 ) + ref cf31254 (#3420 )
2020-08-25 19:17:46 +02:00
Rokas Kupstys
021c28ae39
Nav: Fix ScrollToBringRectIntoView() not bringing entire item into view when nav moves to the left. Correct some comments.
2020-08-25 16:48:49 +02:00
ocornut
08108cf9ee
Tab Bar: Hide tab item close button while dragging a tab.
2020-08-25 16:48:31 +02:00
omar
2e50d0706b
Selectable: Tweaks. Added internal ImGuiSelectableFlags_NoPadWithHalfSpacing.
2020-08-24 16:31:00 +02:00
omar
d451f6cc30
Nav tweaks. Demo: Fixed drag and drop demo state (broken by f152fac4f1). Fixed incorrect format string (which would work without IMGUI_DISABLE_OBSOLETE_FUNCTIONS).
2020-08-24 14:56:50 +02:00
ocornut
7b0570d6ba
Revert "Drags, Sliders: internal ReadOnly flag gets forwarded properly to temp InputText()."
...
This reverts commit 640d1f60ce140e4c2bf858ac2f2e8a96d432e6a4.
2020-08-21 20:15:07 +02:00
ocornut
fdf952108d
Drags, Sliders: internal ReadOnly flag gets forwarded properly to temp InputText().
2020-08-21 19:17:44 +02:00
ocornut
831e2c920e
Docking, Viewport: Fixed a rare edge-case if the window targetted by CTRL+Tab stops being rendered.
2020-08-21 18:44:56 +02:00
ocornut
cf312545e8
Docking: Fixed docking while hovering a child window. ( #3420 ) broken by 85a661d27. Improve metrics debugging.
2020-08-21 16:34:34 +02:00
ocornut
df89a16d26
Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. ( #3390 , #2626 )
2020-08-21 15:29:57 +02:00
ocornut
d6f3a8848d
Viewports: Backends: DirectX9: Allow D3DERR_DEVICELOST on secondary viewports. ( #3424 )
2020-08-21 15:02:52 +02:00
ocornut
9d20a5f0a5
Docking: DockSpace() emits ItemSize() properly + dockspace demo (works now since 05a25e5f3)
2020-08-20 22:54:33 +02:00
ocornut
ad8fdc917f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-08-20 22:42:14 +02:00
ocornut
9b50e691ed
TreeNode: Made clicking on arrow toggle toggle the open state on the Mouse Down event. Amend 05420ea2c.
2020-08-20 22:38:00 +02:00
ocornut
97dad66516
Metrics: Various tweaks, listing windows front-to-back, greying inactive items when possible.
2020-08-20 16:49:11 +02:00
ocornut
9262609eaf
Version 1.79 WIP
2020-08-20 16:46:44 +02:00
ocornut
05a25e5f36
BeginMenuBar: Fixed minor bug where CursorPosMax gets pushed to CursorPos prior to calling BeginMenuBar(), so e.g. calling the function at the end of a window would often add +ItemSpacing.y to scrolling range.
2020-08-20 16:24:54 +02:00
ocornut
fc9ccad6b9
InputText: Add ImGuiInputTextFlags_CallbackEdit, selection helpers in ImGuiInputTextCallbackData(). Add simple InputText() callbacks demo.
2020-08-20 11:25:39 +02:00
ocornut
024993adf9
Revert leftovers from 4c201994d4
2020-08-20 11:25:05 +02:00
ocornut
4c201994d4
DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. ( #3361 )
2020-08-20 11:21:15 +02:00
ocornut
5dc5610ad5
Docs: TODO, FAQ
2020-08-20 11:20:17 +02:00
ocornut
05bc204dbd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
2020-08-18 17:51:43 +02:00
ocornut
95c99aaa4b
Version 1.78
2020-08-18 17:50:45 +02:00
ocornut
c6b01e8e1d
Drag, Sliders: Merged ImGuiDragFlags back into ImGuiSliderFlags. ( #3361 , #1823 , #1316 , #642 , #1829 , #3209 )
...
Technically API breaking (but ImGuiDragFlags were pushed on master 16 hours ago)
2020-08-18 17:02:58 +02:00
omar
b36d1d465d
Docking: Untangle a little bit of the ActiveIdClickOffset mess.
2020-08-18 12:40:43 +02:00
omar
14539b3ed2
Update Emscripten readme about emrun ( #3412 )
2020-08-18 12:34:19 +02:00
omar
d3fcc37e9e
Update Emscripten readme about local XHR requests ( #3412 )
2020-08-18 12:27:40 +02:00
ocornut
25a9209b75
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
2020-08-17 23:29:17 +02:00
ocornut
3c65b650e8
Merge branch 'features/logarithmic_sliders'
2020-08-17 22:11:09 +02:00
omar
f32663b33c
Drags, Sliders: Removed locking behavior with min > max (added in 1.73)
2020-08-17 22:10:42 +02:00
omar
7f8f0096d8
Internals: Renamed SliderCalcRatioFromValueT() -> ScaleRatioFromValueT(), SliderCalcValueFromRatioT() -> ScaleValueFromRatioT().
...
Replaced drag/slider flags with a single bool is_logarithmic in those functions.
2020-08-17 22:10:42 +02:00
omar
fb0f2ebd41
Drags, Sliders: Tweaks.
2020-08-17 22:10:42 +02:00
Ben Carter
fa279a6aa0
Drags, Sliders: Added deadzone to make selecting 0.0 on linear sliders easier, slider navigation delta accumulation. ( #3361 , #1823 , #1316 , #642 )
2020-08-17 22:10:42 +02:00
omar
f75b29e7be
Drags, Sliders: Added ImGuiDragFlags_NoInput/ImGuiSliderFlags_NoInput to disable turning widget into a text input with CTRL+Click or Nav Enter.
2020-08-17 22:10:42 +02:00
omar
8018623c5b
Drags, Sliders: Added ImGuiDragFlags_NoRoundToFormat / ImGuiSliderFlags_NoRoundToFormat flags ( #642 )
2020-08-17 22:10:41 +02:00
omar
170d02bd99
Drags, Sliders: Added ImGuiDragFlags_ClampOnInput/ImGuiSliderFlags_ClampOnInput flags to force clamping value when using CTRL+Click to type in a value manually. ( #1829 , #3209 )
2020-08-17 22:10:41 +02:00
omar
7607aea018
Drags, Sliders: Removed power features. Old entry points will pass-through if power=1.0f, otherwise assert + safe fallback. Remove 3 redirection functions ( #3361 , #1823 , #1316 , #642 )
2020-08-17 22:10:41 +02:00
omar
43c099f31e
Drags, Sliders: Logarithmic: Moved flags to internals, allowing 1.0f to pass by. ( #3361 , #1823 , #1316 , #642 )
2020-08-17 22:10:41 +02:00
omar
152dae9e2a
Drags, Sliders: Logarithmic: Split back flags into drag/slider flags. Moved to an obsolete section. ( #3361 , #1823 , #1316 , #642 )
2020-08-17 22:10:40 +02:00
Ben Carter
9f98b4e7f2
Drags, Sliders: Logarithmic: Added logarithmic mode support to drag widgets, extended API to add flags to drag/sliders ( #3361 , #1823 , #1316 , #642 )
2020-08-17 22:10:40 +02:00
Ben Carter
a252a287bf
Drags, Sliders: Logarithmic: WIP experiments with trying to make logarithmic sliders sensible ( #3361 , #1823 , #1316 , #642 )
2020-08-17 22:10:40 +02:00
ocornut
46d75202b8
Tab Bar: Allow calling SetTabItemClosed() after a tab has been submitted (will process next frame).
...
+ larger combo height on TabBarTabListPopupButton()
2020-08-17 12:57:47 +02:00
Louis Schnellbach
0e5b1ea297
CI: imscripten fastcomp backend is now deprecated ( #3402 )
...
Fastcomp backend was introduced here: 14b18697e6
Emscripten changelog: https://emscripten.org/docs/introducing_emscripten/release_notes.html?highlight=2.0.0:%2008/10/2020
Emscripten issue: https://github.com/emscripten-core/emsdk/pull/590
Updated CHANGELOG.txt
2020-08-12 16:26:42 +02:00
omar
a9626e1162
Docking: Made DockBuilderAddNode() automatically call DockBuilderRemoveNode(). ( #3399 , #2109 )
2020-08-11 11:52:13 +02:00
omar
214dd68ec1
Comments, clarifying ClosePopupsOverWindow().
2020-08-11 10:55:53 +02:00
omar
a4dd4d60b4
CI: moved static analysis to a separate project + fix (uninitialized variable, was harmless in this case).
2020-08-10 17:46:02 +02:00
omar
8241cd6284
Make moving window prevent its active id from being stolen ( #3392 , #3243 , #1738 )
...
Amend 7b3d379 , 615e9ae3
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
2020-08-10 16:30:23 +02:00
omar
a5ba26806f
Make moving window prevent its active id from being stolen ( #3392 , #3243 , #1738 )
...
Amend 7b3d379 , 615e9ae3
2020-08-10 16:28:46 +02:00
omar
dbc70f21a9
Docking: Fixed docking overlay bits appearing at (0,0), because of 43bd80a4. Most typically noticable when disabling multi-viewport.
2020-08-10 15:54:41 +02:00
omar
009276b6cb
Backends: Allegro 5: Fixed horizontal scrolling direction with mouse wheel / touch pads ( #3394 , #2424 , #1463 ) [@nobody-special666]
...
Amend 7dea158175
+ Fix vsproj GUID
2020-08-10 15:31:48 +02:00
omar
85a661d276
Docking: Storing HoveredDockNode in context which can be useful for easily detecting e.g. hovering an empty node. ( #3398 )
2020-08-10 12:55:37 +02:00
omar
acf043a675
Docking: Moved code unjustly in DockNodeTreeFindNodeByPos() out of it and into caller (should have no side-effect ideally). Removed dupe in Begin() from earlier merge.
2020-08-10 12:52:23 +02:00
omar
2c13a74a9d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
2020-08-10 11:35:51 +02:00
omar
209a6a751c
Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"
...
This reverts commit a24578ec09 .
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
2020-08-10 11:33:59 +02:00
omar
89ac87cd91
Internals: Added SetLastItemData, rename ImGuiItemHoveredDataBackup to ImGuiLastItemDataBackup.
2020-08-10 11:31:55 +02:00
ocornut
90b152f265
ImFontAtlas: Fixed multiple rebuild with same inputs erroneously increased ConfigDataCount. CI: Update Ubuntu 18.04 > 20.04 (motivated by #3369 )
...
Fix Freetype warning.
2020-08-07 16:27:55 +02:00
ocornut
ede8825fb2
Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833 ( #3390 )
2020-08-07 15:24:00 +02:00
omar
b15b25bccd
TabBar: made a change to that declared ideal width (for auto-resize) won't lag by an extra frame.
...
Vaguely relate to underlying (uncommited) work for #3291
2020-08-06 16:35:29 +02:00
omar
8074b49148
Selectable: Fixed highlight/hit extent when used with horizontal scrolling (in or outside columns). ( #3187 , #3386 )
...
# Conflicts:
# imgui_widgets.cpp
2020-08-05 19:24:07 +02:00
omar
fc61018b1c
Demo: Renamed "Layout" -> "Layout & Scrolling". Fixed usage of local struct as template class (c++11).
2020-08-05 17:10:06 +02:00
omar
473a01adb0
Scrolling: Avoid SetScroll, SetScrollFromPos functions from snapping on the edge of scroll limits. ( #3379 ) + Demo: Rename "Layout" to "Layout & Scrolling".
2020-08-05 17:09:40 +02:00
omar
a24578ec09
Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)
2020-08-05 15:02:30 +02:00
omar
db886f3953
Demo: Rework Clipping section. Fix for static analysis. Added bindings in Readme.
2020-08-05 10:43:42 +02:00
omar
963839373c
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
2020-08-03 21:31:42 +02:00
omar
de1588928b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-08-03 19:54:31 +02:00
omar
55041ac3be
Demo: Removed thin triangle and aligned code.
2020-08-03 19:46:26 +02:00
omar
912c45ab23
Demo: Improve "Custom Rendering"->"Canvas" demo with a grid, scrolling and context menu.
2020-08-03 19:46:25 +02:00
omar
4929a8e4a5
InvisibleButton: Made public a small selection of ImGuiButtonFlags (previously in imgui_internal.h) and allowed to pass them to InvisibleButton().
2020-08-03 18:45:30 +02:00
omar
a876ad877d
Window: Fixed clicking over an item which hovering has been disabled (e.g inhibited by a popup) from marking the window as moved.
...
+ comments
2020-08-03 18:05:20 +02:00
omar
5d87941451
Fixed ImFontConfig::GlyphExtraSpacing and ImFontConfig::PixelSnapH settings being pulled from the merged/target font settings when merging fonts, instead of being pulled from the source font settings.
2020-08-02 12:20:13 +02:00
omar
76ddacd2a1
Internals: Backport HoveredWindowUnderMovingWindow code from Docking branch.
...
(effectively allowing a window to be a drag payload without have to make it _NoInputs)
2020-07-29 15:32:25 +02:00
omar
70fa37527d
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
2020-07-29 15:15:14 +02:00
omar
218ff3a2a5
Internals: Backport one ->WasActive test in NavRestoreLastChildNavWindow() from 9bf6509c6 + minor/shallow bits from docking branch.
2020-07-29 15:11:24 +02:00
omar
c7f5876f8a
Internals: backport window HitTestHole code from docking branch + RenderRectFilledWithHole() helper. ( #1512 , #3368 )
2020-07-29 15:03:52 +02:00
omar
bbd061538c
Internals: Drag/Sliders: simplified some code.
2020-07-24 13:00:56 +02:00
omar
b8c22bdb28
DragFloatRange2, DragIntRange2: Fixed an issue allowing to drag out of bounds when both min and max value are on the same value. ( #1441 )
2020-07-23 19:05:18 +02:00
omar
fdc526e8f8
Stop advertisting for Drag v_min>v_max which was introduced in 1.73 likely for 0537ac00 then made unnecessary with 32c33c66, added undocumented ImGuiItemFlags_ReadOnly as possible replacement (unused), ( #211 )
2020-07-23 18:19:11 +02:00
omar
b335225caa
Internals: Extract ImFontAtlasBuildRender1bppRectFromString() out of ImFontAtlasBuildRenderDefaultTexData() + minor renaming, comments
2020-07-22 17:31:59 +02:00
Rokas Kupstys
3d4af15d1d
Backends GLFW: Use GLFW_MOUSE_PASSTHROUGH when available.
2020-07-17 18:44:09 +02:00
omar
cba52b66af
Backends: GLFW: Fixed enabling ImGuiBackendFlags_HasMouseHoveredViewport broken by 950539b7.
...
As it turns out, back-end passing NULL hovered with HasMouseHoveredViewport is also broken which defeats some of its purpose.
2020-07-17 18:14:04 +02:00
omar
e223bd8177
ImDrawList: changed AddCircle(), AddCircleFilled() default num_segments from 12 to 0.
2020-07-16 22:25:56 +02:00
omar
4be8155002
Style Editor: Added preview of circle auto-tessellation when editing the corresponding value..
2020-07-16 21:51:49 +02:00
omar
825f2ae455
Demo: Tweak "child windows" section. ( #3318 )
2020-07-16 17:20:24 +02:00
omar
f79f0e42f7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
2020-07-14 18:38:47 +02:00
omar
eefae08261
Nav: Fixed clicking on void from not clearing focused window. Amend d31fe97f7. ( #3344 , #2880 )
...
This would be problematic e.g. in situation where the application relies on io.WantCaptureKeyboard flag being cleared accordingly.
2020-07-14 18:36:35 +02:00
omar
550f110354
InputText, ImDrawList: Fixed assert triggering when drawing single line of text with more than ~16 KB characters. ( #3349 )
2020-07-12 23:51:13 +02:00
omar
cbade7b16d
Docking: Workaround recovery for node created without the _ockSpace flags later becoming DockSpace. ( #3340 )
2020-07-10 19:17:49 +02:00
omar
fb7f6cab8c
Backends: Amend, docs + extra comments. ( #3330 , #3245 )
2020-07-10 14:36:00 +02:00
Moritz Heinemann
06f7854b16
Backends: OpenGL3: Add glad 2 to OpenGL loaders. ( #3330 )
2020-07-10 14:34:25 +02:00
omar
b626dd57d3
Backends: DX12, Viewports: Tidying up, renaming.
2020-07-10 12:20:03 +02:00
omar
cb1d578470
Backends: DX12, Viewports: Fixed issue on shutdown when viewports are disabled. ( #3347 )
2020-07-10 12:09:24 +02:00
omar
89685b346c
ImDrawList: Fixed minor bug introduced in 1.75 where AddCircle() with 12 segments would generate an extra unrequired vertex.
...
Actual missing code for d3b37180a3 , thanks @domgho!
2020-07-09 11:21:31 +02:00
omar
66336528c8
Merge branch 'features/tex_antialiased_lines' ( #3245 )
2020-07-08 20:20:07 +02:00
omar
3a6c9907cd
Texture-based thick lines: Minor tweaks and rename toward merging in master. Changes to allow changing AA_SIZE (disable texture path).
2020-07-08 20:18:41 +02:00
Ben Carter
b5bae9781d
Texture-based thick lines: Only use textured lines for integer line widths
2020-07-08 17:38:02 +02:00
omar
78d6bdf080
Texture-based thick lines: Remove unnecessary indirection in fetching UV data, removed lerp call, renames, tweaks.
2020-07-08 17:38:02 +02:00
Omar
a07c8b6999
Texture-based thick lines: Fixes for AddCustomRect api, add IMGUI_HAS_TEXLINES define (temporarily) to facilitate working with test cases, Demo allows growing FrameBorderSize for testing
2020-07-08 17:38:02 +02:00
Ben Carter
21d9e8e1f4
Texture-based thick lines: Simplified line width calculation code and removed hack for thickness 1.0 lines
2020-07-08 17:38:02 +02:00
Ben Carter
403bf45245
Texture-based thick lines: Allow interpolation between textures for non-integer line widths
2020-07-08 17:38:01 +02:00
omar
222b7ddbfa
Texture-based thick lines: Tweaks, fix for truetype builder.
2020-07-08 17:38:01 +02:00
Ben Carter
741ab74b55
Texture-based thick lines: Improvements to code for drawing anti-aliased lines using textures
...
Moved line width into a constant
Removed test code (now in imgui-tests)
Improved matching between geometry and texture rendering at non-integer sizes
2020-07-08 17:38:01 +02:00
Ben Carter
1d3c3070d8
Texture-based thick lines: Initial version of AA line drawing using textures (press SHIFT to enable)
2020-07-08 17:38:01 +02:00
Ben Carter
8e4046e13b
Atlas build use GetCustomRectByIndex() + comments, rename, and shallow merge from tex_antialiasing_lines branch.
2020-07-08 17:25:40 +02:00
Rokas Kupstys
0d03e1fafa
CI: Fix emscripten builds that broke due behavior change of emscripten SDK.
2020-07-07 13:06:02 +02:00
omar
4f5aac319e
Docking: moved local-ish IMGUI_DOCK_SPLITTER_SIZE to DOCKING_SPLITTER_SIZE at the top of the file.
2020-07-03 15:51:05 +02:00
omar
fc9d6b6cb5
Docking: Added experimental flags to perform more docking filtering and disable resize per axis. Designed for toolbar patterns.
...
The local/shared flags specs, saving and inheriting rules are pretty inconsistent at the moment.
2020-06-30 19:55:59 +02:00
omar
a1d2c6fad9
Fixed invalid comment ( #3327 )
2020-06-30 19:00:31 +02:00
omar
4bdbea8375
Docking: Rework size allocation to allow user code to override node sizes. Not all edge cases will be properly handled but this is a step toward toolbar emitting size constraints.
2020-06-30 18:53:13 +02:00
omar
2b9d88196e
Docking: Rework size allocations to recover when there's no enough room for nodes + do not hold on WantLockSizeOnce forever ( #3328 )
...
(Ensure if the fact that WantLockSizeOnce was kept when only 1 child is visible was desired/desirable)
2020-06-30 18:52:02 +02:00
omar
ab4ef822f0
Version 1.78 WIP
2020-06-30 16:56:09 +02:00
omar
90ea7e2f2f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-06-30 16:43:16 +02:00
Rokas Kupstys
0738611559
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
2020-06-30 16:37:21 +02:00
omar
dca7c3c629
TestEngine: Added hook to notify test engine of a removed imgui context.
2020-06-29 20:16:55 +02:00
omar
ddabfc3477
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-06-29 17:15:40 +02:00
omar
9418dcb693
Version 1.77
...
+ fix minor clang-tidy warnings which seems reasonable
2020-06-29 15:54:28 +02:00
omar
122febcdbf
IO: Added storage for PenPressure (unused by core library, to facilitate experiments) ( #2372 )
2020-06-29 15:03:11 +02:00
omar
f4f04cb5ec
Windows: Amend 6b0cf2e6 to facilitate working in viewport branch + handle safe area padding and ConfigWindowsMoveFromTitleBarOnly.
...
# Conflicts:
# imgui.cpp
2020-06-25 23:14:46 +02:00
omar
dd02a180b5
Windows: Amend 6b0cf2e6 to facilitate working in viewport branch + handle safe area padding and ConfigWindowsMoveFromTitleBarOnly.
2020-06-25 23:04:55 +02:00
Rokas Kupstys
d7ef56dca2
Windows: Fix unintended window size changes when resizing windows close to main viewport edges.
2020-06-25 22:58:39 +02:00
Rokas Kupstys
6b0cf2e6ae
Windows: Fix unintended window size changes when resizing windows close to main viewport edges.
2020-06-25 22:16:19 +02:00
omar
45a7cf47ab
FAQ update, removed redundant block in imgui.cpp
2020-06-25 16:44:06 +02:00
omar
5628416bd3
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2020-06-25 14:03:40 +02:00
omar
fed80b9537
Popups: Changed 'int mouse_buttons' to ImGuiPopupFlags. Added ImGuiPopupFlags_NoOpenOverExistingPopup, ImGuiPopupFlags_NoOpenOverItems. Refactored signature of BeginPopupContextWindow().
2020-06-23 20:05:15 +02:00
omar
5acf6d861a
Popups: Added ImGuiPopupFlags type, ImGuiPopupFlags_AnyPopupId and ImGuiPopupFlags_AnyPopupLevel flags for IsPopupOpen().
...
# Conflicts:
# docs/CHANGELOG.txt
2020-06-23 20:00:32 +02:00
omar
1c35750ee0
Added ImGuiCond_None for consistency and for generated bindings needing this for enums mapping.
2020-06-23 19:45:31 +02:00
omar
7538bbabb6
Demo: Commented out ideas on another way to center a window.
2020-06-23 19:01:40 +02:00
omar
e1d7e14717
Viewports: used main viewport for centering (wip), clarified the meaning of how ImGuiPlatformMonitor WorkPos/WorkSize should be set if unknown, added asserts.
2020-06-23 18:42:01 +02:00
omar
a616ff5d4a
BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. ( #915 , #3091 )
...
# Conflicts:
# imgui.cpp
2020-06-23 17:54:55 +02:00
omar
b83a1f3b00
BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. ( #915 , #3091 )
2020-06-23 17:52:13 +02:00
omar
68389200c4
Internals: Comments about CalcWrapWidthForPos() ( #778 )
2020-06-23 16:29:48 +02:00
omar
e0ec69d84b
Internals: Added ImageButtonEx() helper to temporarily bypass ID issues ( #2464 , #1390 )
2020-06-23 15:47:07 +02:00
omar
76e40fe5d1
Docking: Fix misuse of PushClipRect in UpdateWindowManualResize(). ( #3311 )
2020-06-20 22:09:58 +02:00
omar
20d61f5f62
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-20 22:06:01 +02:00
omar
1a1dcea1a0
Internals: Initialize drawlist earlier in Begin() to facilitate detecting accidental draw earlier than legal. ( #3311 )
2020-06-20 22:04:04 +02:00
omar
99f68d7958
Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks.
2020-06-19 11:34:04 +02:00
omar
9c2a36f573
Internals: clarified the code for ClampWindowRect().
...
As a side-effect, some rounding error may be neutralized however this isn't the intent. (#3309 )
2020-06-19 10:08:05 +02:00
omar
8ead38c100
Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.
2020-06-18 17:02:24 +02:00
omar
704723744e
Disabled latest overzealous warnings from Clang
2020-06-18 16:19:51 +02:00
Louis Schnellbach
b1d8309abc
Added ImGuiTabItemFlags_NoTooltip for individual Tab Item.
2020-06-18 15:55:10 +02:00
ocornut
078571b7a9
Popups: added comments, reorganized the functions in imgui.h
2020-06-16 23:39:00 +02:00
ocornut
6e138504c1
Popups: Fix BeginPopupContextVoid() when clicking over the area made unavailable by a modal. ( #1636 )
2020-06-16 19:32:59 +02:00
ocornut
37eb89371b
Popups: Internals: Added IsAnyPopupOpen().
2020-06-16 18:46:25 +02:00
ocornut
d31fe97f74
Popups: Fix an edge case where programatically closing a popup while clicking on its empty space would attempt to focus it and close other popups. ( #2880 )
2020-06-16 17:10:47 +02:00
ocornut
1dfd0634cb
Internals: Allow ItemHoverable() to be used with id==0 to facilitate high-level read-only hover test in widget code.
2020-06-15 22:13:06 +02:00
ocornut
99ab521024
Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point
2020-06-15 22:12:38 +02:00
ocornut
c658cba22b
Comments, reworded some !(xxx && xxx) complex expression to be a little less confusing.
2020-06-15 18:06:48 +02:00
omar
90c0c0c163
Columns: Lower overhead on column switches and switching to background channel. (second attempt for 9b3ce49)
...
Internals: Bits, comments, added ImRect::ToVec4()
2020-06-13 18:04:50 +02:00
Ben Carter
d3b37180a3
ImDrawList: Fixed minor bug introduced in 1.75 where AddCircle() with 12 segments would generate an extra unrequired vertex.
...
Amend 5363af7f47 , 051ce0765e
2020-06-13 14:16:29 +02:00
ocornut
2665288b30
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-11 11:36:38 +02:00
ocornut
a933cc4f4d
Documentation update
2020-06-11 10:21:31 +02:00
ocornut
64d8d302fb
ImDrawList: Fixed VtxOffset change leading to unnecessary leading empty ImDrawCmd in certain cases.
2020-06-10 19:16:14 +02:00
ocornut
16da8e6da6
Revert "Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). ( #125 )"
...
This reverts commit 9b3ce494fd .
2020-06-10 17:54:19 +02:00
ocornut
53f0f97273
Added FAQ entry about DPI. Added Japanese font loading example.
2020-06-09 17:29:26 +02:00
ocornut
40b799023b
Docs: Update fonts.md ( #2861 ) + update all references to FONTS.txt
2020-06-09 16:56:48 +02:00
Scott
a72754886f
Docs: Initial draft of fonts documentation ( #2861 )
2020-06-09 16:56:45 +02:00
ocornut
9b3ce494fd
Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). ( #125 )
...
This change benefits Columns but was primarily made with Tables in mind.
2020-06-08 23:18:23 +02:00
ocornut
84862ec78e
ImDrawList, ImDrawListSplitter, Columns: Fixed an issue where changing channels with different TextureId, VtxOffset would incorrectly apply new settings to draw channels. ( #3129 , #3163 )
2020-06-08 20:58:30 +02:00
ocornut
3bef743df4
ImDrawList: Clarifying and guarateeing that CmdBuffer.back()->UserCallback should be always be NULL.
2020-06-08 20:58:30 +02:00
ocornut
b1f2eacdf3
ImDrawList: Prefixed internal functions with underscore, renamed UpdateClipRect() to _OnChangedClipRect(), UpdateTextureID() -> _OnChangedTextureID()
2020-06-08 20:58:30 +02:00
ocornut
e35a813d57
ImDrawList: Separating PrimXXX sections from more internals helper in the header file.
2020-06-08 20:58:30 +02:00
ocornut
117d57df5b
ImDrawList: Additional comments and extracted bits into ImDrawList::PopUnusedDrawCmd()
2020-06-08 20:58:29 +02:00
ocornut
a6bb047bab
ImDrawList: Store header/current ImDrawCmd in instance to simplify merging code. Amend 0320e72, toward #3163 , #3129
2020-06-08 19:36:02 +02:00
ocornut
57191fe3d0
Comments about limiting WindowRounding to a reasonable size.
2020-06-08 14:17:49 +02:00
ocornut
f6120f8e16
ImDrawList, ImDrawListSplitter, Columns: Fixed an issue where starting a split when current VtxOffset was not zero would lead to draw commands with wrong VtxOffset. ( #259
2020-06-06 21:31:31 +02:00
ocornut
41f47c853b
ImDrawList: Amend 0320e72 removed an unnecessary test.
2020-06-06 20:35:29 +02:00
ocornut
8baa4ccff5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-06 20:31:24 +02:00
ocornut
0320e7257b
ImDrawList: Small refactor to create empty command when beginning the frame, allowing to simplify some functions.
...
+ Missing clearing two fields in ClearFreeMemory() (was hamrless)
2020-06-06 20:27:24 +02:00
ocornut
003153b3ac
ImDrawList: Tweaks to make style consistent (using pointers, same local names). Added comments. Should be no-op.
2020-06-06 20:26:04 +02:00
thedmd
e22e3f300a
ImDrawList: Fixed an issue when draw command merging or cancelling while crossing the VtxOffset boundary would lead to draw command being emitted with wrong VtxOffset value. ( #3129 , #3163 , #3232 )
2020-06-06 18:54:53 +02:00
ocornut
78d5ccfb90
ImDrawList: PushColumnsBackground(): Fixed incorrect assert. ( #3163 )
2020-06-06 18:54:46 +02:00
Rokas Kupstys
5af8a8c7e8
CI: Extra warnings for builds with Clang. Backends: OpenGL3: Fix sign conversion warnings.
2020-06-05 15:50:12 +02:00
Rokas Kupstys
dc49b14e29
Misc: Fix examples of using other OpenGL3 bindings in Makefiles.
2020-06-05 14:05:39 +02:00
Mark Jansen
6eb66fbef3
Backends: Win32: Cache the result of a windows version check. ( #3283 )
...
This is not expected to change while the application is running :)
2020-06-05 01:23:18 +02:00
ocornut
79fbab543d
Minor fix to avoid undefined behavior sanitizer triggering ( #3276 )
2020-06-04 18:59:04 +02:00
ocornut
53dfccbe4b
imgui_freetype: Fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails. ( #618 )
2020-06-04 17:53:50 +02:00
omar
5e976e9b05
Title capitalization ( #3280 )
2020-06-03 22:04:14 +02:00
ocornut
41e8837f59
Comments, adding some spacing in ImVec2() constructors.
2020-06-02 18:13:54 +02:00
Giovanni Funchal
3f26a07ee1
Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. ( #3246 )
2020-05-25 18:57:23 +02:00
ocornut
5d472c4895
Merge branch 'master' into docking + fixes for #3259
...
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2020-05-25 18:32:15 +02:00
ocornut
5ddf60d8ce
Commit to facilitate branches merges
2020-05-25 18:28:25 +02:00
ocornut
a06eb83359
Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. ( #3259 )
2020-05-25 18:15:59 +02:00
ocornut
0fe5170bc4
Viewports: Report minimized viewports as zero DisplaySize to be consistent with main branch + comments ( #1542 )
2020-05-25 16:28:55 +02:00
Rokas Kupstys
6b688561aa
CI: Test building without C++ runtime on GCC/Clang.
2020-05-25 14:43:18 +02:00
ocornut
bb2529dd48
Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.
2020-05-25 12:26:59 +02:00
ocornut
a056603d8b
Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
2020-05-25 12:12:02 +02:00
ocornut
9c209d5a90
Minor amend 9028088 ( #3261 )
2020-05-25 11:42:45 +02:00
Nicolas Burrus
43f79aa210
Backends: OSX: import the glfw workaround to avoid missing mouse clicks. ( #3261 )
2020-05-25 11:42:45 +02:00
Nicolas Burrus
39d17ca07f
Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. ( #3260 )
2020-05-25 11:29:41 +02:00
omar
d29157ce58
Moved static array with non-trivial constructors outside of function seems to remove requirement of linking with libstdc++ on some compilers.
2020-05-24 12:32:31 +02:00
omar
c8cde28cf3
IO: AddInputCharacters function ignore 0 input. ( #3252 )
...
Amend ef13d954 + c8ea0a01 (#2541 , #2538 , #2815 )
2020-05-20 17:56:08 +02:00
Espyo
f44962c01a
Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. ( #3252 )
2020-05-20 17:48:21 +02:00
omar
75bbbda645
Examples: Update comments to get SDL2 package with msys2's pacman ( #3251 )
2020-05-20 11:44:00 +02:00
ocornut
615e9ae345
Docking: Fix undocking ( #3243 ), amend 7b3d3798 ( #1738 )
2020-05-18 15:08:47 +02:00
ocornut
417ac68f82
Internals: AddPolyline: Add spaces for consistency, renaming.
2020-05-18 12:07:53 +02:00
omar
3b3af6b731
Docking: Fix extraneous function declaration ( #3236 ) + moved some other declarations in imgui_internal to facilitate moving docking code.
2020-05-16 16:11:42 +02:00
omar
e4d8267188
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2020-05-16 14:14:51 +02:00
Mr. Metric
39c978f499
Fix typo/bug introduced by 0679e056 ( #3231 , #3209 , #1829 , #946 , #413 )
2020-05-15 10:51:51 +02:00
omar
1cd32d3afe
Docking: moving small docking context to imgui_internal.h, removed unnecessary indirection, renaming.
2020-05-14 00:19:56 +02:00
omar
476daf9aac
Settings: Added ReadInitFn pre-load handler.
...
(docking branch already has it, so it'll probably conflict with same contents)
2020-05-13 23:51:29 +02:00
omar
5fdfa32cce
Update README.md
2020-05-12 15:42:29 +02:00
Chris Savoie
03ea87ea28
Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings.
2020-05-11 19:31:35 +02:00
Maru
6b80bd9cc3
Fix GetGlyphRangesKorean() end-range to end at 0xD7A3 (instead of 0xD79D). ( #348 , #3217 )
...
https://en.wikipedia.org/wiki/Hangul_Syllables
2020-05-11 18:01:42 +02:00
Chris Savoie
c46b79846c
Metrics: Fix metrics crash with viewports.
2020-05-11 17:54:07 +02:00
omar
6636cb9f2f
Viewports: Don't set ImGuiViewportFlags_NoRendererClear when ImGuiWindowFlags_NoBackground is set. ( #3213 )
2020-05-11 17:29:50 +02:00
Rokas Kupstys
a6f4b0fd70
Nav, Menus: Fix vertical wrap-around in menus or popups created with multiple appending calls to BeginMenu()/EndMenu() or BeginPopup/EndPopup(). ( #3223 , #1207 )
...
First call to EndPopup() called NavRequestTryWrapWindow() which performed wrap-around operation while we were not done composing menu. This resulted in navigation wrapping around to first item.
Since wrap-around operation is only valid in last call to EndPopup() and there is no way to know which call is last - this operation is delayed to the end of the frame.
2020-05-11 15:30:12 +02:00
omar
7b3d379819
FocusWindow(NULL) correctly steal active id from previous window. ( #1738 ) amend b0a9bbf6
2020-05-08 18:36:05 +02:00
Albert Vaca
685ca27d84
Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. ( #3199 )
2020-05-08 17:32:34 +02:00
Ivan Zinkevich
1e7672acf4
Backends: DX12: Fixed OBJECT_DELETED_WHILE_STILL_IN_USE on viewport resizing. ( #3210 )
...
Tested with detaching/attaching a viewport and resizing it. DX12 debug
layer is clean.
2020-05-08 17:26:46 +02:00
omar
8596f2b0fc
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2020-05-08 17:07:40 +02:00
omar
4f33dd15c4
Internals: stand-in for large branches to facilitate merging.
2020-05-08 17:00:11 +02:00
omar
5f752a5ba9
Internals: shuffling some sections (2)
2020-05-08 16:30:14 +02:00
omar
f466cfc2ca
Internals: shuffling some sections, added index.
2020-05-08 16:21:00 +02:00
omar
3aa1684129
Comments
2020-05-08 15:59:59 +02:00
omar
538d28e29e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-05-08 00:00:03 +02:00
omar
c0d5b3f55a
Fix to facilitate branch merges
2020-05-07 23:58:35 +02:00
omar
53ebd6a02f
Metrics: Added Table settings block.
2020-05-07 23:54:32 +02:00
omar
574ff0a280
Docking, Settings: Allow reload of settings data at runtime. ( #2573 )
2020-05-07 23:28:29 +02:00
omar
51e568f9dc
Docking: Fix to allow basic reload of non-docking .ini data (following d33021d8) + moved settings blocks
2020-05-07 23:26:59 +02:00
omar
582f4db59b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-05-07 22:13:47 +02:00
omar
d33021d828
Settings: Made it possible to load window .ini data mid-frame. Added clear and post-read handlers. ( #2573 )
2020-05-07 21:38:04 +02:00
omar
b6a04d7750
Settings: Added Clear Settings in Metrics. ( #2188 ) + Preserve last loaded copy in internal buffer used for save (so it can be browsed easily).
2020-05-07 21:38:03 +02:00
omar
9ee442d3f0
Metrics: Added a "Settings" section with some details about persistent ini settings. InputText: Assert early on null buffer.
2020-05-07 21:34:44 +02:00
omar
510f301c9f
Internals: Removed seemingly unnecessary size_on_first_use arg to CreateNewWindow(), extracted code into ApplyWindowSettings.
2020-05-07 21:34:00 +02:00
omar
0679e05677
Internals: Added code in TempInputScalar() to clamp values, NOT used by stock Drag/Float ( #3209 , #1829 , #946 , #413 )
2020-05-07 12:27:21 +02:00
omar
673d6df85f
Demo: Clamping font scale. Added helpers in demo. Comments. Update sponsors. ( #3206 )
2020-05-07 11:45:41 +02:00
omar
f152fac4f1
Demo: Wrapped many (not all) code and comments lines to 120 characters to fit below GitHub viewer limit. ( #3193 )
2020-05-05 21:33:16 +02:00
omar
419f905f91
Demo: Extracted some code out of ShowStyleEditor() into NodeFont().
2020-05-05 19:53:54 +02:00
omar
11a3e75f47
Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). ( #3183 )
2020-05-04 20:46:20 +02:00
omar
5116eee108
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2020-05-04 15:05:07 +02:00
omar
b4dd28ffbb
Style: Added style.TabMinWidthForUnselectedCloseButton settings.
...
Set to 0.0f (default) to always make a close button appear on hover (same as Chrome, VS).
Set to FLT_MAX to only display a close button when selected (merely hovering is not enough).
Set to an intermediary value to toggle behavior based on width (same as Firefox).
2020-05-04 14:58:21 +02:00
omar
099091280f
Backends: DX10/DX11: Minor tweaks.
2020-05-04 11:40:31 +02:00
Silent
1e9abf60d1
Backends: Keep shader blobs as local variables. ( #3176 )
2020-05-04 11:22:43 +02:00
Rokas Kupstys
794bf7a28d
CI: Implement builds with IMGUI_DISABLE_WIN32_FUNCTIONS, IMGUI_DISABLE_FILE_FUNCTIONS, IMGUI_USE_BGRA_PACKED_COLOR IM_VEC2_CLASS_EXTRA, IM_VEC4_CLASS_EXTRA and building library as a DLL.
2020-05-04 11:05:07 +02:00
omar
d5ce3b43ae
Backends: Vulkan: Fixed error in if initial frame has no vertices. ( #3177 )
2020-05-04 11:03:41 +02:00
Clownacy
a2454f2a45
Use __NEWLIB__ instead of __SWITCH__ and __CYGWIN__ for alloca.h-detection ( #3070 )
...
Cygwin uses newlib, so it's covered by the __NEWLIB__ check.
You can see how it defines __NEWLIB__ here: https://cygwin.com/git/?p=newlib-cygwin.git;a=blob;f=newlib/configure.in#l453
2020-04-28 16:15:00 +02:00
Ryan Pavlik
8cbff5ccb2
Fix various typos. ( #3161 )
...
(found by Debian's lintian on a package that uses imgui.)
(found by codespell.)
2020-04-28 16:10:15 +02:00
Rokas Kupstys
2593b6a1c8
Drag and Drop: Fix unintended fallback "..." tooltip during drag operation when drag source uses _SourceNoPreviewTooltip flags. ( #3160 )
2020-04-27 13:51:07 +02:00
Chris Savoie
73c30aa085
Backends: Vulkan: Don't skip drawing when there's no vertexes to ensure that user callbacks are still processed.
2020-04-26 20:26:06 +02:00
Matt Haynie
d3212482fe
Fix multiple macro definitions of GLFW_INCLUDE_NONE ( #3157 )
2020-04-23 22:58:45 +02:00
omar
5ac5d3674f
Removed unncessary ID (first arg) of ImFontAtlas::AddCustomRectRegular() function.
2020-04-23 19:27:04 +02:00
omar
223297b075
Clarified comments about popups input blocking and ImGuiHoveredFlags_AllowWhenBlockedByPopup flag. ( #3154 )
2020-04-23 16:32:01 +02:00
omar
7ddc1adefb
Internals: FIxed commented out IMGUI_DEBUG_LOG_xxx macros, added extra. Revert incorrect 103c5edaa.
2020-04-22 16:41:18 +02:00
Silent
fd6d3155c0
Fix wrong comment in ImGuiCond_ ( #3139 )
2020-04-22 10:13:20 +02:00
u3shit
528b12eb7a
Fix glClipControl(GL_UPPER_LEFT) handling in opengl3.
2020-04-22 10:10:51 +02:00
ocornut
266dff9bed
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_internal.h
2020-04-20 11:33:56 +02:00
ocornut
c0283c1289
TestEngine: Changed PushID hooks into GetID(), makes more sense and catches more information.
2020-04-20 11:31:30 +02:00
omar
37f665b619
Backends: Win32: Support for #define NOGDI, won't try to call GetDeviceCaps(). ( #3137 , #2327 )
2020-04-19 17:52:09 +02:00
Rokas Kupstys
7f8b076f2b
Viewports, Backends: GLFW: Fix windows resizing incorrectly due to GLFW firing window positioning callbacks on next frame after window is resized manually. ( #2117 )
...
+ Docking fixed PVS warning
2020-04-18 11:27:34 +02:00
Patryk Czachurski
36ac557df0
Docking: Fix unused variable warning. ( #3135 )
2020-04-18 11:09:44 +02:00
András Kucsma
388bf66247
Fix missing comma in FAQ.md ( #3134 )
2020-04-17 18:50:33 +02:00
omar
9f9ff84ba1
TestEngine: Added PushID() hooks.
2020-04-16 16:59:46 +02:00
omar
b0e9092d6f
TestEngine: Added extra storage and global enable flag. Added missing ItemInfo hooks.
2020-04-16 16:56:15 +02:00
omar
3233fbff0e
Internals: Added SetNextWindowScroll() ( #1526 )
2020-04-16 14:07:58 +02:00
omar
1fd9e131e4
TreeNode: Fixed bug where dragging a payload over a TreeNode() with either _OpenOnDoubleClick or _OpenOnArrow would open the node. ( #143 )
2020-04-15 13:06:05 +02:00
omar
54b38d88f7
TreeNode: Fixed bug where BeginDragDropSource() failed when the _OpenOnDoubleClick flag is set. Added basic demo code. (Amend 05420ea)
2020-04-15 12:31:51 +02:00
omar
e8c986b34e
Version 1.77 WIP
2020-04-14 14:55:50 +02:00
SergeyN
013013737f
Viewports, Backends: DX12: Fix for crash caused by early resource release. ( #3121 )
2020-04-13 15:26:03 +02:00
omar
b8e2b2bd6b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2020-04-12 20:24:18 +02:00
omar
5503c0a12e
Version 1.76
...
+ fixed PVS warning, update demo binaries, update readme image
2020-04-12 20:18:47 +02:00
omar
7ee623d9b1
Internals: FocusScope not inherited by popups, modals. Amend a5041c88 2ebe08be)
2020-04-12 18:58:06 +02:00
omar
ec7294d890
Backends: OpenGL3: Fixed version check mistakenly testing for GL 4.0+ instead of 3.2+ to enable ImGuiBackendFlags_RendererHasVtxOffset, leaving 3.2 contexts without it. ( #3119 , #2866 , #2852 )
2020-04-12 18:01:10 +02:00
omar
71eb4034eb
Viewports: Fixed viewport merge code not testing the Minimized flag correctly. ( #3118 )
2020-04-12 17:48:24 +02:00
SergeyN
977ac53dd8
Examples: Win32+DX12: Fixed resizing main window, enabled debug layer. ( #3087 , #3115 )
2020-04-12 09:55:56 +02:00
omar
f7852fa8e8
Internals: Extracted GetWindowScrollbarRect() out of Scrollbar() and tidying up code to make it more obvious how to draw over scrollbars. ( #3114 )
2020-04-10 11:51:17 +02:00
omar
fb70d90fef
Made default clipboard handlers for Win32 and OSX use a buffer inside the main context instead of a static buffer, so it can be freed properly on Shutdown. ( #3110 )
2020-04-09 13:34:39 +02:00
omar
832fda8488
Fixed stray end of line blanks, added comments in .editorconfig, tweaked some headers.
2020-04-07 14:46:46 +02:00
Rokas Kupstys
c142540705
Viewports, Backends: GLFW: Avoid using window positioning workaround for glfw versions that have it fixed. Amend 09780b8.
2020-04-07 14:15:46 +02:00
omar
4e7ceb5f90
Plot: Internals: Added hovered index to PlotEx() function. ( #2670 )
2020-04-07 12:11:06 +02:00
omar
e9366b4c73
Regretfully moved .gitignore file from examples/ into root directory because OSX keeps pooping its DS_Store/ artifacts everywhere. ( #3088 )
2020-04-07 11:56:51 +02:00
omar
cc0e43e631
Backends: Comments next to include, misc minor comments/tweaks, fix imgui_impl_osx.h using IMGUI_API instead of IMGUI_IMPL_API. ( #3105 )
2020-04-07 11:02:43 +02:00
OmarEmaraDev
00927105ba
Backends: Include imgui.h in implementation headers. ( #3105 )
...
Currently, the implementation headers don't include the imgui.h header.
Which means that the compilation will fail if the implementation header
was included before the imgui.h header in the compilation unit. For
instance, a compilation unit with the following will work:
#include "imgui.h"
#include "imgui_impl_glfw.h"
#include "imgui_impl_opengl3.h"
But a compilation unit with the following will fail because IMGUI_IMPL_API
and possibly other symbols will not be defined:
#include "imgui_impl_glfw.h"
#include "imgui_impl_opengl3.h"
#include "imgui.h"
This patch includes imgui.h in the implementation headers to make
inclusions order-invariant, which is a recommended practice.
2020-04-07 11:01:37 +02:00
omar
3930472f34
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-04-06 18:16:13 +02:00
omar
752436219d
Metrics: Made Tools section more prominent, added options, made mesh viewer more accessible.
2020-04-06 18:10:24 +02:00
omar
6d03f93067
Docking: Fixed assert preventing dockspace from being stored into a tab. ( #3101 )
2020-04-06 15:03:01 +02:00
omar
cc0d4e346a
Misc: Added an explicit compile-time test for non-scoped IM_ASSERT() macros to redirect users to a solution + fixed our stb wrappers.
...
+ Nav: Use nav layer enum, comments.
2020-04-03 12:41:33 +02:00
omar
b7e1b13ca7
Update docs, FAQ, comments (mainly related to io.WantCaptureMouse / WantCaptureKeyboard flags).
2020-04-02 21:53:10 +02:00
omar
11116eee80
Columns: undid the change in 1.75 were Columns()/BeginColumns() were preemptively limited to 64 columns with an assert. ( #3037 , #125 )
...
Essentially reverting 9d444062f9 .
2020-04-02 20:01:48 +02:00
omar
3490046c97
Nav: Disabled clipping g.NavId and fixed interactions with ImGuiListClipper. ( #787 )
2020-04-02 17:56:35 +02:00
omar
fd56de1144
Nav: Store key mods associated to a nav request (for range_select) + use io.KeyMods.
...
+ renamed NavScoringRectScreen > NavScoringRect
2020-04-02 17:56:21 +02:00
omar
0e884304ee
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.h
2020-04-02 14:27:48 +02:00
omar
05420ea2cf
TreeNode: Made clicking on arrow with _OpenOnArrow toggle the open state on the Mouse Down event rather than the Mouse Down+Up sequence (this is rather standard behavior).
2020-04-02 14:26:33 +02:00
Dylan
68c5d030cd
Typo in readme ( #3078 )
2020-03-29 15:34:57 +02:00
omar
ec2a24a5f1
Selectable: Allow using ImGuiSelectableFlags_SpanAllColumns in other columns than first. Comments. ( #125 )
2020-03-26 20:33:39 +01:00
omar
5be5add1ad
Selectable: Removed extraneous WindowPadding.x worth of width when auto-sized selectable label goes off available width (would not be noticeable) + Renamed ImGuiSelectableFlags_DrawFillAvailWidth to ImGuiSelectableFlags_SpanAvailWidth.
2020-03-26 20:15:24 +01:00
omar
b4d1287011
Selectable: Clarifying the code around use of ImGuiSelectableFlags_DrawFillAvailWidth (with intent of trying to remove it).
...
Amend old 6251d379 , 2bcafc86
2020-03-26 17:02:10 +01:00
omar
7c11997bcc
Selectable: Fixed honoring style.SelectableTextAlign with unspecified size. ( #2347 , #2601 )
2020-03-26 15:02:03 +01:00
omar
ac2247f551
Selectable: Removed seemingly ineffective text clipping offset in SpanAllColumns handling path + tweaks.
...
made max_x absolutely to reduce confusion.
amend cf481e1
2020-03-26 14:50:13 +01:00
omar
1d4b5def51
Alter definition of IM_UNICODE_ defines to faclitate C-binding. ( #2538 , #2541 , #2815 )
2020-03-25 21:40:20 +01:00
omar
670367e51d
Added IMGUI_USE_WCHAR32 instead of "#define ImWchar ImWchar32" to faclitate C-binding. ( #2538 , #2541 , #2815 )
2020-03-24 20:15:17 +01:00
omar
9085c2cae2
Docking: Fixed unused definition leftover from a hasty merge.
2020-03-24 18:51:04 +01:00
omar
f2b01c3436
Changelog, tweak OpenGL3 backends. ( #3061 ), update Gallery thread links.
2020-03-24 18:45:05 +01:00
David Kalnischkies
ac4262ad01
Backends: OpenGL3: Support older 2.x series of glbinding as loader for OpenGL3 ( #3061 )
...
This removes the unversioned definition IMGUI_IMPL_OPENGL_LOADER_GLBINDING in favor of two versioned ones to choose explicitly.
References: #2870 , 5e2329b98e
2020-03-24 18:36:34 +01:00
Rokas Kupstys
e8568f3ec9
Menus: Fix appending to main menubar ( #3068 ).
2020-03-24 18:20:06 +01:00
omar
4986dba270
Scrolling: Fixed scrolling centering API leading to non-integer scrolling values and initial cursor position. ( #3073 )
...
This would often get fixed after the fix item submission, but using the ImGuiListClipper as the first thing after Begin() could largely break size calculations. (#3073 )
2020-03-24 11:56:21 +01:00
omar
110f506ec0
Comments in imgui.h
2020-03-19 18:39:43 +01:00
omar
16a9488c13
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
2020-03-19 12:44:53 +01:00
omar
fbc93debf9
Internal: Refactor: Moved NewFrameSanityChecks as ErrorCheckNewFrameSanityChecks()
2020-03-19 12:27:16 +01:00
omar
ccf0cc8584
Added ImGuiKeyModFlags. Added additional checks in EndFrame() to verify that io.KeyXXX values have not been tampered with between NewFrame() and EndFrame().
2020-03-19 12:24:32 +01:00
omar
d8824f9a9a
CI: Clarify purpose of example_null, Changelog
2020-03-19 11:13:52 +01:00
Rokas Kupstys
ac5ffffc23
CI: Test builds with freetype on linux.
2020-03-19 11:05:53 +01:00
omar
bdd31ec4db
Internal: Refactor: Moved RenderColorRectWithAlphaCheckerboard() to imgui_draw.cpp, tweaked signature.
2020-03-18 22:48:23 +01:00
omar
0bbbbe0f68
Internal: Refactor: Moved RenderArrow, RenderBullet, RenderCheckMark to imgui_draw.cpp, changed RenderCheckMark to avoid using ImGui context
2020-03-18 22:48:22 +01:00
David Kalnischkies
2fd411a83e
Support custom stb_rect_pack filename in Freetype ( #3062 )
...
Copies the #define magic from imgui_draw.cpp to the imgui_freetype implementation to allow the use of a custom stb rect_pack here as well.
References: fe5347ef94
2020-03-18 22:14:29 +01:00
Rokas Kupstys
75a65f6fb0
CI: Test build with large indices, obsolete functions disabled and demo/metrics windows disabled.
...
+ amend notes
2020-03-17 20:33:28 +01:00
ocornut
339ffd25a9
Internals: Renamed ImBoolVector to ImBitVector, added low-level loose function to replicate the behavior include a help SetBitRange() function.
2020-03-13 18:50:02 +01:00
ocornut
1d5612a05e
Internal: Added two missing ImVec2 operators for consistency. Split up DragDropWithinSourceOrTarget
...
ImVec2 *= ImVec2 to match ImVec2 * ImVec2, likewise with /
2020-03-12 20:58:24 +01:00
ocornut
ea0399414c
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-03-11 22:30:34 +01:00
ocornut
1abb02fb67
Viewports: Fix for UWP on IME code moved back-end side ( #2895 , #2892 ) + Docking: Comments.
2020-03-11 22:28:31 +01:00
ocornut
b016f1ad70
Examples: SDL+DX11: Fixed resizing main window. Amend ( #3057 )
2020-03-11 21:22:52 +01:00
joeslay
a0f01d2290
Improve resizing in dx11 example ( #3057 )
...
Make the dx11 example implementation resize the window in a sane way, i.e. not the stretching/scaling the initial render to fit the new window size (current behaviour).
2020-03-11 21:22:52 +01:00
ocornut
a5041c8820
Focus: Child inherit focus scope from parent (amend 2ebe08be).
2020-03-11 21:07:39 +01:00
ocornut
9a46a19e99
Internals: Rename ImGuiSelectableFlags_PressedOnXXX to ImGuiSelectableFlags_SelectOnXXX, ImGuiButtonFlags_NoHoveredOnNav to ImGuiButtonFlags_NoHoveredOnFocus.
2020-03-11 21:07:32 +01:00
ocornut
4a10af2bda
Unicode, Windows: Remove stringapiset.h include (breaks vs2010 and seems unnecessary?). ( #2541 , #2815 )
2020-03-11 13:25:50 +01:00
ocornut
e137db2df7
CI: Enable error on warnings for the extra warnings builds as an experiment. FAQ tweaks
2020-03-10 14:09:47 +01:00
ocornut
aef057e975
Internals: Added GetInputTextState() + comments.
2020-03-07 15:55:05 +01:00
ocornut
2dcf8df9f4
Internals: Shuffled some of the windows-specific includes to avoid duplication. Might have undesirable side-effects on some compilers, please report!
2020-03-07 15:51:50 +01:00
ocornut
de37a0bfab
Internals: fix potential warning. Comments around include sections. Moved a few bits.
2020-03-07 15:40:22 +01:00
ocornut
1b5b87a40e
Internals: Added #define NOMINMAX before windows.h include for single-compile-unit builds.
2020-03-07 15:19:51 +01:00
ocornut
fbaf65b8f6
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy ( #1542 )"
...
This reverts commit f2c7f3b200 .
2020-03-06 17:53:09 +01:00
ocornut
f2c7f3b200
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy ( #1542 )
2020-03-06 17:28:32 +01:00
ocornut
1b579a110d
Viewports: Lots of comments about setting up multi-viewports. ( #1542 )
2020-03-06 17:25:25 +01:00
Rokas Kupstys
7e00cde8a9
Disable false-positive warning that papeared in pvs-studio v7.06.37052.34.
2020-03-05 15:26:20 +01:00
ocornut
1ecc1db226
Fix GCC warning
2020-03-05 12:35:01 +01:00
ocornut
a7ace918fe
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# imgui.cpp
2020-03-05 11:48:57 +01:00
ocornut
0850b46c88
ImDrawList: Internals: Added IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER setting.
2020-03-03 19:26:27 +01:00
ocornut
b029182a73
Merge branch 'features/unicode'
2020-03-03 18:59:54 +01:00
omar
897704cb49
Menus: Tweak for first-level menu windows to be positioned regardless of MenuBarHeight() which is not stored in window, allowing undocumented modification of the menu bar height).
2020-03-03 18:57:07 +01:00
ocornut
a41332453e
Unicode: Changelog, comments, minimum CI integration. ( #2541 , #2538 , #2815 )
2020-03-03 18:53:29 +01:00
omar
0283a6e566
ImFont: Demo, Store Used4kPagesMap[] map in ImFont to facilitate iteration on all codepoints with a large value of IM_UNICODE_CODEPOINT_MAX. ( #2815 )
...
Demo uses IsGlyphRangeUnused()
2020-03-03 18:53:29 +01:00
Sam Hocevar
c8ea0a017d
Unicode: UTF32 support improvements ( #2541 , #2538 , #2815 )
...
- Make ImWchar32 unsigned.
- Fix Win32 version of ImFileOpen by including windows.h sooner.
- Make ImGuiIO::AddInputCharacterUTF16() more robust by disallowing illegal
surrogate pairs.
- Allow pushing higher plane codepoints through ImGuiIO::AddInputCharacter().
- Minor cleaning up in the high-plane Unicode support.
- Fix Clang -Wunreachable-code warning
2020-03-03 18:53:29 +01:00
Cloud Wu
6d59653e82
Unicode: full Unicode Support (6 squashed commits) ( #2541 , #2538 )
...
fix build for WideCharToMultiByte
[3181ff1e] Full Unicode Support
[6c9e73ac] Fix ImTextCountUtf8BytesFromChar and ImTextCharToUtf8, these APIs assume the input is an unicode code point, not UTF-16
[ba85665b] Add AddInputCharacterUTF16 for windows backend to handle WM_CHAR
[fafdcaf0] Use Windows API to convert UTF-16 for ImFileOpen
[dc7d5925] Use windows API to convert UTF-16 for clipboard
2020-03-03 18:53:29 +01:00
ocornut
91ac93f9a6
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-03-03 17:06:38 +01:00
ocornut
8c683de33f
Internals: Refactor: Moved get height and contents regions functions, to Layout section. IF YOU GREAT CONFLICTS WHILE MERGING (NOT REBASING) THOSE 6 PREV COMMITS, TRY MERGING THEM INDIVIDUALLY 1 by 1 or 2 by 2 etc.
2020-03-03 17:04:32 +01:00
ocornut
05c3e0b898
Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2020-03-03 17:03:47 +01:00
ocornut
602df11f19
Internals: Refactor: Moved item width/size functions to Layout section.
2020-03-03 16:28:03 +01:00
ocornut
6c1810e503
Internals: Refactor: Moved cursor position functions to Layout section.
2020-03-03 16:27:58 +01:00
ocornut
3ce26f65d4
Internals: Refactor: Moved ItemAdd(), ItemSize(), BeginGroup(), EndGroup(), SameLine(), Indent(), Unindent() to Layout section.
2020-03-03 16:27:49 +01:00
ocornut
caca55c642
Internals: Refactor: Moved code into a Styling section and some code into the Error Handling section.
2020-03-03 16:03:28 +01:00
ocornut
2679bee28d
Internals: Refactor: Moved code out of NewFrame() into UpdateTabFocus() and UpdateSettings()
2020-03-03 16:03:28 +01:00
omar
095dc996b0
Disable deprecated-enum-enum-conversion ( #3040 , #2983 )
2020-03-02 16:13:48 +01:00
omar
628614c6ea
Demo: Remove unnecessary code added by 24bd33ac.
2020-03-02 15:49:51 +01:00
ocornut
24bd33ace8
Menus: Some renaming, comments, add to demo. Amend 0342a3c. ( #1207 )
2020-02-28 16:42:24 +01:00
Rokas Kupstys
0342a3c548
Menus: Implement BeginMenu() appending to existing menu when executed with same ID multiple times. ( #1207 )
2020-02-28 16:35:33 +01:00
omar
103c5edaaa
Internals: debug log macros.
2020-02-27 16:10:36 +01:00
ocornut
75de34e281
Viewports, Docking: Added per-viewport work area system for e.g. menu-bars. Fixed DocksapceOverViewport() and demo code (overlay etc) ( #3035 , #2889 , #2474 , #1542 , #2109 )
...
Clarified that BeginMenuMainBar() had an incorrect knowledge of its height (which was previously harmless).
Designed to easily allow for status bars although we don't have/use them yet, but custom code could use them.
2020-02-26 23:58:45 +01:00
ocornut
f032ad6b1f
Viewports: Renamed GetRect() to GetMainRect() in prevision for work rect. Comments
2020-02-26 21:02:25 +01:00
ocornut
898e91f20d
Internals: Added TempInputText() to facilitate creation of custom widgets, renamed TempInputTextScalar() to TempInputScalar() etc. ( #2718 )
...
+ Minor imgui.h/todo comments
2020-02-25 21:34:02 +01:00
ocornut
871727dd2f
Viewports: Software mouse cursor is also scaled by current DpiScale. (amend #939 )
2020-02-25 15:51:57 +01:00
Rokas Kupstys
3ff13edad9
Viewports: Improve menu positioning in multi-monitor setups.
...
This change uses mouse position for initial positioning of popup menus. It ensures that menu appears in expected location on monitor mouse is currently hovering. This change fixes incorrect menu positioning (permanent or on the first frame) when menu item spans multiple monitors.
2020-02-25 15:05:58 +01:00
ocornut
e547f898a9
Demo: Added color gradient in demo to identify srgb/linear issues better. Tweaks.
2020-02-24 12:44:19 +01:00
ocornut
0345324646
Backends: SDL: Fixed mapping for ImGuiKey_KeyPadEnter. ( #3031 ) [@Davido71]
2020-02-20 12:28:06 +01:00
ocornut
7d80a8f4f5
Backends: Fix ImGui_ImplSDL2_InitForMetal() in docking branch.
2020-02-20 12:21:11 +01:00
ocornut
3c80d57dc7
Viewports, Window: Avoid manually clipping resize grips and borders, which messes up with automation ability to locate the items. Also simpler and more standard.
...
Amend d8f9f6ba2a and 377f730054 .
2020-02-19 23:43:04 +01:00
ocornut
02a6c06080
Window: Fixed a bug with child window inheriting ItemFlags from their parent when the child window also manipulate the ItemFlags stack. ( #3024 ) [@Stanbroek]
...
Amend f843facba4 and 8828889d5e
2020-02-18 14:25:50 +01:00
Omar
ea3fc76038
BeginMenu: Fixed a bug where SetNextWindowXXX data before a BeginMenu() would not be cleared when the menu is not open. ( #3030 )
2020-02-18 12:49:02 +01:00
Omar
bb1e6f8af6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
2020-02-17 18:33:59 +01:00
Omar
8836975dcf
Drag and Drop, Nav: Disabling navigation arrow keys when drag and drop is active. ( #3025 )
2020-02-17 18:28:01 +01:00
Omar
b62f1ea8e9
Fix zealous PVS studio warnings. Minor tweaks.
2020-02-17 16:17:46 +01:00
Omar
09329ea4e6
Fix Clang 9.0 zealous warnings
2020-02-17 15:29:59 +01:00
Omar
ceec3cd3fd
Backends: Win32: Added ImGui_ImplWin32_EnableDpiAwareness(), ImGui_ImplWin32_GetDpiScaleForHwnd(), ImGui_ImplWin32_GetDpiScaleForMonitor() helpers functions.
...
(backported from the docking branch)
2020-02-17 11:15:40 +01:00
Omar
8601187fee
Backends: Win32: Clarify how the WndProc handler requires a forward declaration.
2020-02-17 10:22:39 +01:00
omar
f339b24b3a
Links, alphabetical order
2020-02-12 16:19:54 +01:00
omar
2bc3a92f96
Update README.md
2020-02-12 16:10:58 +01:00
omar
b4ac420fc5
Demo: Amend d284a6c ( #2149 , #515 )
2020-02-11 19:31:53 +01:00
omar
d284a6cffc
InputText: Fixed password fields displaying ASCII spaces as blanks. Fixed non-ASCII space occasionally creating unnecessary empty polygons. ( #2149 , #515 )
2020-02-11 19:28:11 +01:00
omar
ccaec1a270
Version 1.76 WIP
2020-02-11 16:56:56 +01:00
omar
30bb15672d
Remove trailing spaces
2020-02-10 23:22:03 +01:00
omar
70975fe44d
Demo: Added a black and white gradient to Demo>Examples>Custom Rendering.
2020-02-10 22:08:52 +01:00
omar
d8948b5343
ColorButton: Added ImGuiColorEditFlags_NoBorder flag to remove the border normally enforced by default.
2020-02-10 21:24:03 +01:00
Rokas Kupstys
21b9e42964
Minor fixes to example_sdl_metal and a changelog entry.
...
Add example_sdl_metal to CI builds.
Closes #3017 .
2020-02-10 16:53:37 +01:00
coding_jackalope
f346b4b302
Examples: SDL+Metal example.
2020-02-10 16:53:27 +01:00
omar
d16c87a5b1
Internals: Minor renaming
2020-02-10 16:46:51 +01:00
omar
8432d1bfc7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2020-02-10 14:03:12 +01:00
omar
58b3e02b95
Version 1.75
...
Comments
2020-02-10 14:02:41 +01:00
omar
7e2d172ae5
Backends: GLFW, SDL: Platform monitors declared properly even if multi-viewport is not enabled.
2020-02-09 17:31:18 +01:00
omar
d37d25470a
Added IMGUI_DISABLE compile-time definition to make all headers and sources empty.
2020-02-09 17:08:33 +01:00
omar
f694244dec
InputText: Fix using a combination of _CallbackResize + _EnterReturnsTrue + lack of persisting user storage. ( #3009 )
...
Amend 24ff25981 (#2006 , #1443 , #1008 )
2020-02-04 15:19:49 +01:00
omar
bdbb2b21f5
Fix 83efdcec from overflowing buffer + make it a single undo records + comments ( #3008 )
2020-02-03 17:39:20 +01:00
Rokas Kupstys
83efdcec8d
Canceling text input with [esc] key uses stb_textedit facilities to restore original value. This makes restoration undoable using hotkeys.
...
Fixes #3008 .
2020-02-03 15:50:17 +01:00
omar
3bde375078
Nav, Docking: Fixed failing to restore NavId when refocusing due to missing nav window.
2020-02-02 22:40:56 +01:00
omar
365b639981
Nav, Docking: Fixed failing to restore NavId when refocusing a child within a docked window.
2020-02-02 22:17:44 +01:00
omar
d4fc525614
Nav, Focus: Fixed messed up Ctrl+Tab order with Docked windows.
...
Amend d9bca0d853 , fc41839cab , fc42528f13 for docking.
2020-02-02 21:24:53 +01:00
omar
5be649e082
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2020-02-02 21:21:54 +01:00
omar
5a437f198c
Internals: GetItemStatusFlags(). Added Comments.
2020-02-02 21:01:22 +01:00
omar
fc42528f13
When testing for the presence of the ImGuiWindowFlags_NoBringToFrontOnFocus flag we test both the focused/clicked window (which could be a child window) and the root window.
2020-01-31 18:28:49 +01:00
omar
fc41839cab
Focus: Reworking FocusWindow() so in Docking branch we can fix CTRL+Tab being out of order on Docked windows because WindowsFocusOreder is poorly maintained.
...
When merging this and d9bca0d8 in Docking we'll replace two ocurrences of RootWindow with RootWindowDockStop.
2020-01-31 18:27:40 +01:00
omar
fb257eef3e
Internals: Update ->RootWindow and other links before applying the SetNextWindowXXX stuff. This is so FocusWindow() can always assume that ->RootWindow != NULL.
2020-01-31 18:25:57 +01:00
omar
4b4be11fd2
Docking: Clarifying that DockNode!=NULL when DockIsActive. Comments. Cleanup.
2020-01-31 14:57:47 +01:00
omar
d9bca0d853
Nav: Fixed a bug where the initial CTRL-Tab press while in a child window sometimes selected the current root window instead of always selecting the previous root window. ( #787 )
2020-01-31 14:42:59 +01:00
omar
d19297e2fa
InputTextMultiline: Provide label to BeginChildEx so internal window name hold a little more context.
2020-01-31 14:42:59 +01:00
omar
47fab0e166
Misc renaming, comments. Docs: add missing spacing to Changelog.
2020-01-31 14:42:59 +01:00
Rokas Kupstys
9cff4d6e5e
Columns: ImDrawList::Channels* functions now work inside columns.
...
Use a private splitter in columns, paving way for removal of obsolete ImDrawList::Channels* functions.
2020-01-31 12:02:56 +01:00
omar
05a49f0413
Examples: Emscripten: Demonstrating embedding fonts in Makefile and code. ( #2953 ) [@Oipo]
2020-01-30 17:15:15 +01:00
Konstantin Podsvirov
8cbb693f47
Emscripten: Allow filesystem support. ( #3005 )
...
Filesystem functions perfectly work for Emscripten platform. This changes remove extra changes added by #2734 .
You can still disable filesystem functions by defining IMGUI_DISABLE_FILE_FUNCTIONS.
2020-01-30 16:26:09 +01:00
omar
e7bfcb970e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2020-01-30 15:21:16 +01:00
omar
6e1f8be07b
Window: Fix SetNextWindowBgAlpha(1.0f) failing to override alpha component. ( #3007 )
2020-01-30 15:13:36 +01:00
omar
0a23582718
Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.
2020-01-29 20:11:42 +01:00
omar
0e89041997
Internals: ButtonEx, ButtonBehavior can support multiple mouse buttons.
2020-01-29 18:55:49 +01:00
Rokas Kupstys
7794b104c5
Backends: SDL/Viewports: Fix crash when SDL backend is used with DirectX graphics API and system does not support Vulkan.
...
We must pass this flag only when we intend to render using vulkan backend.
2020-01-29 14:03:04 +01:00
omar
3b828e6f96
Fix following bbe946f (ImRect <> ImVec4)
2020-01-28 20:29:07 +01:00
omar
bbe946fb6c
Minor fixes/tweaks (some to reduce drift wiih master branch)
2020-01-28 20:08:04 +01:00
omar
5f4dfad5b7
Merge misc/shallow changes from Docking to reduce drift.
...
Most are comments. Fix menu bar clipping: 07ff47bf1b
2020-01-28 20:06:34 +01:00
omar
6c1a73774d
Tooltip: Testing DragDropWithinSourceOrTarget in BeginTooltipEx() instead of just BeginTooltip() - feel this was an overlook. Added tooltip flags instead of using bool.
2020-01-27 22:02:43 +01:00
omar
377f730054
Fix resizing viewport-owning windows when mouse pos is outside the InnerClipRect (can happen with OS decoration on). ( #1542 )
2020-01-27 17:57:07 +01:00
omar
f5528001f6
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# imgui.cpp
# imgui_internal.h
2020-01-27 14:57:00 +01:00
omar
4d4e3b97f4
TODO, Readme
...
(dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)
2020-01-27 12:37:06 +01:00
Konstantin Podsvirov
b887259974
Bindings: Improved FreeGLUT support for MinGW ( #3004 )
2020-01-27 12:11:29 +01:00
omar
f68075b333
Docking: Added DockNodeFlagsOverrideSet/DockNodeFlagsOverrideClear (experimental)
2020-01-24 14:20:52 +01:00
omar
f6da5000bf
Backends: OpenGL2: Explicitly backup, setup and restore GL_TEXTURE_ENV to increase compatibility with legacy OpenGL applications. ( #3000 )
2020-01-23 16:20:37 +01:00
omar
5363af7f47
AddCircle, AddCircleFilled: Add auto-calculation of circle segment counts (amends)
...
Tweak default max error value, Changelog, comments, path-fast for 12 segments circles, made LUT store ImU8
2020-01-23 14:55:05 +01:00
Ben Carter
051ce0765e
AddCircle, AddCircleFilled: Add auto-calculation of circle segment counts
2020-01-23 14:52:48 +01:00
omar
2eda3585e7
Fixed hoverable/focus bug introduced in 3fe6ae97 ( #2997 )
...
+ ArrowButtonEx() internal bits.
2020-01-22 15:20:49 +01:00
Rokas Kupstys
7a22767483
CI: Add MSVC extra warnings build and correct labels of other extra warnings builds.
2020-01-22 14:17:03 +01:00
omar
f1b5c742ff
Viewports: Add various comments
2020-01-20 19:59:55 +01:00
omar
7e068da2bd
Docking: Internals: Renamed members from XxxxID to XxxxxId to be more consistent with rest of the codebase (still some inconsistency left that are harder to fix)
2020-01-20 19:29:25 +01:00
omar
3fe6ae9732
Internals: Move some Nav functions and members around (no functional change) + Misc comments
2020-01-20 18:19:03 +01:00
omar
0a3df4b2ce
Update FAQ.md
2020-01-20 14:28:01 +01:00
omar
15c6abe4be
Internals: Standard math functions default redirection uses a define instead of an extraneous inline function call
2020-01-20 11:48:17 +01:00
omar
8bcac7d95c
Backends: GLFW, SDL: report Windows key (io.KeySuper) as always released.
...
Neither GLFW nor SDL can correctly report the key release in every cases (e.g. when using Win+V) causing problems with some widgets. The next release of GLFW (3.4+) will have a fix for it. However since it is both difficult and discouraged to make use of this key for Windows application anyway, we just hide it. (#2976 )
2020-01-17 15:18:33 +01:00
omar
e499497ec5
Backends: Win32: Added support for io.KeySuper (Windows key) for consistency with other backends. ( #2976 )
...
Even if realistically it is difficult to make good use of under Windows.
+ Style editor: Use a more explicit form of RadioButton() to avoid being depending on underlying flags type. (#2983 )
2020-01-17 15:06:22 +01:00
omar
2478dbfdb7
Disable warning C5054 introduced in VS 2019 16.2 ( #2983 )
2020-01-17 14:18:16 +01:00
Loïc Molinari
6c00d1916e
Disable format checks when using stb_sprintf.h
...
STB sprintf allows extra formats like %b or %$d. If ImGui is configured
to use STB sprintf, it generates warnings with GCC and clang when using
such formats because it keeps applying default printf-style warnings.
This commit disables printf-style warnings when using STB sprintf.
Since the printf-style warnings are defined in imgui.h based on the
compiler, IMGUI_USE_STB_SPRINTF can't just be defined in the cpp file
anymore and it's been moved as a proper config in imconfig.h.
2020-01-17 13:27:51 +01:00
omar
aa34681652
Backends: GLFW: inhibit error callback when creating cursors because X11 setups may be missing them + comment ( #2980 )
2020-01-17 11:36:56 +01:00
omar
9ad4c5da7e
Fix zealous warnings + Internals: Renamed members from XxxxID to XxxxxId to be more consistent with rest of the codebase (still some inconsistency left that are harder to fix)
2020-01-16 23:44:05 +01:00
omar
f6d6880a61
Internals: Nav: PushFocusScope, PopFocusScope, GetFocusScopeID() helpers
2020-01-14 20:34:26 +01:00
omar
44174b1fa1
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
2020-01-14 20:01:27 +01:00
omar
2ebe08be40
Focus, Nav: Merged bits from RangeSelect features to enable early manipulation of focus scope for styling purpose.
...
FocusScopeId is tracked by nav scoring/request and stored in result.
It's all rather WIP and we should reorganize the SetNavIDXXX functions fiasco at some point (soon?).
Didn't separate FocusScope from SelectionScope for now, will re-investigate this later, this is the minimum commit to be able to do some styling.
2020-01-14 19:25:20 +01:00
omar
4f7bf7e96a
Backends: Win32: Added support for #define IMGUI_IMPL_WIN32_DISABLE_GAMEPAD and IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT. ( #2716 )
2020-01-14 14:58:36 +01:00
omar
e2eb0b4bc4
Internals: Begin tries to setup WindowTemp/DC members in same order as their declaration. Readme: remove Coverity banner (PVS is better)
2020-01-13 16:50:56 +01:00
omar
02c2d18aa3
Internals: Renaming and marking of legacy focus/tabbing system
2020-01-13 15:21:37 +01:00
omar
52334ad8df
Internals: Minor ordering/comments of ImGuiWindowTempData.
2020-01-13 15:04:28 +01:00
omar
f56962cb9a
ColorEdit: "Copy As" context-menu tool shows hex values with a '#' prefix instead of '0x' + both with/without alpha when available.
2020-01-13 14:09:42 +01:00
omar
ff5299e0e0
Docs: FAQ, Comments.
2020-01-12 22:09:18 +01:00
omar
4b3c5ff5f1
Comments + minor moving
2020-01-11 16:08:17 +01:00
Rokas Kupstys
f03c00bc89
Added imgui_single_file.h, We use this to validate compiling all *.cpp in same compilation unit.
...
Removed Unity builds stuff from example_null/. CI builds a temporary .cpp file.
2020-01-10 19:04:35 +01:00
Rokas Kupstys
97a8dc6514
CI: Added PVS-Studio static analysis on the continuous-integration server.
2020-01-10 16:58:39 +01:00
Rokas Kupstys
ae1e3619f6
Disable some PVS studio warnings.
...
V1048: While they are technically correct we want to emphasize assigned values must remain same.
2020-01-10 15:20:08 +01:00
omar
861f786d81
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2020-01-10 14:38:09 +01:00
omar
4ee7aa72e9
ButtonBehavior: Default assignment of pressed behavior now also test for ImGuiButtonFlags_PressedOnDragDropHold which wasn't the case before.
2020-01-10 14:35:03 +01:00
omar
1eb71fc72b
ButtonBehavior: Added ImGuiButtonFlags_PressedOnClickReleaseAnywhere behavior ( #2971 )
...
Rearranged flags. Added tests in 'widgets_button_press'
2020-01-10 14:34:15 +01:00
Rokas Kupstys
00c515f51a
Add glbinding build sample to Makefiles of GL3 examples. ( #2870 )
2020-01-09 16:26:42 +01:00
omar
f9630e60c5
Metrics: Fix not being able to expand "ParentWindow" when parent window is same as root window.
2020-01-07 21:32:00 +01:00
omar
1db78b8ca7
Renaming + missing initialization + missing Changelog update.
2020-01-07 21:26:16 +01:00
Rokas Kupstys
32c33c6659
ColorEdit: Preserve last saturation value when V=0. Disable Hue editing lock.
...
This workaround is no longer necessary because preserving hue value prevents it from resetting when it is edited in said condition.
2020-01-07 21:26:15 +01:00
Rokas Kupstys
f6951bb67d
Viewports: SDL2: Honor NoTaskBarIcon flag under non Win32 OS. ( #2117 )
2020-01-07 21:13:24 +01:00
Rokas Kupstys
5e2329b98e
Backends: GL3: Implement glbinding opengl loader support. ( #2870 )
2020-01-07 21:06:37 +01:00
Rokas Kupstys
e254167afd
ColorEdit: Fix label alignment when using ImGuiColorEditFlags_NoInputs. ( #2955 )
2020-01-06 16:26:14 +01:00
omar
d581939387
Removed trailing spaces.
2020-01-06 15:24:16 +01:00
omar
22d7f26e06
Tweak wording
...
Remove Patreon
2020-01-06 12:55:01 +01:00
omar
0dd02dd90d
Happy new year!
...
Comments, Replaced pictures, Removed Patreon
2020-01-06 12:41:37 +01:00
Zlatan Vasović
2b10e06555
Fix a typo
2020-01-04 17:29:51 +01:00
omar
3b1b5266e5
Docking: Fixed a bug where the tab bar of a hidden dockspace would keep requesting focus. ( #2960 )
2020-01-02 22:50:56 +01:00
omar
c163b856d7
Docking: Fix for IMGUI_DEBUG_INI_SETTINGS=1, comments
2020-01-02 22:35:29 +01:00
omar
dc66f83db8
Additional duplicated comments about usage of std::string and input text resize callback ( #2006 , #1443 , #1008 )
2019-12-25 17:46:35 +01:00
omar
07eb7adbb4
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-12-20 16:36:41 +01:00
omar
854fc08194
Amend f70204f2 to facilitate merges.
2019-12-20 16:34:07 +01:00
omar
061650bd2a
Update Readme
2019-12-19 22:14:28 +01:00
omar
4c108d22f0
Minor bits, placeholder aimed at facilitating merging of Tables branch into Docking
...
# Conflicts:
# imgui.cpp
2019-12-19 17:01:22 +01:00
omar
f70204f2f4
Minor bits, placeholder aimed at facilitating merging of Tables branch into Docking
2019-12-19 16:53:44 +01:00
omar
c706ff6f3a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2019-12-18 20:49:41 +01:00
omar
e01fb5462d
Internals: Separator: Simplify duplicated code.
2019-12-18 18:26:28 +01:00
omar
a610f1da52
Bezier Tweaks, fixed parameter order of 3831d50
2019-12-17 16:43:05 +01:00
Rokas Kupstys
3831d50ab9
Add ImBezierClosestPoint() function which returns a point on bezier curve which is closed to a specified point.
2019-12-17 16:22:02 +01:00
omar
0f7105e156
Backends: SDL: Wayland: Use SDL_GetMouseState (amend 78ff147) ( #2800 , 2802)
2019-12-17 14:35:45 +01:00
NeroBurner-tux
78ff147181
SDL: On wayland use SDL_GetMouseState ( #2802 )
...
When the SDL Video backend is set to wayland the function
`SDL_GetGlobalMouseState` does not work. Most probably a security measure
for programs to not grab everything the user does
https://wiki.libsdl.org/SDL_GetGlobalMouseState
using SDL_GetMouseState https://wiki.libsdl.org/SDL_GetMouseState works
on wayland
2019-12-17 14:33:36 +01:00
omar
9d444062f9
Limiting Columns()/BeginColumns() api to 64 columns ( #125 )
...
While the current code technically supports it, future code may not so we're putting the restriction ahead.
2019-12-17 13:25:46 +01:00
omar
10fdc03a46
Clarification about Im helpers + moving GetColorXXX functions outside of that block.
2019-12-17 13:19:36 +01:00
omar
992736dc5d
Merge branch 'refs/heads/master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
2019-12-13 17:06:27 +01:00
omar
3a800f2dc9
DragFloat: Mention usage of FLT_MAX, INT_MAX etc. explicitly. ( #2931 )
2019-12-13 11:56:51 +01:00
omar
43bd80a40d
Internals: Breaking: ImRect() default constructor initializes all fields with 0.0f
...
Instead of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). Previous behavior was designed for adding into a bounding box but rarely relied on and not worth it.
2019-12-13 11:56:00 +01:00
omar
6fdde67be2
Documentation, FAQ, todo tweaks
2019-12-10 13:37:29 +01:00
Ben Carter
0e74103659
ImDrawList: Add AddNgon(), AddNgonFilled() API.
2019-12-09 11:23:06 +01:00
omar
f9c26d23de
Removed redirecting functions/enums that were marked obsolete in 1.53 (December 2017).
...
Comments
2019-12-08 16:38:27 +01:00
omar
e42c1e1668
Exposed IMGUI_DEBUG_PARANOID in imconfig.h + using a #define with no value to match other uses in imconfig.h
2019-12-08 16:12:44 +01:00
Ben Carter
697f15e339
Added PrimUnreserve() API. Obsoleted calling ImDrawList::PrimReserve() with a negative count.
2019-12-08 16:06:32 +01:00
omar
e4a59d0025
TabItem: honor ImGuiTabItemFlags_NoCloseButton passed as parameter (although undocumented and part of private api) ( #2923 )
2019-12-07 16:22:07 +01:00
omar
f656e7775e
Inputs: Added ImGuiMouseButton enum for convenience (e.g. ImGuiMouseButton_Right=1).
...
We forever guarantee that the existing value will not changes so existing code is free to use 0/1/2.
2019-12-06 16:29:36 +01:00
omar
6cbed03d4a
Comments, clarified mouse button ordering.
2019-12-06 16:29:32 +01:00
Rokas Kupstys
03b7170dac
Backends: GLFW: Added workaround for people who use development version of GLFW which is older than commit that added required cursor support. ( #2922 )
2019-12-06 15:12:26 +01:00
omar
7ff13f4ee1
Examples: Explicitly adding -DIMGUI_IMPL_OPENGL_LOADER_GL3W to Makefile to match linking settings
...
(otherwise if another loader such as Glew is accessible, the opengl3 backend might automatically use it). [#2919 , #2798 ]
2019-12-06 10:43:27 +01:00
omar
b521cd357d
Removed implicit default parameter to IsMouseDragging(int button = 0) to be consistent with other mouse functions.
...
(none of the other functions have it).
2019-12-05 18:33:36 +01:00
Max Thrun
6d9a54a904
Examples: Metal: Wrap main event loop body in an @autoreleasepool block to ensure allocations get freed even if underlying system event loop gets paused due to app nap ( #2910 , #2917 )
2019-12-05 15:50:33 +01:00
omar
8342e5b91a
Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4)
...
Amend b5cad20d79 , 945a509773
+ unrelated minor typos
2019-12-05 15:45:30 +01:00
Rokas Kupstys
945a509773
Implement ImGuiMouseCursor_NotAllowed mouse cursor.
2019-12-05 15:32:10 +01:00
Rokas Kupstys
b5cad20d79
Implement new GLFW 3.4 resizing cursors.
2019-12-05 15:27:09 +01:00
omar
927580d4a8
Docking: Cleanup, rename DockNodePreviewDockCalc() -> DockNodePreviewDockSetup()
2019-12-04 23:06:36 +01:00
omar
abaf0256b8
Version 1.75 WIP
...
Added message to font file loading assert.
2019-11-28 20:58:16 +01:00
omar
a1e4af62d3
Docking: Fix bug added in 71a58261 + Misc docking omments
2019-11-28 20:52:46 +01:00
omar
28dd8d7efd
Docking: Fixed various conflicts not properly resolved on 813e0c1
...
New git client confusion.
2019-11-27 19:27:44 +01:00
omar
4dff49b2f1
Docking, Viewports: Moving code.
...
Moved NewFrame() sanity checks in NewFrameSanityChecks().
Moved some of DockNodeUpdate() into DockNodeUpdateForRootNode().
2019-11-27 19:13:15 +01:00
omar
71a58261f6
Docking: Internals: Removed redundancy in code path leading to the BeginAsDockableDragDropSource(), clarified UpdateMouseMovingWindowEndFrame()
...
Note that the ConfigWindowsMoveFromTitleBarOnly path for UpdateMouseMovingWindowEndFrame() would previously test the window->RootWindow title bar instead of window->RootWindowDockStop. This didn't have any side effect afaik because we wouldn't enter that function anyway as clicking on any tab bar would trigger the move before UpdateMouseMovingWindowEndFrame() does it. However for consistency made the UpdateMouseMovingWindowEndFrame()code more correct.
+ minor renaming
2019-11-27 18:57:01 +01:00
Rokas Kupstys
bf6d1ba3d1
CI: Add 32/64 bit build variations to builds with extra warnings.
2019-11-27 16:20:19 +01:00
Rokas Kupstys
1742ca45c5
CI: Add unity builds test. ( #2893 )
2019-11-27 16:18:52 +01:00
omar
8d1b82d596
Docking: Internals: Rename StartMouseDragFromTitleBar() -> StartMouseMovingWindowOrNode(), clarify.
2019-11-27 15:51:15 +01:00
omar
a8092085b1
Internal: Added unused parameter named to facilitate cimgui parsing of imgui_internal.h
...
https://github.com/cimgui/cimgui/issues/108
2019-11-27 14:02:05 +01:00
omar
3096e7a9cd
Viewports: Preserve last known size for minimized main viewport to be consistent with secondary viewports.
...
Amend 606175b9 , d8ab2c1a .
However becomes inconsistent with viewport-enabled setup. Should report some of that logic in master, need back-end rework.
2019-11-26 21:02:28 +01:00
omar
1c3a9c8e74
Docking: Remove Size > 0.0f asserts added in 718e15c7 and 7c183dc6. ( #2690 , #2109 , #2906 )
...
In #2906 the zero input came from a minimized viewport, but even without it we cannot prevent DockNode size from eventually reaching zero as padding are taken from the starting size.
In a separate commit we'll however shortcut some of the existing codepath on zero-sized viewport to reduce the likehood of lossy side-effects (just like we don't call ClampWindowRect in Begin)
2019-11-26 20:25:54 +01:00
omar
f60518b430
Update FAQ.md
2019-11-26 16:28:49 +01:00
omar
813e0c18e6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-11-26 12:23:43 +01:00
omar
bdce833636
Version 1.74
2019-11-25 18:38:53 +01:00
omar
26d177bc03
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
2019-11-25 18:29:28 +01:00
Rokas Kupstys
1615e9ea2a
CI: Enable extended warnings in example_null builds.
...
CI: Add MinGW build with extra warnings on windows.
(cherry picked from commit ebc98c273054d0f9b305a1346db98052616a8b21)
2019-11-25 16:38:21 +01:00
omar
bbe0409942
Metrics: Show wire-frame mesh and approximate surface area when hovering ImDrawCmd. Amend aeb5795.
...
Internals: Added ImTriangleArea()
2019-11-25 12:01:04 +01:00
Ben Carter
aeb57952d6
Added area calculation for draw lists in metrics
...
Added ability to hover over a draw list's summary stats and see all the contents in wireframe
(cherry picked from commit fd808347bd68a07ad318af6c151028bc9f7b82e7)
2019-11-25 11:10:00 +01:00
omar
0cb1c633ff
Demo: tweaked demo help section, reference to "Examples" and "Tools". Reference to Keyboard navigation. Removed some of the more "obvious/standard" controls.
2019-11-24 23:11:53 +01:00
omar
3a82994429
Docking: Can undock from the small triangle button. (#2109,. #2645 )
2019-11-22 23:12:16 +01:00
omar
106184bbea
Docking: Fixed node->HasCloseButton not honoring ImGuiDockNodeFlags_NoCloseButton in a floating node, leading to empty space at the right of tab-bars with those flags. ( #2109 )
2019-11-22 23:11:21 +01:00
omar
b205ab01f2
Internals: Added IM_ASSERT_PARANOID, IMGUI_DEBUG_PARANOID define. Shuffled a bit of the macros section in imgui_internal.h
2019-11-22 14:45:44 +01:00
omar
51e2e9b239
ImVector: Added shrink() helper. ImFont::RenderText minor optimisation for debug build. Misc: Metrics shows tab names because we now have them.
2019-11-22 14:06:51 +01:00
omar
51a02b319c
Added IM_UNICODE_CODEPOINT_MAX. Changed specs of ImFontAtlas::AddCustomRectRegular() (breaking change).
2019-11-21 14:13:17 +01:00
omar
ca63349eb4
Renamed XX-bits -> XX-bit in comments to match what the world appears to be using.
2019-11-20 11:58:25 +01:00
omar
a899c1e570
Internals: Using ImU64 for internal ImFile api so we can later wrap them to fseeko/ftello//_fseeki64/_ftelli64 ( #2734 )
2019-11-20 10:40:14 +01:00
omar
ecbedc8c26
Tweaks, ammend 93efa54, rename to IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS ( #1038 )
2019-11-19 21:29:12 +01:00
omar
4e90906b04
Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734 )
...
Using in Emscripten example.
2019-11-19 21:14:44 +01:00
omar
93efa5415f
Renamed IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS to IMGUI_DISABLE_DEFAULT_FORMAT_STRING_FUNCTIONS. ( #1038 )
...
Renamed IMGUI_DISABLE_MATH_FUNCTIONS to IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS.
2019-11-19 20:53:17 +01:00
omar
9efaf2828b
Doc comments. Removed .ini parsing code from 1.53 that parsed entries without the [Window] tag (which enabled importing an old .ini file)
2019-11-19 19:39:46 +01:00
omar
3895363432
Merge branch 'master' into docking inc alter GetWindowResizeID
...
# Conflicts:
# imgui.cpp
2019-11-18 13:58:50 +01:00
omar
ca30ef4269
Drag and drop: Increase local payload buffer from 8 to 16 bytes.
2019-11-15 18:36:06 +01:00
omar
7e232092a6
Internals: Added GetWindowResizeID(), renamed GetScrollbarID() to GetWindowScrollbarID(). Using integer for resize ID so they matches regardless of the pointer size.
...
Internals: Renamed IMGUI_USER_ERROR to IM_ASSERT_USER_ERROR().
2019-11-15 16:59:43 +01:00
omar
a1e43c682a
Merge branch 'master' into docking (with fixes)
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-11-15 15:32:36 +01:00
Tracy Ma
8f40020ca6
Disable Win32 clipboard and IME functions when build target UWP ( #2892 , #2895 )
2019-11-15 12:19:44 +01:00
omar
be05e12e21
Misc: Using static_assert() when using C++11, instead of our own construct (avoid zealous Clang warnings).
2019-11-14 18:02:18 +01:00
omar
b23dcab6e1
Fix 25eee91 incorrect assert when ending a child-popup (rarely used but used by sub-nenus)
2019-11-14 16:06:39 +01:00
omar
be436e2b0b
Fix HelpMarker() symbol collision for unity builds ( #2893 )
2019-11-13 22:04:16 +01:00
omar
03852470de
Internals: Routing recoverable user errors via IMGUI_USER_ERROR() macro. ( #1651 )
2019-11-13 21:58:18 +01:00
omar
25eee91542
Error handling: Assert if user mistakenly calls End() instead of EndChild() on a child window. ( #1651 )
...
Internals: Moved some error handling code.
2019-11-13 21:51:38 +01:00
omar
b138f8cbcd
Internal: Nav rename preparing for nav inputs ownership changes. IsNavInputPressed() -> IsNavInputTest()
2019-11-13 21:02:25 +01:00
omar
7c441e37fa
CI: Update jobs to MacOS latest (Catalina)
...
Metrics: Added description to Item Picker.
2019-11-13 20:34:55 +01:00
omar
c3fd4ae473
Docking: comments
2019-11-12 11:06:02 +01:00
omar
6e8e2c0fa9
Scrollbar: Fixed an issue where scrollbars wouldn't display on the frame following a frame where all child window contents would be culled.
...
Demo: Fixed a small bug with scrolling demo.
Metrics: Tweaks.
2019-11-08 19:01:54 +01:00
omar
69b5c2f541
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-11-08 15:45:12 +01:00
omar
57dc34f4e8
TreeNode: Added IsItemToggledOpen() to explicitly query if item was just open/closed, facilitating interactions with custom multi-selections patterns. ( #1896 , #1861 )
2019-11-08 15:30:15 +01:00
omar
011d475532
TreeNode: The collapsing arrow accepts click even if modifier keys are being held, facilitating interactions with multi-select patterns. ( #2886 , #1896 , #1861 )
2019-11-08 15:30:15 +01:00
omar
037126ee0e
TreeNode: Reworded code for ImGuiTreeNodeFlags_OpenOnArrow (follow up to f79b2d6c) to make it lightweight. Should be a no-op from user's point of view. Will facilitate using the arrow hovering information in the hot path. ( #2886 )
2019-11-08 15:00:28 +01:00
omar
d003674f2c
Internals: Added ImChunkStream, used by window settings. (more generic followup to 4c13807, the class will be used more extensively by Tables)
2019-11-07 16:05:03 +01:00
omar
a337e219b6
Internals: ImPool: Renaming.
2019-11-07 16:04:51 +01:00
omar
28f1d60de1
Internals: Renaming + added ImStrSkipBlank() from docking branch.
...
(cherry picked from commit a573943fa0ce323ffb4080e57f5e8fe1bc777c36)
2019-11-06 23:37:35 +01:00
omar
09b2310237
Internals: Added index of helpers and shuffled a few things.
2019-11-06 20:37:47 +01:00
omar
4c13807b7d
Misc: Optimized storage of window settings data (reducing allocation count).
2019-11-05 22:43:53 +01:00
omar
3929255b77
Examples: Emscripten: Removed BINARYEN_TRAP_MODE=clamp from Makefile which was removed in Emscripten 1.39.0 but required prior to 1.39.0, making life easier for absolutely no-one. ( #2877 , #2878 ) [@podsvirov]
2019-11-05 12:53:30 +01:00
Konstantin Podsvirov
916487a653
example_emscripten: skip outdated compiler option
...
For more info see: https://github.com/ocornut/imgui/issues/2877
2019-11-05 12:43:15 +01:00
omar
bff2d5d5e2
Update README.md
2019-11-05 11:41:02 +01:00
omar
a704614b3e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
2019-11-04 16:33:57 +01:00
Rokas Kupstys
c9182424a8
Normalize all the line endings.
...
(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319)
2019-11-04 15:28:31 +01:00
Rokas Kupstys
c9ffa62e1f
Add .gitattributes with rules for line endings of files.
...
(cherry picked from commit f2a2be72b341f55c44a035b1257177d83489ea5c)
2019-11-04 15:28:25 +01:00
Rokas Kupstys
bcd752cfcc
CI: Fix emscripten builds after portable SDK archive became unavailable.
...
(cherry picked from commit 14b18697e653de80f75af18113033b2086846194)
2019-11-04 15:17:06 +01:00
omar
792a8631aa
Metrics: Expose basic details of each window key/value state storage.
2019-10-31 14:01:35 +01:00
omar
8fee5a4349
Internals: Renaming for consistency.
2019-10-31 11:15:40 +01:00
Rokas Kupstys
5006639526
CI: Add scheduled builds and limit some examples to build only on schedule in order to decrease time of builds performed on each push.
...
(cherry picked from commit 6c0e1baca29b853586dadf75eb32ef75e2725f10)
2019-10-30 15:58:03 +01:00
Rokas Kupstys
5ebd4e4c6e
CI: Install SDL SDK in windows workers and add SDL examples to the build.
...
CI: Add Vulkan GLFW and SDL builds to windows build job.
2019-10-30 15:58:03 +01:00
Rokas Kupstys
a4420be1a2
CI: Split builds of examples into separate jobs.
...
(cherry picked from commit ee73b1b5a47f176ab123239aa3cbcc2cdf284383)
2019-10-30 15:57:16 +01:00
Rokas Kupstys
9f979c33f4
CI: Fix builds failing because of missing v140 toolset and SDK on dx12 sample.
...
(cherry picked from commit 8d91a77e9b42eac7a6d7d28c8563ccc468842e8b)
2019-10-30 15:57:09 +01:00
omar
d62a413476
Misc: Windows: Do not use _wfopen() if IMGUI_DISABLE_WIN32_FUNCTIONS is defined. ( #2815 )
2019-10-29 21:47:43 +01:00
omar
6024051a2f
Viewport: Fixed 32380a0 ( #2876 )
2019-10-29 21:18:01 +01:00
omar
b3e94f5de8
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
2019-10-29 17:21:19 +01:00
stfx
6bf5aed325
Declaration and assignment can be joined, Member function may be 'const'. ( #2875 )
2019-10-29 17:11:49 +01:00
Rokas Kupstys
c863c1f6a1
Clean up number rounding. Now it is more obvious what code is doing. ( #2862 )
...
Add IM_ROUND() macro
Replace IM_FLOOR(n + 0.5f) and ImFloor(n + 0.5f) with IM_ROUND(n)
2019-10-29 17:05:25 +01:00
omar
32380a0112
Viewport: Store current dpi scale in context.
2019-10-29 16:43:11 +01:00
Sam Hocevar
0b2d35f63f
Fix snprintf and vsnprintf definition inconsistencies.
2019-10-28 13:58:32 +01:00
omar
4e56de757c
Doc: Promote Discord over Discourse. Obsoleting Discourse server.
2019-10-25 15:36:37 +02:00
omar
f002a11898
Backends: OpenGL3: Fix building with pre-3.2 GL bindings which do not expose glDrawElementsBaseVertex(), using runtime GL version to decide if we set ImGuiBackendFlags_RendererHasVtxOffset. ( #2866 , #2852 ) [@dpilawa]
2019-10-25 11:56:44 +02:00
dawid
4d0c88e9e6
Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. ( #2866 , #2852 )
2019-10-25 11:42:55 +02:00
omar
664fb38e39
Docking: child windows don't use style.ChildRounding.
2019-10-25 11:13:51 +02:00
omar
9b323a7ebf
SplitterBehavior: not using FrameRounding in render (was in first commit of the function, not sure why). ( #319 )
2019-10-25 11:05:14 +02:00
omar
0cbb96895a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx12.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
2019-10-24 15:11:37 +02:00
omar
3c238ecae3
Move issue_template and pull_request_template to .github folder.
2019-10-24 11:26:45 +02:00
Rokas Kupstys
d5b5a81946
GitHub Actions CI script for Windows/Linux/MacOS/iOS/Emscripten builds.
2019-10-24 11:24:54 +02:00
Rokas Kupstys
24e9a6e92c
Remove .travis.yml due to switching to github actions.
2019-10-24 11:24:54 +02:00
omar
ec0e953cca
Fixed a couple of subtle bounding box vertical positioning issues relating to text baseline alignment.
...
The issue would generally manifest when laying out multiple items on a same line, with varying heights and text baseline offsets. (#2833 )
Some specific examples, e.g. a button with regular frame padding followed by another item with a multi-line label and no frame padding, such as: multi-line text, small button, tree node item, etc. The second item was correctly offset to match text baseline, and would interact/display correctly,but it wouldn't push the contents area boundary low enough.
Note: previously the second parameter to ItemSize() was 0.0f was default, now -1.0f to signify "no text baseline offset request". If you have code using ItemSize() with an hardcoded zero you may need to change it. (+1 squashed commits)
2019-10-23 18:05:44 +02:00
Funto
75d540d336
Example: Emscripten: Fix for compilation (filesystem module is required) ( #2734 )
2019-10-23 16:55:26 +02:00
Alexey
be9f1e8f00
ColorPicker: Fixed SV triangle gradient to block (broken in 1.73). ( #2864 , #2711 ). [@lewa-j]
2019-10-23 00:43:40 +02:00
omar
23c1ff4907
Removed redirecting functions/enums names that were marked obsolete in 1.52 (October 2017).
...
- Begin() [old 5 args version] -> use Begin() [3 args], use SetNextWindowSize() SetNextWindowBgAlpha() if needed
- IsRootWindowOrAnyChildHovered() -> use IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows)
- AlignFirstTextHeightToWidgets() -> use AlignTextToFramePadding();
- SetNextWindowPosCenter() -> use SetNextWindowPos() with a pivot of (0.5f, 0.5f)
- ImFont::Glyph -> use ImFontGlyph
If you were still using the old names, read "API Breaking Changes" section of imgui.cpp to find out the new names or equivalent features, or see how they were implemented until 1.73.
2019-10-22 14:45:11 +02:00
omar
048b73dfaa
Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.
2019-10-21 20:57:07 +02:00
omar
7b77cb3bb8
Backend: DX12: Fixed incorrect assert ( #2851 )
2019-10-21 13:38:33 +02:00
omar
7dbae8a198
Doc: Simplified Readme, removed FAQ index
2019-10-21 13:26:47 +02:00
omar
6ffee0e75e
Backends: DX12: Added extra ID3D12DescriptorHeap parameter to ImGui_ImplDX12_Init() function. The value is unused in master branch but will be used by the multi-viewport features (docking branch). ( #2851 )
...
+ Using SafeRelease() in master.
2019-10-18 18:32:48 +02:00
omar
6faad0c34f
Backend: DX12: Amend 899e485. Fix memory leaks. Remove unused variable. ( #2851 )
...
(cherry picked from commit 39e2db6d94c295e7468c6a5fb39d247c641fb123)
2019-10-18 18:21:44 +02:00
Ilya.Sevrikov
05c1f2795a
Add multi-viewports for DX12. ( #2851 )
...
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
2019-10-18 18:21:35 +02:00
omar
eedc8f993f
Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled.
2019-10-18 18:20:53 +02:00
omar
7feccf9ab2
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
2019-10-18 16:50:30 +02:00
malte-v
4de32cc87e
Backends: GLFW: Restore previously installed user callbacks in ImplGlfw when ImGui shuts down ( #2836 )
2019-10-18 16:27:40 +02:00
Rokas Kupstys
714fe29d1a
Replace manual flooring with IM_FLOOR() macro. ( #2850 )
...
Macro is used to ensure that flooring operation is always inlined even in debug builds. __forceinline does not force inlining in /Od builds with MSVC.
(cherry picked from commit bc165df6fd7969605bbc07b8a6d3d28f9109e8f3)
2019-10-18 16:18:38 +02:00
omar
53278be61f
FAQ, Readme. Use = {} instead of = { 0 }, wasn't problematic because they were all static variables or one stack array not read. But hey.
2019-10-18 16:18:05 +02:00
omar
9994f5bcbe
Fixed more FAQ links, oops.. ( #2848 )
2019-10-16 11:28:45 +02:00
omar
3bbc27ebd9
Fixed more FAQ links. ( #2848 )
2019-10-16 11:23:15 +02:00
omar
5fc427a49e
Improved and moved FAQ to docs/FAQ.md so it can be readable on the web. ( #2848 )
2019-10-16 11:04:00 +02:00
Rokas Kupstys
9d6b2b096b
Ignore directories created by JetBrains IDEs.
...
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
2019-10-15 17:15:45 +02:00
Rokas Kupstys
6892b81578
Remove trailing spaces from bunch of files.
...
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
2019-10-15 16:04:02 +02:00
omar
c21fdabb43
Doc: Readme: moving contents to FAQ.
2019-10-15 14:21:44 +02:00
omar
a41f0b2df4
Inputs: Fixed a miscalculation in the keyboard/mouse "typematic" repeat delay/rate calculation, used by keys and e.g. repeating mouse buttons as well as the GetKeyPressedAmount() function.
...
IMPORTANT: Renamed internal CalcTypematicPressedRepeatAmount to CalcTypematicRepeatAmount and reordered the t1, t0 arguments to t0, t1 !!
If you were using a non-default value for io.KeyRepeatRate (previous default was 0.250), you can add +io.KeyRepeatDelay to it to compensate for the fix. The function was triggering on: 0.0 and (delay+rate*N) where (N>=1). Fixed formula responds to (N>=0).
Effectively it made io.KeyRepeatRate behave like it was set to (io.KeyRepeatRate + io.KeyRepeatDelay).
Fixed the code and altered default io.KeyRepeatRate,Delay from 0.250,0.050 to 0.300,0.050 to compensate.
If you never altered io.KeyRepeatRate nor used GetKeyPressedAmount() this won't affect you.
2019-10-14 23:07:06 +02:00
omar
c7bdec7e18
InputText, Nav: Fixed Left!Right keys broken when activating Keyboard Navigation. ( #787 ) Amend 892dfb1
2019-10-14 22:43:04 +02:00
omar
67e4cd5cc6
Comments, some logging for NavInitRequest debugging Moved OpenPopupOnItemClick() next to BeginPopupContextItem()
2019-10-14 15:54:11 +02:00
omar
8c4dcbfa45
Diligent Engine
2019-10-12 17:56:32 +02:00
omar
23eabd5991
Emscripten
2019-10-12 17:41:56 +02:00
omar
58411033e2
Bindings
2019-10-12 17:21:11 +02:00
omar
1c73a0c17e
Bindings
2019-10-12 17:18:44 +02:00
omar
cba84df7b5
Update README.md
2019-10-12 17:05:08 +02:00
omar
aeb6481499
InputText: Filter out Ascii 127 (DEL) emitted by low-level OSX layer, as we are using the Key value. ( #2578 )
2019-10-12 14:27:37 +02:00
omar
fc10ba8d24
Amend f0238ece9cba67ecabef438008fea53682bd6bc7 ( #2817 , #2818 )
2019-10-11 14:20:04 +02:00
Egor Yusov
378035c6ff
Fixed backspace handling on MacOS (fixed https://github.com/ocornut/imgui/issues/2817 ).
...
Allow null view passing as parameter to ImGui_ImplOSX_NewFrame
2019-10-11 14:17:07 +02:00
omar
bf746c4215
DragScalar, SliderScalar, InputScalar: Added p_ prefix to parameter that are pointers to the datato clarify how they are used, and more comments redirecting to the demo code. ( #2844 )
2019-10-11 12:04:28 +02:00
omar
bf4880f6a2
Merge branch 'master' into docking
2019-10-07 19:14:37 +02:00
omar
927472f5ff
Combo: Added _NoMove flag to prevent window from docking, which has an effect in Docking branch (in Master was not noticeable as the Combo code kept repositioning the window). ( #2835 )
2019-10-07 19:14:08 +02:00
omar
3b271b1847
Demo: Added simple item reordering demo in Widgets -> Drag and Drop section. ( #2823 , #143 ) [@rokups]
2019-10-07 17:52:31 +02:00
omar
8aad3482a4
ImVector: Fixed index_from_ptr() not asserting when passed end() element.
2019-10-07 17:22:55 +02:00
Harris Brakmic
323412dd23
Examples: Allegro5: updated build instructions for macOS
2019-10-07 15:52:09 +02:00
omar
73fa6509a5
Internal: InputTextEx: tweaked a bit of code (should be a no-op)
2019-10-05 16:57:12 +02:00
omar
f1f321d3f6
Update README.md
2019-10-05 16:07:00 +02:00
omar
e0c0e53edf
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-10-04 19:22:42 +02:00
omar
ee3373d067
TreeNode: Fixed combination of ImGuiTreeNodeFlags_SpanFullWidth and ImGuiTreeNodeFlags_OpenOnArrow incorrectly locating the arrow hit position to the left of the frame. ( #2451 , #2438 , #1897 )
2019-10-04 19:21:29 +02:00
domgho
ccb2a947a2
Internal: SliderBehaviorT: Condition '!is_decimal' is always true ( #2828 )
2019-10-04 11:57:20 +02:00
omar
1425bec7a4
Demo: Text baseline demo tweaks.
2019-10-03 18:30:42 +02:00
omar
a6c3be4bda
Internals: Tweaks to ItemSize() should be harmless. Added DebugDrawItemRect() helper.
2019-10-03 18:30:41 +02:00
omar
892dfb1dea
InputText, Nav: Fixed Home/End key broken when activating Keyboard Navigation. ( #787 )
...
Small refactor of ActiveIdUsingXXX inputs flags toward a little more consistent system. (#2637 )
2019-10-02 15:57:36 +02:00
omar
a2f3dcfc97
Added comment about SDL and SDL_INIT_GAMECONTROLLER. ( #2809 )
2019-10-02 11:40:03 +02:00
Denys Nahurnyi
893056a209
Fix syntax typos in README ( #2819 )
2019-10-01 21:49:44 +02:00
omar
eb5223276c
Update README.md
2019-09-30 20:54:37 +02:00
omar
0dad3f436b
Fix harmless float calculation overflow. ( #2813 )
2019-09-30 15:16:30 +02:00
omar
c262276988
Version 1.74 WIP
2019-09-30 14:27:56 +02:00
Konstantin Podsvirov
f0f5301612
Backends: OpenGL3: Commented out extra tokens at end of #else directive ( #2804 )
2019-09-25 00:06:14 +02:00
omar
688cf868ea
Merge branch 'master' of https://github.com/ocornut/imgui
2019-09-24 17:15:48 +02:00
omar
6994bf10bc
Merge branch 'master' into docking + fix for RenderMouseCursor()
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
2019-09-24 17:14:51 +02:00
omar
d5efe16157
Version 1.73
2019-09-24 17:02:26 +02:00
omar
293f74e996
Update README.md
2019-09-24 16:00:53 +02:00
omar
664f9e76b9
Documentation: Various tweaks and improvements to the README page. [@ker0chan]
2019-09-24 15:46:08 +02:00
goran-w
e100523917
CollapsingHeader: Added support for ImGuiTreeNodeFlags_Bullet and ImGuiTreeNodeFlags_Leaf on framed nodes. ( #2159 , #2160 )
...
The Bullet and Leaf ImGuiTreeNodeFlags are now taken into account for Framed/CollapsingHeader tree nodes as well. TreeNodeEx() can be used to specify these flags. A choice was made to left-adjust the Framed text when no Bullet/Arrow is rendered, since this was deemed to look better in the Framed context (especially when considering that CollapsingHeader is drawn using NoTreePushOnOpen, so child/sibling Text items etc will often be non-indented).
2019-09-24 12:48:49 +02:00
omar
ca858c084b
Demo tweaks. Comments. Compacting the rarely used AutoFitXXX fields in ImGuiWindowTempData.
2019-09-23 20:15:25 +02:00
omar
52deb415e0
Internal: Refactored internal RenderMouseCursor so colors can be specified. ( #2614 )
2019-09-23 14:53:49 +02:00
omar
25849234f6
Internal: Tree: tweaks (initially tried to implement auto-scrolling, stashed)
2019-09-23 13:11:38 +02:00
omar
97691643b7
Backends: OpenGL3: Attempt to automatically detect default GL loader by using __has_include. Followup to 44cd8e3 ( #2798 )
2019-09-22 23:19:04 +02:00
osheriff
44cd8e39da
Automatically include the available gl loader header
2019-09-22 22:51:09 +02:00
omar
3233d85d2f
Merge branch 'master' into docking
2019-09-22 22:16:11 +02:00
omar
80b3ab7d3e
TabBar: Fixed single tab shrinking reducing the tab to 0.0f size. Broken by a856c670c1.
2019-09-22 22:16:05 +02:00
omar
f47a0a85cc
ImVector: added find, find_erase, find_erase_unsorted helpers.
2019-09-22 19:06:20 +02:00
omar
eab03f4467
Selectable: Added ImGuiSelectableFlags_AllowItemOverlap flag in public api (was previously internal only).
2019-09-22 19:03:51 +02:00
omar
13f00331da
Docking: Added ImGuiDockNodeFlags_NoDocking flag. ( #2109 )
2019-09-21 14:50:02 +02:00
omar
a45e3b5bb3
Readme, Wiki: Image loading examples.
2019-09-20 19:04:19 +02:00
omar
f7468d05fe
Fixed mouse event forwarding in macos example ( #2710 , #1961 )
2019-09-20 15:48:51 +02:00
omar
38d22bc47d
ColorPicker / ColorEdit: restore Hue when zeroing Saturation. ( #2722 , #2770 ) - changelog, fixed uninitialized variables, tweaks, renaming.
2019-09-20 15:31:39 +02:00
Rokas Kupstys
accb0261b8
ColorPicker / ColorEdit: restore Hue when zeroing Saturation. ( #2722 , #2770 )
...
Issue is fixed by storing last active color picker color and last hue value when active color picker takes rgb as input. Then if current color picker color matches last active color - hue value will be restored. IDs are not used because ColorEdit4() and ColorWidget4() may call each other in hard-to-predict ways and they both push their own IDs on to the stack. We need hue restoration to happen in entire stack of these widgets if topmost widget used hue restoration. Since these widgets operate on exact same color value - color was chosen as a factor deciding which widgets should restore hue.
2019-09-20 15:31:15 +02:00
omar
af93c21cf9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-09-18 17:27:14 +02:00
omar
656c515bad
Warning fix.
2019-09-18 17:21:04 +02:00
omar
9d02ed51e3
TreeNode: Added ImGuiTreeNodeFlags_SpanAvailWidth and ImGuiTreeNodeFlags_SpanFullWidth flags ( #2451 , #2438 , #1897 )
...
Added demo bits.
2019-09-18 17:13:41 +02:00
omar
74e01e62ce
Fixed unused static function warning for some compilers. ( #2793 )
2019-09-18 13:21:12 +02:00
omar
098591fe4c
ImDrawListSplitter: fixed an issue merging channels if the last submitted draw command used a different texture. ( #2506 )
2019-09-17 20:27:15 +02:00
omar
cf98290873
Backends: DirectX9: Workaround for windows not refreshing when main viewport has no draw call. ( #2560 )
2019-09-17 18:32:26 +02:00
omar
1ca6ff974c
Viewport: fix to allow multiple shutdown / calls to DestroyPlatformWindows(). ( #2769 )
2019-09-17 18:02:58 +02:00
omar
575df6f192
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
2019-09-17 16:35:50 +02:00
omar
b48dc067ae
Style: Allow style.WindowMenuButtonPosition to be set to ImGuiDir_None to hide the collapse button. ( #2634 , #2639 )
...
+ Fix #2775
2019-09-17 16:33:15 +02:00
omar
3b014d0c31
Merge branch 'features/ellipsis_rendering'
...
# Conflicts:
# imgui.cpp
2019-09-17 12:07:30 +02:00
omar
3f986e72d9
Internal: Offset STB_TEXTURE_K_ defines to remove that change from #2541 + sponsors update.
2019-09-17 12:06:31 +02:00
omar
7d5a17e5e4
Remove trailing spaces (grep for ' \r?$' in visual studio)
2019-09-17 11:33:18 +02:00
omar
1c951dca97
Font: Narrow ellipsis: once we know an ellipsis is going to be drawn, we can claim the space between pos_max.x and ellipsis_max.x which gives us enough extra space to not requires the further (and otherwise valid) optimizations. Gets us vastly simplified code, yay. ( #2775 )
2019-09-17 11:14:46 +02:00
omar
57623c15dd
Font: Narrow ellipsis: various minor stylistic tweaks ( #2775 )
2019-09-17 11:13:34 +02:00
Rokas Kupstys
45405f0dc9
Font: implement a way to draw narrow ellipsis without relying on hardcoded 1 pixel dots. ( #2775 )
...
This changeset implements several pieces of the puzzle that add up to a narrow ellipsis rendering.
## EllipsisCodePoint
`ImFontConfig` and `ImFont` received `ImWchar EllipsisCodePoint = -1;` field. User may configure `ImFontConfig::EllipsisCodePoint` a unicode codepoint that will be used for rendering narrow ellipsis. Not setting this field will automatically detect a suitable character or fall back to rendering 3 dots with minimal spacing between them. Autodetection prefers codepoint 0x2026 (narrow ellipsis) and falls back to 0x0085 (NEXT LINE) when missing. Wikipedia indicates that codepoint 0x0085 was used as ellipsis in some older windows fonts. So does default Dear ImGui font. When user is merging fonts - first configured and present ellipsis codepoint will be used, ellipsis characters from subsequently merged fonts will be ignored.
## Narrow ellipsis
Rendering a narrow ellipsis is surprisingly not straightforward task. There are cases when ellipsis is bigger than the last visible character therefore `RenderTextEllipsis()` has to hide last two characters. In a subset of those cases ellipsis is as big as last visible character + space before it. `RenderTextEllipsis()` tries to work around this case by taking free space between glyph edges into account. Code responsible for this functionality is within `if (text_end_ellipsis != text_end_full) { ... }`.
## Fallback (manually rendered dots)
There are cases when font does not have ellipsis character defined. In this case RenderTextEllipsis() falls back to rendering ellipsis as 3 dots, but with reduced spacing between them. 1 pixel space is used in all cases. This results in a somewhat wider ellipsis, but avoids issues where spaces between dots are uneven (visible in larger/monospace fonts) or squish dots way too much (visible in default font where dot is essentially a pixel). This fallback method obsoleted `RenderPixelEllipsis()` and this function was removed. Note that fallback ellipsis will always be somewhat wider than it could be, however it will fit in visually into every font used unlike what `RenderPixelEllipsis()` produced.
2019-09-17 11:13:07 +02:00
omar
404dc0367e
BeginTabItem: Fixed case where right-most tab would create an extraneous draw calls (probably related to other tab fitting code in 1.73 wip)
2019-09-17 11:12:33 +02:00
NeroBurner
e7e88ed413
Examples: SDL/GLFW + OpenGL3: Fixes for Makefile ( #2774 )
...
- append CXXFLAGS instead of overwriting them
- add glad.c build rule
2019-09-17 17:04:40 +09:00
Qix
561e7dd490
Fix signed types warning in pasteboard handler ( #2786 )
2019-09-17 16:21:09 +09:00
omar
3dcf323c35
Columns: Separator: Fixed a bug where non-visible separators within columns would alter the next row position differently than visible ones.
...
Fixed rounding issues also leading to change of ScrollMax depending on visible items (in particular negative coordinate would be rounded differently)
2019-09-16 19:15:43 +02:00
omar
b05f6f6f50
Nav, Scrolling: Added support for Home/End key. ( #787 )
2019-09-16 19:01:40 +02:00
Bagrat Dabaghyan
3cf519c9cb
Fix DragScalar for unsigned types ( #2780 )
...
decreasing the value was broken on arm64
2019-09-16 19:01:39 +02:00
omar
cc288e073c
Backends: OpenGL3: Tweaked initialization code allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before ImGui_ImplOpenGL3_NewFrame() if for some reason they wanted.
2019-09-16 12:08:40 +02:00
omar
c077dd4872
Fixed missing IMGUI_API for IsMouseDragPastThreshold().
2019-08-31 19:59:51 +02:00
omar
0bdc145343
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-08-31 19:19:00 +02:00
omar
d049a7988c
Docking: comments for DockBuilder API.
2019-08-31 16:51:12 +02:00
omar
0537ac005f
ColorEdit: Disable Hue edit when Saturation==0 instead of letting Hue values jump around.
2019-08-30 20:33:35 +02:00
omar
b59ec7b9b7
DragInt, DragFloat, DragScalar: Using (v_min > v_max) allows locking any edit to the value.
2019-08-30 20:30:21 +02:00
omar
a4af3cc814
Viewport, GLFW: Fix for #2756 under Windows.
2019-08-29 15:53:33 +02:00
Rokas Kupstys
a89a3cd2f1
Viewports, GLFW: Fix window having incorrect size after uncollapse. Issue manifests on Linux when window is in it's own viewport. ( #2756 , #2117 )
2019-08-29 15:49:52 +02:00
omar
3f99890f40
TabBar: feed desired width (sum of unclipped tabs width) into layout system to allow for auto-resize. ( #2768 )
...
Before 1.71 tab bars fed the sum of current width which created feedback loops in certain situations. Amend f95c77eeea .
2019-08-29 14:57:34 +02:00
Rokas Kupstys
09780b8b3d
Viewport: Fix setting window size on macos (glfw). ( #2767 , #2117 )
...
MacOS positions windows by their bottom-left corner why the rest of the world (including imgui) position windows by the top-left corner. This created an issue where collapsing imgui window would cause window header to remain at the bottom the full window rect. Likewise resizing window by using sizing handle caused window to grow upwards when we tried to expand window downwards.
This workaround moves window to the opposite direction by the delta of size change creating an illusion that windows are positioned by their top-left corner.
2019-08-29 13:02:42 +02:00
omar
f8d3d8d7f5
TabBar: improved shrinking for large number of tabs to avoid leaving extraneous space on the right side. Individuals tabs are given integer-rounded width and remainder is spread between tabs left-to-right.
2019-08-29 12:21:09 +02:00
omar
9e294be5c5
Docking: Fix for node created at the same time as windows that are still resizing (typically with io.ConfigDockingAlwaysTabBar) to not be zero/min sized. ( #2109 )
...
The fix delay their visibility by one frame, which is not ideal but not very problematic as the .ini data gets populated after that
2019-08-29 10:45:33 +02:00
omar
bfcdaeb610
Disable with ConfigWindowsMemoryCompactTimer < 0.0f ( #2636 )
2019-08-28 20:30:36 +02:00
omar
62f75c7fb1
Added a mechanism to compact/free the larger allocations of unused windows (buffers are compacted when a window is unused for 60 seconds, as per io.ConfigWindowsMemoryCompactTimer = 60.0f). Note that memory usage has never been reported as a problem, so this is merely a touch of overzealous luxury. ( #2636 )
2019-08-28 20:28:36 +02:00
Hanif Bin Ariffin
45a0db5979
Demo: PlotLine example displays the average value. ( #2759 ) + extra comments
2019-08-28 19:23:43 +02:00
omar
c8418015c2
SliderScalar: Improved assert when using U32 or U64 types with a large v_max value. ( #2765 )
...
+ misc minor stuff.
2019-08-28 15:19:10 +02:00
omar
a01d149369
Fixed context popup windows from not having the NoDocking flag. ( #2763 )
2019-08-28 10:52:17 +02:00
Tommy Nguyen
bcdb89ab07
Rebased imstb_rectpack on stb_rect_pack v1.00.
2019-08-28 09:53:21 +02:00
omar
483534b525
Internals: Using simpler ImVec2ih construct + fixed misnamed member.
2019-08-23 12:31:14 +02:00
omar
e1fca8d982
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-08-23 12:21:49 +02:00
omar
cb538fadfe
Internals: Storing settings using ImVec2ih to match what we are doing with dock node. + removed ImMax from reading Size value (done in Begin) + removed seemingly unnecessary FLT_MAX compare in SettingsHandlerWindow_WriteAll.
...
About: Added backquote to text copied into clipboard so it doesn't mess up with github formatting when pasted.
2019-08-23 12:02:52 +02:00
omar
c4ff1b3578
ImDrawList: clarified the name of many parameters so reading the code is a little easier. ( #2740 )
2019-08-22 17:43:57 +02:00
omar
3fb5cf3541
Using offsetof() when available in C++11. Avoids Clang sanitizer complaining about old-style macros. ( #94 )
2019-08-22 16:55:42 +02:00
omar
10a202422a
Docking: Extracted some of BeginDocked() into a DockContextBindNodeToWindow() function.
...
Moved one of the undocking blurb to favor fast path.
(Commit intended to have no functional side effects)
2019-08-22 13:51:17 +02:00
omar
27431dcc6b
Docking: fix BeginDocked() path that creates node so that SetNextWindowDockID() doesn't immediately discard the node..( #2109 )
...
Amend 515ecbddc2 , not sure at this point if the (auto_dock_node) flag was needed at all.
Comments. Exposed DockContextGenNodeID() in imgui_internal.h
2019-08-22 13:51:16 +02:00
omar
d8f9f6ba2a
Viewport: Fixed issue where resize grip would display hovered (before of extruded hit rectangle) while mouse is still off the OS bounds so click would miss it and focus the OS window behind expected one. ( #1542 )
2019-08-22 13:51:16 +02:00
omar
c4b0bf718a
More typos in comments ( #2738 )
2019-08-22 11:40:37 +02:00
omar
a856c670c1
TabBar: fixed single-tab not shrinking their width down.
...
+ minor typo fixes (#2738 )
2019-08-22 11:38:58 +02:00
omar
72090b646f
Fixed incorrect assignment of IsFallbackWindow which would tag dock node host windows created in NewFrame() as such, messing with popup viewport inheritance.
2019-08-22 11:35:17 +02:00
omar
aedcd2fb1a
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
2019-08-19 21:49:53 +02:00
omar
a33cedda14
Internals: Renaming window size calc functions.
2019-08-19 21:48:52 +02:00
omar
7abd41bd5f
TabBar: fixed ScrollToBar request creating bouncing loop when tab is larger than available space.
2019-08-19 20:38:17 +02:00
omar
76ccbb899d
Viewport: Fix modal/popup window being stuck in unowned hidden viewport associated to fallback window without stealing it back. ( #1542 )
...
Viewport: Fix modal reference viewport when opened outside of another window.
+ Comments
2019-08-19 11:58:30 +02:00
omar
5d87ee8d82
Internals: Added function index for Viewport and Docking. Renamed a few functions.
2019-08-16 15:29:58 +02:00
omar
9fce278918
ColorPicker: Made rendering aware of global style alpha of the picker can be faded out. ( #2711 )
...
Note that some elements won't accurately fade down with the same intensity, and the color wheel when enabled will have small overlap glitches with (style.Alpha < 1.0).
2019-08-16 11:46:11 +02:00
omar
88bf056a9f
Removing Funding file (unnecessary as we'll switch services)
2019-08-15 14:51:38 +02:00
omar
7d2cfa6ff1
Create FUNDING.yml
2019-08-15 14:49:18 +02:00
Matthias Moulin
2e756d5b47
Explicit narrowing cast from size_t to UINT ( #2726 )
...
Clang: `non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long long') to 'UINT' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]`
2019-08-12 22:31:49 +02:00
omar
451c756b01
Docking: Modals don't need to set ImGuiViewportFlags_NoFocusOnClick. This also mitigate the common described by #2445 , which becomes particularly bad with unfocused modal. ( #1542 )
2019-08-01 16:23:54 -07:00
omar
3aa9aae0be
Docking: Fix a crash that could occur with a malformed ini file (DockNode Parent value pointing to a missing node)
2019-08-01 15:50:05 -07:00
Vilya Harvey
62143dff64
Backends: Vulkan: Added support for specifying multisample count. ( #2705 , #2706 )
2019-08-01 11:10:01 -07:00
omar
6cf4743f17
Backends: DX11: Fixed GSGetShader() call not passing an initialized instance count, would generally make the debug layer complain (Added in 1.72).
2019-08-01 10:58:41 -07:00
omar
f624455d7b
Version 1.73 WIP
2019-08-01 10:57:13 -07:00
omar
967073ba3d
Viewport: Handle case where host window gets moved and resized simultaneous (toggling maximized state). There's no perfect solution there, than using io.ConfigViewportsNoAutoMerge = false. ( #1542 )
2019-07-31 20:08:06 -07:00
omar
9bd7846f07
Internal: Made ScrollToBringRectIntoView() handle recursing back to scroll parent window, so the function can be called elsewhere (instead of 1 deep recursion done in NavUpdateMoveResult().
2019-07-31 18:37:55 -07:00
omar
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-07-31 14:34:58 -07:00
omar
6a0d0dab5a
Version 1.72b (patch for nav)
2019-07-31 14:31:06 -07:00
omar
27079e68c2
Nav: Made hovering non-MenuItem Selectable not re-assign the source item for keyboard navigation.
2019-07-31 14:31:06 -07:00
omar
4cfaf7d89c
Scrolling, Nav: Fixed programmatic scroll leading to a slightly incorrect scroll offset when the window has decorations or a menu-bar (broken in 1.71). This was mostly noticeable when a keyboard/gamepad movement led to scrolling the view, or using e.g. SetScrollHereY() function. Fix/amend a0994d74.
2019-07-31 14:31:06 -07:00
omar
3548fb8013
Internal refactor: moved all Scroll related functions in a same spot.
2019-07-30 20:04:02 -07:00
omar
1b1e539288
Internal: Moved NavScrollToBringItemIntoView() declaration to imgui_internal.h. Fixed spacing missing in 494d804. Fixed changelog wreck from 1.72.
2019-07-30 18:21:44 -07:00
omar
5ef7445d92
Internal: Avoid using GImGui multiple times in same function.
2019-07-30 16:51:12 -07:00
omar
494d804735
Internal: Added ImGuiInputTextState::ClearText() helper.
2019-07-30 15:02:40 -07:00
omar
85ad8e0e2e
Nav: Fixed an issue with NavFlattened window flag where widgets not entirely fitting in child window (often selectable because of their extruded bits) would be not considered to navigate toward the child window. ( #787 )
...
This creates a little bit of tension because g.NavDisableHighlight tends to makes the reference point not always visible.
Amend c665c15a7d
2019-07-30 14:27:25 -07:00
omar
07c52a25ff
Docking: Recording dockspace parent window so pruning doesn't zealously lose the location of nodes. ( #2109 )
2019-07-29 15:56:59 -07:00
omar
cb2de62bb1
Docking: Renaming, comments.
2019-07-29 15:56:59 -07:00
omar
9183e7c426
Version 1.73 WIP
2019-07-29 15:54:32 -07:00
Chris Savoie
949a9fa2cb
Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. ( #2698 )
2019-07-29 15:52:30 -07:00
omar
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-07-27 18:21:41 -07:00
omar
ecb9b1e2eb
Version 1.72
2019-07-27 18:15:07 -07:00
omar
7a26a49f08
Internal: Added IsMouseDragPastThreshold(). Tweaks. Todo.
...
Demo: Showing how to use the format parameter of Slider/Drag functions to display the name of an enum value instead of the underlying integer value
2019-07-26 17:19:01 -07:00
omar
d057550209
Fixed Clang 8.0 warning "empty expression statement has no effect; remove unnecessary ';' to silence this" warning [-Wextra-semi-stmt]
...
+ Comment
2019-07-24 17:07:05 -07:00
omar
e5b905481d
Viewport: Refactored ViewportFlagsOverrideMask+ViewportFlagsOverrideValue into ViewportFlagsOverrideSet+ViewportFlagsOverrideClear which appears easier to grasp. ( #1542 )
...
(cherry picked from commit 9437630872e7ca19065bee78fcafaab54a0d5bf2)
2019-07-24 13:45:18 -07:00
omar
7c183dc6a1
Docking: Explicitly inhibit constraint when docked for now ( #2690 , #2109 )
...
Added asserts to catch issues.
2019-07-24 11:18:13 -07:00
omar
7fbd72b735
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-07-23 21:40:57 -07:00
omar
824e8c53b4
Internals: Added IMGUI_DEBUG_INI_SETTINGS. Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.
2019-07-23 21:37:09 -07:00
omar
969278fc0b
Docking: Fixed dragging/resizing from OS decoration not marking settings as dirty.
...
Internals: Added IMGUI_DEBUG_LOG_DOCKING, IMGUI_DEBUG_LOG_VIEWPORT macros to easily enable/disable a bunch of logging code.
2019-07-23 21:29:43 -07:00
omar
efc4c0fe9d
Internals: Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.
2019-07-23 21:26:15 -07:00
omar
81b24bd728
Docking: Moving types in imgui.h
2019-07-23 13:37:52 -07:00
omar
db2581bee9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-07-23 13:35:01 -07:00
omar
baae057a03
Internals: Merge in minor noise from wip Tables branch to simplify further merging.
2019-07-23 13:28:36 -07:00
omar
51853292cc
ImDrawList: Using ImDrawCornerFlags instead of int in various apis.
...
Demo: Using ImGuiColorEditrFlags instead of int.
2019-07-23 10:41:48 -07:00
luk1337
1820aaf444
imgui_freetype: Initialize FT_MemoryRec_ struct manually ( #2686 )
...
This fixes gcc warning: missing field 'alloc' initializer [-Wmissing-field-initializers]
2019-07-23 09:41:27 -07:00
omar
26f14e056c
Scrolling: Made mouse-wheel scrolling lock the underlying window until the mouse is moved again or until a short delay expires (2 seconds). This allow uninterrupted scroll even if child windows are passing under the mouse cursor. ( #2604 )
2019-07-22 18:49:52 -07:00
omar
dcd03f62a7
Scrolling: Made it possible for mouse wheel and navigation-triggered scrolling to override a call to SetScrollX()/SetScrollY(), making it possible to use a simpler stateless pattern for auto-scrolling.
...
Demo: Log, Console: Using a simpler stateless pattern for auto-scrolling.
2019-07-22 18:49:51 -07:00
omar
34cf00566f
InputTextMultiline: Fixed vertical scrolling tracking glitch.
...
Fixed Travis-CI banner address.
2019-07-22 18:11:06 -07:00
omar
835b50b773
Internals: Nav: Tweak NavUpdatePageUpPageDown() to make it more readable.
2019-07-22 17:27:41 -07:00
omar
75136d3bea
Internals: Removed ShowDockingDemo(), moved into Metrics. Metrics: Added more links to browse window->node, node->window, node->node etc.
2019-07-22 11:51:04 -07:00
omar
0e6a096afd
Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. ( #2109 )
...
Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.
2019-07-22 11:29:22 -07:00
omar
6f8d34768d
Docking: Removed seemingly unnecessary test in TabItemEx() for undocking tab leading to window move. Added ImGuiDockNode::IsFloatingNode() helper to clarify code intent in various places.
2019-07-22 11:02:44 -07:00
omar
9cda3035fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2019-07-22 10:29:14 -07:00
omar
363d33f64e
Increased IMGUI_VERSION_NUM to facilitate transition of OSX clipboard support for framework using/embedding any version of imgui. Amend 29d9394. ( #2546 )
2019-07-22 10:23:27 -07:00
omar
cbd5a21fb0
Backends: DX10/DX11: Backup, clear and restore Geometry Shader is any is bound when calling renderer.
...
Backends: DX11: Clear Hull Shader, Domain Shader, Compute Shader before rendering. Not backing/restoring them.
2019-07-21 19:26:13 -07:00
omar
29d9394a41
OSX: Disabled default native Mac clipboard copy/paste implementation in core library (added in 1.71), because it needs application to be linked with '-framework ApplicationServices'. It can be explicitly enabled back by using '#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS' in imconfig.h. Re-added equivalent using NSPasteboard api in the imgui_impl_osx.mm experimental back-end. ( #2546 )
2019-07-21 19:06:07 -07:00
omar
f0348ddffc
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. ( #2677 , #2005 )
2019-07-21 18:39:50 -07:00
Aaron Cooper
0f86116a69
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
2019-07-21 18:29:11 -07:00
omar
4b44f25c9a
Fixed incorrect application of io.DisplaySafeAreaPadding which would be problematic with multi-viewports when a monitor uses negative coordinates (correct clamping is done right below). ( #2674 )
2019-07-21 18:19:56 -07:00
omar
f1ba217a92
Internals: Extracted some code out of the NewFrame() function.
2019-07-21 12:13:44 -07:00
omar
47f5ad32b7
Perform simple check: error if Docking or Viewport are enabled _exactly_ on frame 1 (instead of frame 0 or later), which is a common error leading to loss of .ini data. ( #2109 )
2019-07-21 12:05:04 -07:00
omar
c37f21788f
Columns: Made GetColumnOffset() and GetColumnWidth() behave when there's no column set, consistently with other column functions + fixed Columns demo ( #2683 )
2019-07-21 11:23:15 -07:00
omar
9f35ba8546
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-07-19 15:19:10 -07:00
omar
b443bc0a64
Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. ( #125 , #2666 )
2019-07-19 14:22:33 -07:00
omar
4abc2a82e0
Columns: Made the right-most edge reaches up to the clipping rectangle (removing WindowPadding.x*0.5 worth of asymmetrical/extraneous padding). ( #125 , #2666 )
...
+ Moved a few things in BeginColumns().
2019-07-19 14:22:12 -07:00
omar
493795cdd1
Columns: Fix support for BeginColumns() with a count of 1 (not that this isn't available via the old Columns() api). Tweaked Demo to facilitate testing for it.
2019-07-19 12:11:00 -07:00
ocornut
047dc16af5
Debug Tools: Added DebugStartItemPicker() in imgui_internal.h to facilitate binding this anywhere in user's tool. Adedd highlight. Added IMGUI_DEBUG_TOOL_ITEM_PICKER_EX to break in ItemAdd().
2019-07-19 11:28:03 -07:00
omar
44336950e9
Revert "Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. ( #125 , #2666 )"
...
This reverts commit 6c16ba6490 .
2019-07-19 11:22:39 -07:00
omar
7fd34d4f30
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-07-17 18:48:16 -07:00
omar
6c16ba6490
Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. ( #125 , #2666 )
2019-07-17 18:40:48 -07:00
omar
e28d20c3e2
Columns: Fixed a regression from 1.71 where the right-side of the contents rectangle within each column would wrongly use a WindowPadding.x instead of ItemSpacing.x like it always did. ( #125 , #2666 )
2019-07-17 17:29:30 -07:00
omar
61c7f0194e
Misc: Made Button(), ColorButton() not trigger an "edited" event leading to IsItemDeactivatedAfterEdit() returning true. This also effectively make ColorEdit4() not incorrect trigger IsItemDeactivatedAfterEdit() when clicking the color button to open the picker popup. ( #1875 )
...
Demo: Added Button with repeater and InputFloat with +/- button to the status query test demo.
2019-07-17 17:10:28 -07:00
omar
1f3feb481e
Internals: Refactor: Moved all Columns code from imgui.cpp to imgui_widgets.cpp ( #125 )
...
Also moved NextColumn between BeginColumn and NextColumn which makes it easier to work on that code.
2019-07-17 17:10:27 -07:00
omar
bb2aa5e770
Docking: Making it possible to undock a node by clicking on the tab bar / title bar for the node. ( #2645 , #2109 )
2019-07-17 13:55:00 -07:00
omar
ea79992d9a
Fixed old SetWindowFontScale() api value from not being inherited by child window. Added comments about the right way to scale your UI (load a font at the right side, rebuild atlas, scale style).
...
+ Added missing IMGUI_API marker to the EmptyString storage used by ImGuiTextBuffer. (#2672 )
2019-07-17 10:01:49 -07:00
omar
56e10f1c35
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-07-16 18:29:31 -07:00
omar
130b44994e
Debug, Metrics: Added "Tools->Item Picker" tool which allow clicking on a widget to break in the debugger within the item code. The tool calls IM_DEBUG_BREAK() which can be redefined in imconfig.h if needed.
2019-07-16 18:25:49 -07:00
omar
e6a286b3a5
Style: Added style.ColorButtonButton (left/right, defaults to ImGuiDir_Right) to move the color button of ColorEdit3/ColorEdit4 functions to either side of the inputs.
2019-07-16 16:43:21 -07:00
omar
718e15c7de
Docking: Fix so that an appearing window making a dock node reappear won't have a zero-size on its first frame (because dock node ->Size was 0.0 unlike ->SizeRef) ( #2109 )
...
Docking: Added ImGuiDockNode to .natvis file.
2019-07-16 11:45:52 -07:00
omar
a35f42f123
Removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete). ( #581 , #324 )
2019-07-15 18:30:20 -07:00
omar
3d07c7cbe4
TabBar: Fixed unfocused tab bar separator color (was using ImGuiCol_Tab, should use ImGuiCol_TabUnfocusedActive).
2019-07-15 18:30:20 -07:00
omar
7a9d32acee
Fixed unnecessary test in UpdateMouseWheel() (thanks PVS).
...
TreeNodeBehavior: avoid computing bg_col for non-framed non-active tree nodes.
Comments, binaries update, minor typos.
2019-07-15 18:30:20 -07:00
omar
8bc6d976cb
Docking: Fixed using ImGuiDockNodeFlags_AutoHideTabBar with ConfigDockingTabBarOnSingleWindows. ( #2109 )
2019-07-15 14:17:01 -07:00
omar
dd80db87a6
Viewport: Added ImGuiViewportFlags_NoAutoMerge to prevent merging into host viewport in a per-window basis via the ImGuiWindowClass override mechanism. ( #1542 )
2019-07-15 13:35:21 -07:00
omar
e461e7bc7a
Moved ImGuiColumnsFlags erroneously forward declared in imgui.h + demo bit.
2019-07-14 12:29:23 -07:00
omar
71d20abbc3
Settings: Minor optimization to reduce calls in SettingsHandlerWindow_WriteAll.
2019-07-12 13:33:38 +02:00
omar
d52c6316c8
Renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Keep redirection typedef (will obsolete).
2019-07-12 11:58:46 +02:00
omar
e66799f79a
Prefixed internal structs exposed in imgui.h with a fully qualified name to facilitate auto-generation with cimgui.
2019-07-12 11:54:22 +02:00
omar
3436132d4b
Combo: Hide arrow when there's not enough space even for the square button.
...
+ Various todo items.
2019-07-11 17:20:56 +02:00
omar
d23f1b1409
fonts/binary_to_compress: display error message when failing to open file + misc comments.
2019-07-10 12:58:11 +02:00
omar
1f54c16f52
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-07-02 18:47:10 +02:00
omar
54c49b5fb1
Window: Mouse wheel scrolling while hovering a child window is automatically forwarded to parent window if ScrollMax is zero on the scrolling axis. Also still case if ImGuiWindowFlags_NoScrollWithMouse is set (not new), but previously the forwarding
...
would be disabled if ImGuiWindowFlags_NoScrollbar was set on the child window, which is not the case any more (amend #1502 , #1380 ).
2019-07-02 18:33:50 +02:00
omar
e16564e67a
Scrollbar: Avoid overlapping the opposite side when window (often a child window) is forcibly too small.
2019-07-01 20:59:00 +02:00
omar
58c9f8a194
Misc: Added IMGUI_DISABLE_METRICS_WINDOW imconfig.h setting to explicitly compile out ShowMetricsWindow(). + Internals: Minor renaming.
2019-07-01 20:58:10 +02:00
omar
da29d77253
Added SetScrollXHere, SetScrollFromPosX: Changelog, demo, comments ( #1580 ).
2019-07-01 12:15:53 +02:00
kevreco
caf119a982
Added 'SetScrollHereX' and 'SetScrollFromPosX' ( #1580 )
2019-07-01 12:15:48 +02:00
omar
2a3517a399
Internals: Checkbox: Added undocumented mixed/indeterminate/tristate support via ImGuiItemFlags_MixedValue. ( #2644 )
2019-06-30 12:03:09 +02:00
omar
a89f05a10e
Child windows inherit Hidden frames setting from parent more accurately, so HiddenFramesCannotSkipItems is honored by child windows.
2019-06-29 20:12:15 +02:00
omar
401e05147c
Internals: Moved CalcListClipping close to ImGuiListClipper code (no-op)
2019-06-29 20:11:03 +02:00
omar
82711251b6
Internals: ImGuiListClipper using absolute coordinate (instead of relative one). Minor no-op tweaks + ImDrawListSplitter assert
2019-06-29 20:10:55 +02:00
omar
1dd322c6fb
Style: Attenuated default opacity of ImGuiCol_Separator in Classic and Light styles.
2019-06-27 12:20:29 +02:00
omar
4b95e7c2f3
Doc: Tweak and extra mention of AddCustomRectFontGlyph + made the example register two rectangles.
2019-06-26 12:15:32 +02:00
omar
50d421fa19
Docking: Fixed GetBackgroundDrawList(), GetForegroundDrawList() overwriting ImDrawList flags after clear, leading to the AllowVtxOffset flag not being cleared. ( #2638 )
2019-06-26 09:52:25 +02:00
omar
eb3e271c24
Demo: Using ImVec2(-FLT_MIN,0.0f) instead of ImVec2(-1.0f,0.0f) where it makes sense. ( #2449 )
2019-06-23 18:20:25 +02:00
omar
41e2d4b5ae
ImDrawListSplitter: Fixed memory leak when using low-level split api (was not affecting ImDrawList api, also this type was added in 1.71 and not advertised as a public-facing feature).
2019-06-20 16:09:45 +02:00
omar
f563e1a504
Internals: Renamed GetFrontMostPopupModal() to GetTopMostPopupModal() to be consistent. Renamed other locals to follow that terminology.
2019-06-19 18:16:38 +02:00
omar
adbbd17cb6
Addendum to #2635 . Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. ( #1542 )
2019-06-18 23:37:57 +02:00
Vincent Hamm
3e8eebfbec
Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. ( #1542 , #2635 )
2019-06-18 23:16:52 +02:00
omar
2cbc0f1287
Restore SLN which in Docking branch includes more projects.
2019-06-18 23:13:12 +02:00
omar
e2c1f0a7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-06-18 23:12:50 +02:00
omar
dd41df3e98
Word-wrapping: Fixed overzealous word-wrapping when glyph edge lands exactly on the limit. Because of this, auto-fitting exactly unwrapped text would make it wrap. (fixes initial 1.15 commit, 78645a7d).
2019-06-18 12:50:34 +02:00
omar
516c3dee80
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. ( #2632 )
2019-06-18 11:28:26 +02:00
Vincent Hamm
cc4d76cc23
Implement SDL/dx11 sample
2019-06-18 11:05:29 +02:00
omar
70fe409338
Window: Fixed InnerClipRect right-most coordinates using wrong padding setting (introduced in 1.71).
2019-06-18 10:58:03 +02:00
Vincent Hamm
342751c89e
Fiedx OpenGL ES 3.0 include for iOS and tvOS ( #2631 )
2019-06-18 10:55:33 +02:00
Pavel Rojtberg
0e37eaff8a
Updated Ogre bindings ( #2619 )
...
And support python
2019-06-17 15:17:24 +02:00
omar
ae2c9f7101
Internals: Columns: Poke into WorkRect and use them in the GetContentRegionMax() functions. This should be a no-op, but preparing us to transition toward using WorkRect instead of ContentRegionRect.
...
Removed one use of ContentsRegionRect.
2019-06-17 12:14:34 +02:00
omar
e9b92d1cef
Disable -Wpragmas warning in GCC to avoid relying on version checks, as unusual/forks/mods don't appear to always have same warning<>version. ( #2618 )
...
+ Fix version number in imgui.h
2019-06-17 11:32:00 +02:00
omar
ca43436cd3
Fix monitor dpi info not being copied to main viewport when multi-viewports are not enabled. ( #2621 , #1676 ) + Tweaks, short path in FindPlatformMonitorForRect().
2019-06-17 11:19:34 +02:00
omar
b27fd87177
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
2019-06-17 11:10:14 +02:00
omar
b82e99c032
ImDrawList: Fixed CloneOutput() helper crashing. Also removed unnecessary risk from ImDrawList::Clear(), draw lists are being clear before use each frame anyway. ( #1860 )
2019-06-17 11:06:36 +02:00
omar
2645a2516f
ImDrawList::ChannelsSplit(), ImDrawListSlitter: Fixed an issue with merging draw commands between channels 0 and 1. ( #2624 ) Introduced by cef88f6aae.
2019-06-14 12:07:43 +02:00
omar
af3080b81b
Removed redirecting functions/enums that were obsoleted in version 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME.
2019-06-14 12:05:00 +02:00
omar
5286ecb8a7
Version 1.72 WIP
2019-06-14 11:58:58 +02:00
omar
07d3083279
Docking: Fixed rendering of outer decoration happening on non-visible docked window ( #2623 , #2109 ). Revealed by 0770449. We are actually better than before now, as previously those would get unnecessarily get rendered into a hidden draw list.
2019-06-13 10:19:14 +02:00
omar
d3d998a885
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
2019-06-12 18:40:50 +02:00
omar
2da1c66d15
Version 1.71 + comments
2019-06-12 18:30:06 +02:00
omar
5ae268c0a3
Internals: Reworked RenderTextEllipsis() to satisfy what we need for table headers.
2019-06-11 16:12:00 +02:00
omar
4597632662
Readme, comments, dear imgui prefixes
2019-06-11 16:11:36 +02:00
omar
c3a348aa25
CollapsingHeader: Minor fix to align right side of frames (which is extruded past the Work/Contents rect) with clipping rectangle.
2019-06-11 15:56:57 +02:00
omar
a8eb64fc54
Log/Capture: Fixed BeginTabItem() label not being included in a text log/capture.
...
Extracted tab rendering code into a RenderTextEllipsis() function.
2019-06-11 14:03:13 +02:00
omar
a9b5c834b6
ImDrawListSplitter: Don't merge draw commands when crossing a VtxOffset boundary + Renamed fields ImDrawChannels to consistently suggest those are internal structures.
2019-06-11 11:49:31 +02:00
omar
d8435c7710
ImDrawListSplitter: Fix idx offset when merging ( cef88f6) ( #2591 )
2019-06-10 15:02:44 +02:00
omar
0770449630
Window: child windows outer decorations (e.g. scrollbar) are rendered as part of their parent window, avoiding the creation of an extraneous draw command.
...
+ Metrics: inverted color of clip rect vs vertices bounding box when hovering a draw command, so the color matches the per-vertex preview.
2019-06-07 17:34:36 +02:00
omar
afa3978ff6
Internals: Added drawlist and color arg to RenderArrow(), RenderBullet(). Reordered args for RenderPixelEllipsis.
2019-06-07 17:32:51 +02:00
omar
32ab0a82d6
imgui-test: Added IMGUI_TEST_ENGINE_LOG macro to emit into test log from core or user land.
2019-06-07 13:46:54 +02:00
omar
2b997141cf
Made PushID() behave the same in 32-bit and 64-bit, by not padding the integer into a void*. (Also technically faster.)
2019-06-06 16:36:26 +02:00
omar
5f409c6fcc
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_apple_opengl2/main.mm
# examples/example_emscripten/main.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_glut_opengl2/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_widgets.cpp
2019-06-06 16:20:12 +02:00
omar
63310acd58
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
2019-06-06 16:16:18 +02:00
omar
431aa4e456
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
2019-06-06 16:13:30 +02:00
omar
fea5f70611
ImDrawCallback: Allow to override the signature of ImDrawCallback by #define-ing it. This is meant to facilitate custom rendering back-ends passing local render-specific data to the draw callback.
2019-06-06 15:28:37 +02:00
omar
480d57e6a2
Revert "Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. ( #38 , #103 , #1172 , #1231 , #2489 )"
...
This reverts commit 597c024904 .
2019-06-06 01:00:30 +02:00
omar
597c024904
Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. ( #38 , #103 , #1172 , #1231 , #2489 )
2019-06-06 00:42:27 +02:00
omar
e6850891cc
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-06-05 16:09:06 +02:00
omar
c96f2c4057
Window: Fixed one case where auto-resize by double-clicking the resize grip would make either scrollbar appear for a single frame after the resize. Moved Scrollbar visibility block.
2019-06-05 15:59:14 +02:00
omar
300d8dd656
Internals: Moved scrollbar visibility calculation block below the call to UpdateManualResize(). This commit is _intended_ to have no side-effect (next commit will). Also moved ItemWidthDefault calculation below rectangles.
2019-06-05 15:59:14 +02:00
omar
c1a61d25a7
Scrollbar overlap an extra WindowBorderSize amount on the left to make all distances consistent. Reverted to BorderSize not affecting work/contents rectangles. Scrollbar, Style: Changed default style.ScrollbarSize from 16 to 14.
2019-06-05 15:59:14 +02:00
omar
15282261dd
Internals: Minor no-op tidying up toward solving the WindowPadding / WindowBorderSize / ScrollbarSize overlapping mess.
...
+ Demo: Use SetScrollY().
2019-06-05 15:59:14 +02:00
omar
4149d22e85
Fixed newly created window (e.g. appearing child window) from having scrollbar active on the first frame. (fix 6e03b27) + reworded code a little. (+1 squashed commits)
...
Fixed auto-resize with AlwaysVerticalScrollbar or AlwaysHorizontalScrollbar flags not taking account of the expect scrollbar sizes.
2019-06-05 15:59:14 +02:00
omar
06f1d2c101
Internals: Storing ScrollMax into a member. Mostly to facilitate debugging. Also locking down window->Scroll slightly lower in the Begin function.
2019-06-05 15:59:13 +02:00
omar
d6df777ff2
TextWrapped, PushTextWrapPos(0.0f) within a window with horizontal scrolling from not covering the full horizontal area (previously only worked with an explicit contents size).
2019-06-05 15:59:13 +02:00
omar
fe32fde376
Internals: Renamed SizeContents to ContentSize, SizeContentsExplicit to ContentSizeExplicit. Tweaked Metrics->Show Rectangles functionality.
2019-06-05 15:59:13 +02:00
omar
f95c77eeea
Window rectangles: Changed WorkRect to cover the whole region including scrolling (toward obsolete ContentsRegionRect) + using full WindowPadding*1 padding.
...
Tweaked InnerClipRect.
TreeNode, CollapsingHeader: Fixed highlight frame not covering horizontal area fully when using horizontal scrolling. (#2211 , #2579 )
TabBar: Fixed BeginTabBar() within a window with horizontal scrolling from creating a feedback loop with the horizontal contents size.
Columns: Fixed Columns() within a window with horizontal scrolling from not covering the full horizontal area (previously only worked with an explicit contents size). (#125 )
Demo: Added demo code to test contentsrect/workrect
2019-06-05 15:59:13 +02:00
omar
a0994d74c2
Clarified behavior of SetNextWindowContentSize(). Content size is defined as the size available after removal of WindowPadding on each sides. So SetNextWindowContentSize(ImVec2(100,100)) + auto-resize will always allow submitting a 100x100 item without creating a scrollbar, regarding of WindowPadding.The exact meaning of ContentSize for decorated windows was previously ill-defined.
2019-06-05 15:59:13 +02:00
omar
09bcf9fbc5
Window rectangles: Made InnerRect not affected by window border sizes. its few users shouldn't be meaningfully affected.
2019-06-05 15:59:12 +02:00
omar
b9874a2423
Comments about obsoleted features version. Todo. Clarify tab bar initial offset (useful if we decide to remove the half-windowpadding clip margin).
2019-06-05 15:58:49 +02:00
omar
440ad0b440
Merge branch 'master' into docking
2019-06-05 00:37:20 +02:00
omar
5cdd788f30
Comments ( #2599 ). Moved branch Changelog above 1.71 wip one. Added some missing changelog bits.
2019-06-05 00:37:14 +02:00
omar
57d8ab62f4
Nav: Fixed rare crash when e.g. releasing Alt-key while focusing a window with a menu at the same frame as clearing the focus. This was in most noticeable in some back-ends with emits key release events when focusing another viewport. ( #2609 )
2019-06-05 00:28:55 +02:00
DucaRii
6614bab883
Combo: Fixed rounding not applying with the ImGuiComboFlags_NoArrowButton flag. ( #2606 , #2607 )
2019-06-04 20:49:29 +02:00
omar
eb7849b477
Nav: Fixed gamepad/keyboard moving of window affecting contents size incorrectly, sometimes leading to scrollbars appearing during the movement. + minor fix with the mostly dead Ctrl+wheel scaling.
2019-05-31 20:48:52 +02:00
omar
596d81a973
Merge branch 'master' into docking
2019-05-31 12:09:40 +02:00
omar
cef88f6aae
ImDrawListSplitter: Support merging consecutive draw commands straddling two channels. Support zero-init.
2019-05-31 12:06:35 +02:00
omar
f1f4b42d91
ImDrawListSplitter: extracted out of ImDrawList. Down the line we may obsolete the ImDrawList functions and encourage users to store the splitter aside, in the meanwhile ImDrawList holds a splitter.
...
(This will allow columns/table to recurse.)
2019-05-31 12:03:10 +02:00
omar
8abf1313aa
ImDrawList: Fix broken channel splitting (another issue when the first channel is empty) ( #2591 ) + fixed warnings with newer VS
2019-05-31 11:47:00 +02:00
Sebastian Krzyszkowiak
bff7202ff2
Include <alloca.h> also when __SWITCH__ is defined ( #2595 )
...
Fixes compilation with devkitPro for Nintendo Switch
2019-05-31 01:52:22 +02:00
omar
84f3ecc231
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-05-30 18:52:24 +02:00
omar
42c98c5eea
ImDrawList: Fix broken channel splitting (broken by d1e8b69) ( #2591 )
2019-05-30 18:47:46 +02:00
omar
546b728199
Internals: Window rectangles: Fixed ContentsRegion lag by moving back after Scrollbar, fixes b50c61c9. Shuffling setup order and added comments.
2019-05-30 18:19:14 +02:00
omar
21ebdcafc9
Internals: Window rectangles: Renaming of all rectangles toward their final form. Should be a no-op. Renamed GetWorkRectMax() to GetContentRegionMaxAbs(). Metrics shows SizeContents.
2019-05-30 18:04:21 +02:00
omar
cc48f1e5dd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
2019-05-30 16:47:11 +02:00
omar
c3d600abed
Fixed imgui_impl_opengl3 broken in previous few commits. ( #2591 , #2593 , #2594 )
2019-05-30 16:45:59 +02:00
Max Thrun
ed79b4d22e
Examples/Backends: Metal: Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. ( #2591 , #2592 )
2019-05-29 19:45:15 +02:00
omar
8dc04a4c9f
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.h
# imgui_demo.cpp
2019-05-29 16:32:27 +02:00
omar
7755cbbef2
Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. ( #2591 ) + Fix OpenGL3 code missing flag.
2019-05-29 16:29:17 +02:00
omar
c72040a715
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_osx.h
# examples/imgui_impl_osx.mm
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2019-05-29 16:20:26 +02:00
omar
b3dd03f582
Examples/Backends: DirectX9/10/11/12, Vulkan, OpenGL3 (Desktop GL only): Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. ( #2591 )
2019-05-29 16:13:38 +02:00
omar
d1e8b698d0
ImDrawList: Added ImDrawCmd::VtxOffset value to support large meshes (64k+ vertices) using 16-bits indices. To enable the feature, the renderer back-end needs to set 'io.BackendFlags |= ImGuiBackendFlags_HasVtxOffset' and honor the ImDrawCmd::VtxOffset field. Otherwise the value will always be zero. This has the advantage of preserving smaller index buffers and allowing to execute on hardware that do not support 32-bits indices.
...
ImDrawList: Added ImDrawCmd::IdxOffset value, equivalent to summing element count for each draw command. This is provided for convenience and consistency with VtxOffset. (#2591 )
2019-05-29 16:13:38 +02:00
omar
40b9e5e0b4
ImDrawList: Store initial flags for the frame in ImDrawListSharedData, reducing code duplication in setting up the flags.
2019-05-29 14:26:03 +02:00
omar
cb7ba60d3f
CollapsingHeader: When a close button is enabled, better clip the label to avoid overlap. ( #600 )
2019-05-28 21:25:28 +02:00
omar
c487bc52a2
Fonts: Added some details about using custom colorful icons.
2019-05-28 20:17:15 +02:00
omar
70d9f79312
Internal: Renamed InnerMainRect to InnerVisibleRect. Printing coordinates in Metrics window.
2019-05-28 11:23:04 +02:00
omar
2742663ad2
Changelog, minor tweaks. ( #2585 )
2019-05-28 11:23:04 +02:00
actboy168
c0e690318a
Examples: imgui_impl_osx: Added mouse cursor support. ( #2585 , #1873 )
2019-05-28 11:15:59 +02:00
omar
c7c1bf177b
Docking: Fixed DockBuilderRemoveNode() from overwriting other parent node flags when trying to move the CentralNode flag.
2019-05-28 00:06:21 +02:00
omar
5b0e59d9d5
Docking: Saving local _NoResize flag. ( #2583 )
2019-05-27 22:11:21 +02:00
omar
2d68e892a8
Added full "Dear ImGui" prefix to the title of "Dear ImGui Demo" and "Dear ImGui Metrics" windows. Shortened amount of nodes in columns>tree demo.
2019-05-27 18:38:28 +02:00
omar
7c06d9f043
Docking: Saving the NoTabBar, NoWindowMenuButton, NoCloseButton fields of dock node into the .ini file. Added them to the Metrics window. ( #2583 , #2423 , #2109 ).
2019-05-27 17:06:17 +02:00
omar
9c35344175
Comments, todo entries, moved ImGuiSelectableFlagsPrivate in higher ranges to match others.
2019-05-27 16:50:56 +02:00
omar
70a4be07df
ColorEdit: Fixed the color picker popup only displaying inputs as HSV instead of showing multiple options. ( #2587 , broken in 1.69 by #2384 ).
2019-05-27 14:57:39 +02:00
omar
511e32e8ca
Docking: Clarified terminology of docking/tablist/collapse button into Window Menu button matching master. Added private ImGuiDockNodeFlags_NoWindowMenuButton, ImGuiDockNodeFlags_NoCloseButton flags. ( #2583 , #2109 )
2019-05-27 12:35:20 +02:00
Mario Botsch
affa7e2422
Examples: imgui_impl_opengl3: Fix empty printout on shader load. ( #2584 )
...
Fixed minor bug in CheckShader and CheckProgram
The log_length reported by
glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &log_length)
will at least return 1, since the string delimiter is also counted.
The old version would always print and empty string to stderr. This is annoying in the emscripten port, since it prints a red error message to the Javascript console. The new version fixes this behavior.
2019-05-27 10:47:18 +02:00
omar
e5dfa0855f
Docking: Honor style.WindowMenuButtonPosition setting in docking node.
2019-05-24 21:59:44 +02:00
omar
afad952450
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
2019-05-24 21:58:17 +02:00
omar
958d75c00a
Style: Added style.WindowMenuButtonPosition (left/right, defaults to ImGuiDir_Left) to move the collapsing/docking button to the other side of the title bar.
2019-05-24 21:54:52 +02:00
omar
6c3697f6f1
Internal: CloseButton takes an upper-left corner + a size to be consistent with similar widgets.
2019-05-24 17:58:21 +02:00
omar
ec3ec24157
Internals: Extracted some of the tab bar shrinking code into a ShrinkWidths() function so columns/table can use it.
2019-05-24 14:32:33 +02:00
omar
3fda90d6a7
Fixed InputScalar, InputScalarN, SliderScalarN, DragScalarN with non-visible label from inserting style.ItemInnerSpacing.x worth of trailing spacing.
2019-05-24 14:32:28 +02:00
omar
fda1365c15
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-05-23 00:04:25 +02:00
omar
7bc03f7155
Internals: Added InnerWorkRect equal to old InnerClipRect, added InnerWorkRectClipped actually clipped.
2019-05-22 23:56:31 +02:00
omar
b85e97137d
Version tag is 1.71 WIP oops
2019-05-22 23:56:26 +02:00
omar
a2eec8f5b5
Fix OuterRectClipped not being clipped correctly, which resulted in child window outside visible bound to not be marked with SkipItems. Broken in b50c61c961.
...
+ Comments on InnerClipRect being misleading. Demo: Tweak to sizing of child window in the Layout->Scrolling section.
2019-05-22 22:14:31 +02:00
omar
04022114d9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-05-21 14:47:29 +02:00
omar
34b881eb12
ImFontGlyphRangesBuilder: Fixed unnecessarily over-sized buffer, which incidentally was also not fully cleared. Fixed edge case overflow when adding character 0xFFFF. ( #2568 )
2019-05-21 12:45:27 +02:00
omar
882d2c3aea
Fixed crash when appending with BeginMainMenuBar() more than once and no other window are showing. ( #2567 ) + comments
2019-05-21 12:18:34 +02:00
omar
392ab08580
BeginPopupContextItem(): Skip processing when SkipItems is set as LastItemId is unreliable and we assert when it is zero. + Minor comments on columns.
2019-05-20 16:46:47 +02:00
omar
f242cd4d8a
Fixed GCC mem-access warnings ( #2565 )
...
+ using "if defined" more consistently for Clang.
2019-05-19 17:15:14 +02:00
omar
1575a3fbcd
Docking: Fixed temporarily losing Dockspace flag when merging remaining sibling back into a parent node. ( #2563 , #2109 )
...
Would trigger an assert in the Passthru hole path. Broken by fd5859ed .
2019-05-19 17:00:17 +02:00
omar
7e772f6a51
Docking: Fixed undocking whole node (from collapse/docking menu button) from losing its size/pos. Made collapose/docking menu id easier to compute for testing.
2019-05-18 18:42:59 +02:00
omar
31e3e861ef
Update changelog, comments, made empty/no-text clipboard return NULL as with other implementation. Minor style tweaks. ( #2546 )
...
Fixed IMGUI_DISABLE_WIN32_FUNCTIONS not disabling IME code.
2019-05-18 17:44:09 +02:00
Andrew Willmott
02de498a41
Add native mac copy/paste support to match win32 ( #2546 )
2019-05-18 17:34:58 +02:00
omar
2e5860b5a0
Docking: Fixed incomplete merge of 36e714a leading to undocking. #2109
2019-05-18 13:00:00 +02:00
omar
e6109a9145
Fixed ColorEdit breakage introduced by d3a387c ( #2557 , #1875 , #2034 )
2019-05-18 11:18:31 +02:00
Lionel Landwerlin
679cf7434e
Fix undefined behavior ( #2561 )
2019-05-18 10:43:30 +02:00
omar
4158cba1ff
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
2019-05-13 19:23:18 +02:00
omar
fc3c3de551
Fixed uses of IsItemDeactivated(), IsItemDeactivatedAfterEdit() on multi-components widgets and after EndGroup(). ( #2550 , #1875 )
2019-05-13 19:05:41 +02:00
omar
d3a387cc18
Fixed InputFloatX, SliderFloatX, DragFloatX functions erroneously reporting IsItemEdited() multiple times when the text input doesn't match the formatted output value (e.g. input "1" shows "1.000"). It wasn't much of a problem because we typically use the return value instead of IsItemEdited() here. ( #1875 , #2034 )
2019-05-13 19:04:57 +02:00
omar
99a845053a
Internal: Renamed fields + minor tweaks (probably shallow break stack-layout pr, sorry!)
2019-05-13 18:26:28 +02:00
omar
64dbd932d2
Internal: Removed GetNextItemWidth(), relying on ItemAdd or NextItemData.ClearFlags() to clear the width data. Amend 5078fa20 and undo some of its effects of imgui_widgets.cpp
2019-05-13 15:29:00 +02:00
omar
632469d2e5
Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.
2019-05-13 15:11:25 +02:00
omar
36e714a459
Internal: Storing flags for NextWindowData so that we can clear everything with a single write and remove dummy condition fields.
2019-05-13 14:57:30 +02:00
omar
0b485f12d7
Internal: Minor tidying/reordering of sections within ImGuiContext / window DC.
2019-05-13 14:02:03 +02:00
omar
7355c84701
Tweak EndGroup() to facilitate fixing #2550 later (currently should have no side-effect0. Demo: Add extra widget to status query test.
2019-05-12 21:42:36 +02:00
Chris Savoie
b955e485f1
Fixed unused variables warnings when asserts are compiled out. ( #2551 )
2019-05-12 17:53:08 +02:00
omar
aca6ee1a91
Cast ImTextureId to void* before printing in Metrics window. ( #2548 )
2019-05-11 11:34:41 +02:00
Alzathar
02d6d2d487
Platform Binding for GLFW updated with the release of GLFW 3.3 ( #2547 )
...
* With the release of GLFW 3.3, it is now possible to detect correctly monitors working area (see GLFW_HAS_MONITOR_WORK_AREA). GLFW 3.3 also introduced the window hint GLFW_FOCUS_ON_SHOW. This fixed the case where a new created window (viewport) takes the focus even if not visible.
* Disable a GLFW 3.2 windows hack when GLFW 3.3 is detected (related to window focused when shown).
2019-05-11 10:54:56 +02:00
HolyBlackCat
87c5356d97
FreeType: Added RasterizerFlags::Monochrome flag to disable font anti-aliasing. ( #2545 ) Combine with RasterizerFlags::MonoHinting for best results.
2019-05-11 10:46:26 +02:00
omar
ef13d95466
IO: changed AddInputCharacter(unsigned short c) signature to AddInputCharacter(unsigned int c).
...
Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode support. (#2538 , #2541 )
2019-05-11 10:33:56 +02:00
omar
b668726a38
Fixed a PVS Studio static analyzer warning.
2019-05-10 22:58:24 +02:00
omar
835a8b2c9b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-05-10 22:56:43 +02:00
omar
7c256fbd40
Internal: Extracted some of the Begin code into RenderWindowDecorations().
2019-05-10 22:45:52 +02:00
omar
72951a1a85
Internal: Extracted some of the Begin code into RenderWindowTitleBarContents().
2019-05-10 22:45:28 +02:00
omar
b50c61c961
Internal: Begin: Update rectangles before Scrollbar() which now uses them. Fixes 39eeda0.
2019-05-10 22:30:33 +02:00
omar
39eeda0227
Internal: Scrollbar: Further sane simplification (using InnerMainRect instead of duplicating calculations).
2019-05-10 18:52:29 +02:00
omar
37174c85e2
Internal: Scrollbar: Extracted scrollbar code for other uses (eg. table v2 scrolling without using a child window).
2019-05-10 18:52:23 +02:00
omar
9534ef9b26
Separator: Revert 1.70 "Declare its thickness (1.0f) to the layout" change ( c5d83d8a). It's not incorrect but it breaks existing some layout patterns. Will return back to it when we expose Separator flags.
2019-05-09 17:52:56 +02:00
omar
e29176df53
Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.
2019-05-09 13:12:09 +02:00
omar
a4d0b0efa4
Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. ( #759 ) + misc comments
2019-05-09 12:55:01 +02:00
omar
b7c2759f95
Columns: Fixed Separator from creating an extraneous draw command. Fixed Selectable with SpanAllColumns flag from creating an extraneous draw command. ( #125 )
2019-05-09 12:10:36 +02:00
omar
239c8732d7
Viewports: Minor tweaks. ( #2471 )
2019-05-08 18:33:08 +02:00
omar
9bf3f910c8
Viewports: Fix to avoid SetNextWindowViewport being overrided by creation of a standalone viewport. ( #2544 , #1542 )
2019-05-08 18:20:13 +02:00
omar
42fc563fed
Version 1.71 WIP + fixed minor typo
2019-05-07 16:36:08 +02:00
omar
d1d5075b66
Version 1.70
2019-05-06 14:17:39 +02:00
omar
e6c982509d
Examples: DirectX9: Fixes for multi-viewports. Avoid using a depth/stencil target for secondary viewport. ( #2520 , #2502 )
2019-05-06 12:12:32 +02:00
omar
9ddb8493d5
Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. ( #2520 , #2502 )
2019-05-06 12:07:29 +02:00
omar
76e61958fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
2019-05-06 10:16:43 +02:00
omar
d88121ff5b
Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524
2019-05-06 10:15:22 +02:00
omar
6c196cf432
Examples Readme and Changelog tweaks, added #2527 , re-ordered examples/README alphabetically.
2019-05-06 10:02:59 +02:00
Max Thrun
5ecc9d5865
Examples: Metal: Add GLFW+Metal example
2019-05-06 09:51:21 +02:00
ibachar
4f22a45cb5
Removed git merge leftovers
2019-05-04 15:02:28 +02:00
omar
526e2303bc
Window: Fixed SetNextWindowSizeConstraints() with non-rounded positions making windows drift. ( #2067 , #2530 )
2019-05-03 19:09:44 +02:00
omar
9c1f02a42c
Misc: Made IMGUI_CHECKVERSION() macro also check for matching size of ImDrawIdx.
2019-05-03 18:42:53 +02:00
omar
e2166db282
Internals: Fixed incorrect repeat delay/rate calculation in IsMouseClicked() with repeat flag leading to involontary but thankfully doubling the rate. Using our standard function, making the multiplicator explicit.
2019-05-03 15:06:06 +02:00
omar
2dc81057ec
Selectable: With ImGuiSelectableFlags_AllowDoubleClick doesn't return true on the mouse button releas efollowing the double-click. Only first mouse release + second mouse down (double-click) returns true. Likewise for internal ButtonBehavior() with both _PressedOnClickRelease | _PressedOnDoubleClick. ( #2503 )
2019-05-03 14:31:12 +02:00
omar
86f92fe756
Demo: Improved trees in columns demo. ( #2136 )
2019-05-02 21:32:36 +02:00
omar
ce19cb465f
Internals: Rename GetContentRegionMaxScreen() -> GetWorkRectMax(). At this point this is mostly useful to facilitate merge of other branches.
2019-05-02 16:29:40 +02:00
omar
825b61e4ba
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
2019-05-02 14:56:47 +02:00
omar
a1c432d1ad
Internals: SettingsHandlerWindow_ReadLine uses context parameter.
2019-05-02 14:30:35 +02:00
omar
ae405b83a4
Examples: Added missing per-renderer local changelogs. ( #2037 , #1639 , #2452 )
2019-04-30 22:28:29 +02:00
Max Thrun
7c6ba3a1da
ImDrawCallback_ResetRenderState: Added Metal.
2019-04-30 22:18:25 +02:00
omar
5c1cd5c8c7
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. ( #2037 , #1639 , #2452 )
2019-04-30 22:15:59 +02:00
omar
3fbc0b7a9e
Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.
2019-04-29 18:33:08 +02:00
omar
db2d58a68b
Drag and Drop: Fixed drag source with ImGuiDragDropFlags_SourceAllowNullID and null ID from receiving click regardless of being covered by another window (it didn't honor correct hovering rules). ( #2521 )
2019-04-29 16:34:02 +02:00
omar
7e67aba286
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-04-29 13:06:55 +02:00
omar
0f2852806c
Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. ( #2518 )
2019-04-29 12:44:17 +02:00
Richard Mitton
4c0f34fd5d
Improved algorithm for mitre joints on thick lines
2019-04-29 12:07:03 +02:00
omar
4dec744795
Tidying up BeginMenu() code + comments.
2019-04-29 00:02:02 +02:00
omar
842a720e72
Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's ae76a1fd).
2019-04-28 22:33:58 +02:00
omar
bda2cde68e
Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. ( #2517 )
...
Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.
2019-04-28 22:18:51 +02:00
omar
3276b12765
Internals: Added DataTypeApplyOp, DataTypeApplyOpFromText to imgui_internal.h
2019-04-28 20:55:51 +02:00
omar
09db2f6dec
Fix 61d9258 when there is not scrollbar "Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active."
2019-04-28 18:50:51 +02:00
omar
4e81b2d093
Internals: Renaming. Renamed ImGuiPopupRef to ImGuiPopupData for consistency and added constructor.
2019-04-28 17:15:08 +02:00
omar
3d363c91fd
Internals: Exposed ImGuiDataTypeInfo, DataTypeGetInfo(), DataTypeFormatString(). Comments.
2019-04-28 15:27:18 +02:00
omar
00b3c830db
Internals: Begin: Moved OuterRectClipped/InnerMainRect/InnerClipRect computation higher up in the function, next to ContentsRect/WorkRect code. Removed commented out debug drawing code which is now available in Metrics window.
2019-04-26 23:33:09 +02:00
omar
61d92580aa
Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active.
2019-04-26 23:32:29 +02:00
omar
5d799d76ea
Internals: Nav scrolling uses InnerMainRect instead of InnerClipRect.
2019-04-26 23:31:51 +02:00
omar
c5d83d8af2
Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.
2019-04-26 23:31:31 +02:00
omar
a649d904d7
Examples: Emscripten: Fixed not enabling Docking and Nav by default. ( #2494 )
2019-04-26 00:28:28 +02:00
omar
dfb82d5c22
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
2019-04-25 17:53:11 +02:00
omar
56c3aaf6bd
Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.
2019-04-25 17:50:40 +02:00
omar
dd15b44230
Internals: TempInputText: Tidying up DragScalar / SliderScalar / TempInputTextScalar.
2019-04-25 17:50:40 +02:00
omar
0ca1675ff9
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
2019-04-25 16:03:47 +02:00
omar
59a3f0476d
Internals: Using more explicit PushOverrideID() helper + renamed equivalent internal tree helper.
2019-04-25 15:21:22 +02:00
omar
1ca6e5b59f
Examples: Glut: Added note about missing cursor support. ( #2375 , #2465 )
2019-04-25 12:01:01 +02:00
omar
4dc4ace864
Window: Fixed window with the AlwaysAutoResize flag unnecessarily extending their hovering boundaries by a few pixels (this is used to facilitate resizing from borders when available for a given window). One of the noticeable minor side effect was that navigating menus would have had a tendency to disable highlight from parent menu items earlier than necessary while approaching the child menu.
...
+ Changelog fixed unfinished sentence and tweaks,
2019-04-25 11:50:28 +02:00
omar
16b18b265e
MenuItem, BeginMenu: Fix undesirable tall frames in horizontal layout context, which would be visible when trying to use rounded selectable/menus.
...
PushStyleVar: Added comments in the assert message.
Minor tweaks.
2019-04-25 11:34:07 +02:00
omar
6db0766564
Misc comments, internal renaming, added disable indentation option to Columns demo section.
2019-04-24 17:40:07 +02:00
omar
6789ea3482
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. ( #2509 , #2484 ).
2019-04-23 12:38:59 +02:00
David Amador
994a92d79d
Added support to use controllers via SDL_GameController. ( #2509 )
...
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
2019-04-23 12:14:05 +02:00
omar
d0fb547dc1
Viewports: Avoid rendering/swapping secondary viewports that are minimized. ( #1542 , #2496 )
2019-04-22 11:46:04 +02:00
omar
16e9b8191b
Increased IMGUI_VERSION_NUM arbitrarily, help narrowing down reports that don't include a commit hash. Add comments.
2019-04-22 11:16:17 +02:00
omar
f159eb35fb
Examples: SDL: Removed unused code. ( #2484 )
2019-04-22 10:43:14 +02:00
omar
20f0cb0281
Docking: Fixed an issue where DockBuilderSplitNode() wouldn't update the CentralNode shortcut immediately, which was problematic for immediately following DockBuilderDockWindow(). ( #2109 )
2019-04-19 20:28:43 +02:00
omar
03b64defa5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-04-19 19:52:45 +02:00
omar
59f012d656
Internals: ImHashStr() default parameter.
2019-04-19 19:48:51 +02:00
omar
5078fa208b
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
2019-04-18 18:29:28 +02:00
omar
8d53f834ee
Demo: Documents: Fix misusage of ListBoxHeader().
2019-04-18 18:24:51 +02:00
omar
0e46d65b03
Misc: Fixed PushItemWidth(-width) (for right-side alignment) laying out certain items (button, listbox, etc.) with negative sizes if the 'width' argument was smaller than the available width at the time of item submission,
2019-04-18 15:46:13 +02:00
omar
a1cf7d636d
Internals: Rework CalcItemWidth / CalcItemSize but make their similarities and their differences more obvious. ( #2449 )
2019-04-18 15:46:13 +02:00
omar
f355a40367
Added commentary about ContentRegion functions. Added internal GetContentRegionMaxScreen() to facilitate internal code at the moment.
2019-04-18 15:46:13 +02:00
omar
9d4a893a77
Internals: Moved CalcItemSize next to CalcItemWidth, added comments to clarify their respective intent. Should have no side effect.
2019-04-18 15:46:12 +02:00
omar
240dddff87
Combo, Slider: Improve rendering in situation when there's there's very little space available.
2019-04-18 15:46:12 +02:00
omar
1aeee9d40f
Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows.
...
Renamed SameLine() first parameter.
2019-04-17 22:12:17 +02:00
omar
1d3ebef364
Columns: Fixed boundary of clipping being off by 1 pixel within the left column.
2019-04-17 21:51:13 +02:00
Andre Weissflog
74a3878be4
emscripten: replace shell_minimal.html with 'soft fullscreen' version
2019-04-17 11:59:26 +02:00
omar
1f25cdd6b4
Clarified asserts comments + todo entries. ( #2500 )
2019-04-17 09:59:03 +02:00
omar
7baf45cffa
Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.
2019-04-16 22:02:56 +02:00
omar
655ebe4eaf
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2019-04-16 13:14:10 +02:00
omar
742b5f4c68
Merged a bunch of small changes from Docking branch to reduce the difference between branches.
...
Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.
2019-04-16 13:07:43 +02:00
omar
311469e9d6
Internals: Columns: Some renaming, extracted code into GetColumnsID().
2019-04-16 11:58:54 +02:00
omar
8130fd9816
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). ( #2496 )
2019-04-15 18:47:36 +02:00
omar
1fe6533192
Examples: Emscripten: Tweaks for size. ( #2494 )
2019-04-15 17:18:31 +02:00
omar
b89202824e
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2019-04-15 16:03:17 +02:00
omar
35cbf9c052
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
2019-04-15 15:48:38 +02:00
omar
eeea7da3d0
Examples: Emscripten: Fixed error in shell template. ( #2494 )
2019-04-15 01:46:34 +02:00
omar
c1848b185c
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. ( #2494 )
2019-04-15 01:28:44 +02:00
omar
882d480b5e
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
2019-04-15 01:01:39 +02:00
omar
622556719e
Merge branch 'standalone-emscripten' of https://github.com/nicolasnoble/imgui
2019-04-15 00:36:56 +02:00
Nicolas "Pixel" Noble
a936d0669c
Adding standalone Emscripten example.
2019-04-13 22:39:42 +02:00
omar
f70eacee8e
Docking: Internal: Added helper for automation to process docking at the mouse level.
2019-04-13 19:50:30 +02:00
omar
433a7556c7
Docking: Fixed another issue where the resulting node of a split would sometimes recall the pos/size of previous host window. Spent a whole day adding framework for testing more of docking so hopefully we'll heading toward the magical world of less regressions. ( #2109 )
2019-04-13 19:19:56 +02:00
omar
712203dbcb
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-04-13 18:53:00 +02:00
omar
e805ca29d8
Internals: Moved resize grips and borders to nav layer 1 so that testing system doesn't attempt to scroll to get them inside the InnerRect.
2019-04-13 18:51:32 +02:00
omar
800fb26606
Docking: Renamed target_node > node in some functions to facilitate debugger watch use across functions.
2019-04-13 00:36:24 +02:00
omar
224f087a5f
Docking: Rename typo Autority -> Authority + Rename DockContextNewFrameUpdateDocking -> DockContextUpdateDocking.
2019-04-13 00:36:24 +02:00
omar
fb2626c21b
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
2019-04-13 00:29:27 +02:00
omar
092426bed2
Docking: Hold Shift to force disable docking. ( #2109 )
2019-04-13 00:27:44 +02:00
omar
c6f1b7b92a
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
2019-04-13 00:27:44 +02:00
omar
30d81f53cb
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. ( #2485 )
2019-04-12 22:16:59 +02:00
omar
ee02cdbf03
Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)
2019-04-12 17:49:40 +02:00
omar
328e4fa7e7
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
2019-04-11 15:53:38 +02:00
omar
07a70dc972
Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.
2019-04-11 15:40:36 +02:00
omar
570d0bbbda
Demo: Comments, tweaks, removed some uses of ImColor helpers.
2019-04-11 15:23:54 +02:00
omar
f3110a57cd
Docking: Fixed an issue where newly created dock node override hosted window pos/size ( #2109 , #2386 )
2019-04-11 14:51:01 +02:00
omar
b8fe0df7df
Examples: Null: Added Makefile.
2019-04-08 19:16:45 +02:00
omar
cf029b3e1c
Merge branch 'master' into docking
2019-04-08 18:05:52 +02:00
omar
1391904fd2
Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684 , #2341 )
2019-04-08 17:59:25 +02:00
omar
b53630813e
Internals: Tweak ItemSize calls. Added todo items.
2019-04-08 16:13:51 +02:00
omar
42423d5ea4
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. ( #297 )
2019-04-07 23:02:07 +02:00
omar
1295205cd4
Examples: Vulkan: Fixed warnings. ( #2480 )
2019-04-07 22:27:45 +02:00
omar
7056032483
Merge branch 'vulkan_fix_docking' into docking
2019-04-07 16:23:34 +02:00
omar
50ceb25003
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
2019-04-07 16:23:31 +02:00
omar
ccca76fdea
Merge branch 'vulkan_fix_master'
2019-04-07 16:22:47 +02:00
omar
302af7b2c9
FAQ tweaks. Add missing entries in imgui.cpp (which until now where only in the README).
2019-04-07 16:22:41 +02:00
omar
c43dab2414
Vulkan: Fix not incrementing semaphore index. ( #2472 , #2071 )
2019-04-07 15:57:07 +02:00
omar
9c364b16ff
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
2019-04-05 20:30:42 +02:00
omar
e099a7dc74
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
2019-04-05 20:27:46 +02:00
omar
c8fd4afd75
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
2019-04-05 20:20:24 +02:00
omar
bd351e9ac5
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
2019-04-05 20:20:08 +02:00
omar
d61caf5714
Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. ( #2461 , #2348 , #2378 , #2097 )
2019-04-05 18:52:45 +02:00
omar
e70f866ed2
Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames)
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
2019-04-05 18:27:15 +02:00
omar
6bc47dfe48
Vulkan: Removed superfluous vkInstance parameters being passed along.
2019-04-05 18:24:28 +02:00
omar
452047c7ca
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
2019-04-05 18:24:28 +02:00
omar
ec76722d2d
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. ( #2472 , #2071 )
2019-04-05 17:22:24 +02:00
MindSpunk
a45840746e
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
2019-04-05 17:04:12 +02:00
MindSpunk
9acb158990
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
2019-04-05 16:51:35 +02:00
omar
1ba79baab5
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. ( #2472 , #2461 , #2071 )
2019-04-05 16:33:41 +02:00
omar
01de69de36
Vulkan: Note for unsupported feature with multi-viewports. ( #2071 )
2019-04-05 00:25:42 +02:00
omar
8ec24036d7
Vulkan: Viewports: Removed redundant field.
2019-04-05 00:01:25 +02:00
omar
29269d2aa8
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
2019-04-04 23:55:33 +02:00
omar
0034e65c26
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
2019-04-04 23:40:28 +02:00
omar
4f54a527ab
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. ( #2071 )
2019-04-04 23:13:31 +02:00
omar
86f5945f49
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
2019-04-04 23:13:31 +02:00
omar
66f4be2e13
Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. ( #2461 , #2348 , #2378 , #2097 , #2071 , #1677 )
2019-04-04 22:27:29 +02:00
omar
6bf981c85c
Vulkan: More renaming. Comments.
2019-04-04 22:20:01 +02:00
omar
f586764cdd
Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. ( #2071 )
2019-04-04 22:12:16 +02:00
omar
54b8a65d9e
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. ( #2071 )
2019-04-04 22:12:15 +02:00
omar
317859a3da
Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). ( #2071 )
2019-04-04 22:11:13 +02:00
omar
c7eef99a33
Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. ( #2071 )
2019-04-04 22:10:43 +02:00
MindSpunk
b88a3b2711
Examples: Vulkan: Added calls to supports runtime changing back buffer count. ( #2071 )
2019-04-04 22:10:43 +02:00
omar
43a85dd02e
Merge branch 'master' into docking
2019-04-04 22:10:18 +02:00
omar
1c3311e4d6
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
2019-04-04 22:09:26 +02:00
omar
9ba64f9fe3
Viewport: Fixed PushClipRectFullScreen() missing out on negative coordinates. Among other things, the outer highlight during CTRL+Tab wouldn't appear in negative coordinates monitors. (~#2176, #1542 )
2019-04-04 22:02:36 +02:00
omar
fc52364652
Tabs to Spaces, comments.
2019-04-03 17:25:02 +02:00
omar
cdb109f617
Renamed freeglut vcxproj files + Comments, Changelog ( #2465 )
2019-04-03 16:25:35 +02:00
Andrew Willmott
ece322ff12
freeglut -> glut rename
2019-04-03 07:19:31 -07:00
Andrew Willmott
3fad375f5f
ifdef freeglut extensions properly
2019-04-03 07:19:31 -07:00
Andrew Willmott
81f70e5b7c
Fixups for OSX
2019-04-03 07:19:31 -07:00
Andrew Willmott
a402f5b9a9
Add makefile for freeglut
2019-04-03 07:19:31 -07:00
omar
5c4cc370bb
Examples: Vulkan: Added shader sources/references in the .cpp source.
2019-04-03 11:23:54 +02:00
omar
49fb8e6c45
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
2019-04-03 11:17:26 +02:00
omar
8dab7ac021
InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. ( #2467 , #1336 )
2019-04-03 11:14:34 +02:00
omar
da035ced97
InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. ( #1336 , #2467 )
...
+ Fix some output filename in SDL build batch files.
2019-04-03 11:04:00 +02:00
omar
01e29a3933
InputText: Fixed ImGuiInputTextFlags_AllowTabInput leading to two tabs characters being inserted if the back-end provided both Key and Character input. ( #2467 , #1336 )
2019-04-03 10:45:51 +02:00
omar
4a57507f75
InputText: Work-around for buggy standard libraries where isprint('\t') returns true. ( #2467 , #1336 )
...
Not using isprint. + todo items.
2019-04-03 10:40:14 +02:00
omar
e3cd6b1cbb
Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
2019-04-02 15:34:16 +02:00
omar
3a737e665a
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
2019-04-02 10:36:35 +02:00
Nicolas Noble
d9568c717d
Silencing -Wstack-protector ( #2459 )
2019-03-31 01:35:03 -07:00
omar
e21bbee311
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. ( #2454 )
2019-03-29 18:32:57 +01:00
omar
163779da51
Examples: DirectX12: Various tidying up.
2019-03-29 16:23:37 +01:00
omar
512d39d031
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
2019-03-29 16:17:30 +01:00
omar
9bf6509c6e
Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. ( #2109 ) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system ( #2304 )
2019-03-28 18:43:27 +01:00
omar
5af385ea78
Viewport: Renamed member + added note about a Docking issue with restoring focus.
2019-03-28 18:02:03 +01:00
omar
47219dd5c6
Docking: Remove code in BeginDocked() to set HiddenFramesCannotSkipItems based on upcoming tab bar selection, solely based on focus (might break something subtle?). Follow-up to c355ed1267. ( #2453 , #2109 )
2019-03-28 16:13:06 +01:00
omar
b6ae8a0dca
Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). ( #2453 , #2109 )
2019-03-28 16:11:50 +01:00
omar
a33d45d7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-03-28 15:48:25 +01:00
omar
9a0e71a6ec
Internals: Renamed the ImGuiWindow HiddenFrameXXX fields to decorrelate them from resizing behavior, as those values are set by other logic.
2019-03-28 15:41:49 +01:00
omar
5a665e423c
Docking: Added ImGuiDockNodeFlags_NoTabBar (not exposed publicly). ( #2423 , #2109 )
2019-03-27 20:44:49 +01:00
omar
fc95da8aa3
Docking: Internals: Moved CentralNode and HiddenTabBar state into LocalFlags for consistency. ( #2423 , #2109 )
2019-03-27 20:32:44 +01:00
omar
fd5859ed04
Docking: Separating SharedFlags vs LocalFlags in dock node so settings can be applied to individual nodes. Made _NoResize logic on single node applies as expected. ( #2423 , #2109 )
2019-03-27 19:00:36 +01:00
omar
75e3793f4d
Docking: Fix DockBuilderAddNode() not storing flags when creating floating node.
2019-03-27 17:36:52 +01:00
omar
8d4b5fef1d
Renamed ImGuiDockNodeFlags_Dockspace to ImGuiDockNodeFlags_DockSpace for consistency. DockBuilderCopyDockspace() to DockBuilderCopyDockSpace(). Made casing consistent elsewhere. ( #2109 )
2019-03-27 17:36:52 +01:00
omar
04a9ce3a18
Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. ( #2109 )
2019-03-27 16:16:31 +01:00
omar
87883abd86
Docking: Tweak and silencing PVS studio static analyzer (back to zero warnings among our selected ones).
2019-03-26 14:15:56 +01:00
Tom Watson
f20725eada
Docking: Fixed an issue where windows docked into a node that's part of their dockspace wouldn't recover their order correctly after init. ( #2109 )
...
(It only worked on floating dock node for the accidental reason that BeginDocked would generally early out on the first frame)
2019-03-26 13:58:03 +01:00
omar
26646f2450
Docking: Wrapping tab bar creation/destroy to make it easier to debug them.
2019-03-26 12:41:50 +01:00
omar
f208fd7ebb
Docking: Fixed crash with ImGuiDockNodeFlags_AutoHideTabBar flag. ( #2423 , #2109 )
2019-03-26 12:33:58 +01:00
omar
20188b19d6
Comments ( #2441 ) + Freeglut fixes ( #2430 )
2019-03-26 12:16:23 +01:00
omar
cf1b02e54e
Rearrange code in UpdateMouseWheel(). ( #2424 , #1463 ) + Fix old io.FontAllowUserScaling feature (probably should be made obsolete, but until then best fixed)
2019-03-25 19:40:19 +01:00
Luca Rood
1963cc59be
Implement horizontal scrolling with Shift+Scroll
...
This is standard scrolling behaviour in most applications.
2019-03-25 19:09:40 +01:00
omar
9350158d61
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2019-03-25 16:08:09 +01:00
omar
3d8ea352d1
InputText: Fixed selection background starts rendering one frame after the cursor movement when first transitioning from no-selection to has-selection. (Bug in 1.69) ( #2436 ) [@Nazg-Gul]
2019-03-25 16:06:30 +01:00
omar
abb7d7b18a
InputText: Simplify read-only code path.
2019-03-25 15:50:23 +01:00
omar
d9f6ba3035
IsWindowHovered() made change which should have no effect in master but fix result of IsWindowHovered(ImGuiHoveredFlags_ChildWindows) over multiple viewport in docking branch. ( #2432 )
2019-03-25 15:39:11 +01:00
Gnimuc
a53c57152b
Mention Julia binding in README ( #2446 )
...
Thank you!
2019-03-23 19:32:19 -07:00
omar
7a5196601e
Docking: BeginDocked() doesn't need to rely on tab bar data (will allow removing tab bar).
2019-03-18 09:48:06 -07:00
omar
c7619d4a6a
Docking: Preserve existing docked nodes when setting the ImGuiDockNodeFlags_NoDockingInCentralNode flag. ( #2423 , #2109 )
2019-03-18 09:48:00 -07:00
omar
221bf93a55
Comments, todo list, remove trailing spaces.
2019-03-17 00:56:21 +01:00
omar
7ba774a440
Viewports: Fixed being unable to refocus windows when ConfigViewportsNoTaskBarIcon + ConfigViewportsNoDecoration are enabled. ( #2420 , #1542 ) [@PathogenDavid] + comments.
2019-03-15 15:35:46 +01:00
omar
857381b9ca
GetMouseDragDelta(): also returns the delta on the mouse button released frame. Verify that mouse positions are valid otherwise returns zero. Removed obsolete comment. Tweaked demo. ( #2419 )
2019-03-15 15:03:37 +01:00
omar
ff03ae503b
Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. ( #2421 )
2019-03-15 13:09:07 +01:00
omar
cf2c52282d
Version 1.70 WIP
2019-03-15 13:07:30 +01:00
omar
ebe79bbed0
Demo: Custom rendering: Minor sizing issue fix.
2019-03-13 15:44:23 +01:00
omar
b1af4d36ce
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
2019-03-13 15:30:35 +01:00
omar
55c02099c5
Version 1.69, comments, typos
2019-03-13 15:29:43 +01:00
omar
c3f20f6b81
Viewport: DestroyPlatformWindow() skips calling user function if PlatformWindowCreated is set. + Clarified comment about implicit Debug viewport which may be hogging a viewport.
2019-03-13 11:27:30 +01:00
David Maas
e7dca4fec2
Fixed main viewport not being marked as created, which broke updating the IME input position for the main viewport.
...
This change also removes the logic scattered about that compensated for PlatformWindowCreated being wrong for the main viewport.
2019-03-13 10:59:32 +01:00
omar
a26085ed53
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items ( #211 ) + Examples comments
2019-03-12 22:23:56 +01:00
omar
53e0c13be2
TabBar: Reworked scrolling policy (when ImGuiTabBarFlags_FittingPolicyScroll is set) to teleport the view when aiming at a tab far away the visible section, and otherwise accelerate the scrolling speed to cap the scrolling time to 0.3 seconds.
2019-03-12 20:57:02 +01:00
omar
99d8425173
TabBar: Fixed Tab tooltip code making drag and drop tooltip disappear during the frame where the drag payload activate a tab.
2019-03-12 18:56:19 +01:00
omar
9afb849e16
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
2019-03-12 18:28:47 +01:00
omar
cfa8f672f6
Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) ( #2416 )
2019-03-12 18:27:14 +01:00
omar
495065f790
Fixed Clang and PVS warnings.
2019-03-12 12:08:51 +01:00
omar
f254168335
InputText: Fixed c779fbb leading to display of the wrong buffer when resizing a buffer. ( #2400 , #2006 , #1443 , #1008 ).
2019-03-12 11:56:40 +01:00
omar
897badec7a
Demo: InputText: Demonstrating use of ImGuiInputTextFlags_CallbackResize. ( #2006 , #1443 , #1008 ).
2019-03-12 11:24:49 +01:00
omar
a92c587c75
Added GetGlyphRangesVietnamese() helper. ( #2403 )
2019-03-11 22:02:59 +01:00
omar
65c2220049
Internal: Removed unused fields from ImGuiMenuColumns.
2019-03-11 20:14:56 +01:00
omar
e1acb0b1fa
Docking: Fixed node merging altering window position incorrectly in a way that would make SizeContents incorrect for the next frame (making scrollbar flicker). ( #2414 , #2109 )
2019-03-11 19:46:37 +01:00
omar
3ead9820f7
Viewport: Popups and Tooltips viewports are correctly parented to the parent window's viewport. ( #2409 , #1542 )
2019-03-11 16:51:46 +01:00
omar
f7db4fad31
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
2019-03-11 16:08:16 +01:00
omar
6767b0a1b0
Examples: Win32+DirectX: moved helper functions below main.
2019-03-11 16:00:18 +01:00
omar
cf4fcc4735
Viewports: Fixed delayed window pos->viewport pos sync leading to monitor not being updated at the time of clamping window position in Begin. ( #2415 , #1542 )
2019-03-11 13:15:00 +01:00
omar
3eedb542a6
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
2019-03-11 11:07:23 +01:00
omar
ecf7666624
Docking: Fixed an issue where removing the last window from a dockspace node that is not a central node without remove the node. ( #2414 , #2109 )
2019-03-10 22:19:18 +01:00
Bruce Mitchener
b5d57a6615
Fix typos. ( #2413 )
2019-03-09 10:10:17 +01:00
Bruce Mitchener
17c567c3a9
Don't use const qualified parameters in declarations.
...
This fixes warnings from clang-tidy like this:
parameter 'v_max' is const-qualified in the function declaration;
const-qualification of parameters only has an effect in function definitions
Since values (rather than references or pointers) don't need to be
const, they don't need to be marked that way in the function declaration.
2019-03-08 18:21:11 +01:00
Haldean Brown
79bb4ce128
Added ImGuiColorEditFlagsFlags_InputHSV. ( #2383 , #2384 )
2019-03-08 18:16:41 +01:00
omar
8e0e91827f
ColorEdit: Fixed tooltip not honoring the ImGuiColorEditFlags_NoAlpha contract of never reading the 4th float in the array (value was read and discarded). ( #2384 )
2019-03-08 18:16:41 +01:00
omar
66936880ba
Moved placeholder sections to match Docking branch. Comments.
2019-03-08 18:16:41 +01:00
Bruce Mitchener
3b11505481
Fix typos. ( #2411 )
2019-03-08 17:52:32 +01:00
omar
d77d3416d3
Merge branch 'master' into docking
2019-03-07 18:40:55 +01:00
omar
5ce93bc0cc
Refactor: Move viewport code under other subsystem to simplify merging (4) (moving in multiple commits to make diff/patch behave nicely)
2019-03-07 18:39:31 +01:00
omar
54a129a2e2
Refactor: Move viewport code under other subsystem to simplify merging (3) (moving in multiple commits to make diff/patch behave nicely)
2019-03-07 18:38:40 +01:00
omar
bdf60dac6a
Refactor: Move viewport code under other subsystem to simplify merging (2) (moving in multiple commits to make diff/patch behave nicely)
2019-03-07 18:37:17 +01:00
omar
bbb543fc16
Refactor: Move viewport code under other subsystem to simplify merging (1) (moving in multiple commits to make diff/patch behave nicely)
2019-03-07 18:36:11 +01:00
omar
f717df4eb6
Internal: Columns: Allow to use BeginColumns(1) so code designed for variable number of columns can still call NextColumn etc. ( #125 )
2019-03-07 18:22:28 +01:00
omar
e9651aaa77
TabBar: Fixed ImGuiTabItemFlags_SetSelected being ignored if the tab is not visible (with scrolling policy enabled) or if is currently appearing.
2019-03-07 17:45:59 +01:00
omar
1c23981782
Made ImS8 and ImS16 explicitly signed in case some crazy SDK decide to flip the signedness over. ( #2408 )
2019-03-07 16:10:44 +01:00
omar
28d8eb220b
Fix for Android char being unsigned by default ( #2408 )
2019-03-07 16:07:16 +01:00
Gilad Reich
0a6c5bc234
Examples: DirectX9: Added support for multi-viewport ( #2394 )
2019-03-06 21:36:42 +01:00
omar
e91d275b10
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
2019-03-06 21:18:46 +01:00
omar
8464df1f6e
Internals: ColorEdit: Minor optimizations. Initialize internal arrays as static const, avoid unnecessary HSV->RGB conversion.
2019-03-06 19:30:34 +01:00
omar
ea8158acdf
Demo: Renamed ShowHelpMarker() -> HelpMarker(). Fixed minor PVS warning. Removed unnecessary casts.
2019-03-06 18:24:07 +01:00
omar
510342f024
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. ( #2394 )
2019-03-06 18:00:04 +01:00
omar
c779fbb651
InputTextWithHint: Fix for Password fields. Update changelog, demo. ( #2400 )
2019-03-06 17:33:24 +01:00
Lucas Lazare
ab80ee6453
Added InputTextWithHint() ( #2400 )
...
Squashed commit of the following:
commit 1970d84051d3878f8c1354d9c33c795d9c66143f
Author: Lucas Lazare <lazarelucas@yahoo.fr >
Date: Tue Mar 5 12:20:39 2019 -0500
Removing sneaky tabulations #2 (why, editor T-T)
I should update my settings, I guess
commit 219bdfcb7fbd17edf3048cb0edfde2532e4d6ac3
Author: Lucas Lazare <lazarelucas@yahoo.fr >
Date: Tue Mar 5 12:17:27 2019 -0500
Removing useless check introduced in b0d172
commit 8afd7a2b459df0eb14eca88d832d2bebd1e684e6
Author: Lucas Lazare <lazarelucas@yahoo.fr >
Date: Tue Mar 5 11:49:24 2019 -0500
Removing sneaky tabulations
commit 8e0490863126d63cafc782a6aac8707e44f95653
Author: Lucas Lazare <lazarelucas@yahoo.fr >
Date: Tue Mar 5 11:45:13 2019 -0500
Moving InputTextHinted code to InputTextEx
commit b0d1723a2fb02d17ba15b9c1e679dedbbe3c17fd
Author: Lucas Lazare <lazarelucas@yahoo.fr >
Date: Tue Mar 5 00:23:02 2019 -0500
C++11 to C++98
commit 9afeae399826015357962607b4aeb0109fde698e
Author: Lucas Lazare <lazarelucas@yahoo.fr >
Date: Mon Mar 4 23:43:28 2019 -0500
Added InputTextHinted
2019-03-06 17:33:05 +01:00
omar
fe48368cb2
InputText: Moving some code in anticipation of supporting hint display with password. This commit is aimed at having no visible side effect. ( #2400 )
2019-03-06 15:45:11 +01:00
David Maas
8b8ab1db5b
Removed redundant declaration of SetNextWindowClass. ( #2402 )
2019-03-06 09:39:16 +01:00
omar
e02d6014bf
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-03-05 22:13:38 +01:00
omar
344140004b
Fixed IsItemDeactivated()/IsItemDeactivatedAfterEdit() from not correctly returning true when tabbing out of a focusable widget (Input/Slider/Drag) in most situations. ( #2215 , #1875 )
...
+ Minor renaming of a local variable in widget code.
2019-03-05 22:09:25 +01:00
omar
26328fc9fe
Internal: Tabbing/Focus: Tidying up old code, moved some state to context instead of window. Storing new data will allow us to fix the bug mentioned in #2215 (probably in next commit).
2019-03-05 19:51:27 +01:00
omar
9c45072cb0
Demo: Added flags to InputTextMulttiline() demo.
2019-03-05 19:25:07 +01:00
omar
076be7ec41
MenuItem, Selectable: Fixed disabled widget interfering with navigation (fix c2db7f63 in 1.67).
2019-03-05 19:00:19 +01:00
omar
ce4e62649a
Internal: Tabbing: Tweaks to FocusableItemRegister and using the standard mechanism to allow/block Tab being interpreting by tabbing instead of InputText() widget.
2019-03-05 18:24:59 +01:00
omar
1ed3c4cf4a
Internal: Text: Extracted TextUnformatted into TextEx over which we can freely atter the signature. Clarified current large text behavior of TextUnformatted with explicit ImGuiTextFlags_NoWidthForLargeClippedText flag (always set).
2019-03-05 17:35:45 +01:00
omar
622a27506a
Text: Fixed large Text/TextUnformatted call not declaring its size when starting below the lower point of the current clipping rectangle. Somehow this bug has been there since v1.0! It was hardly noticeable but would affect the scrolling range, which in turn would affect some scrolling request functions when called during the opening frame of a window.
2019-03-05 15:23:11 +01:00
omar
ac4842fa17
Nav: Fixed Ctrl+Tab keeping active InputText() of a previous window active after the switch. ( #2380 )
2019-03-05 12:03:54 +01:00
omar
f4dd990e38
Comments and Issue Template
2019-03-05 11:03:32 +01:00
omar
8414c0bb09
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-03-04 18:08:19 +01:00
omar
94e794f81b
Renamed GetOverlayDrawList() to GetForegroundDrawList() for consistency. Kept redirection function (will obsolete). ( #2391 )
...
Demo: Using GetBackgroundDrawList() and GetForegroundDrawList() in "Custom Rendering" demo.
2019-03-04 16:35:50 +01:00
omar
96b13760d4
Added GetBackgroundDrawList() helper to quickly get access to a ImDrawList that will be rendered behind every other windows. ( #2391 )
2019-03-04 16:10:51 +01:00
omar
49eb5f0280
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
2019-03-03 23:34:56 +01:00
omar
beb3062dc5
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
2019-03-03 23:34:28 +01:00
omar
9d1a392d7d
Examples: OpenGL: Comments about versions and loaders. ( #2393 , #2351 )
2019-03-03 23:25:51 +01:00
Richard Mitton
7a536f1bd2
Examples + Viewport: GLFW: context wasn't set when using multiple windows. ( #2392 )
2019-03-03 23:01:43 +01:00
omar
1c67d09c0b
ColorPicker: Fix assertion when running in a collapsed window and dragging its title bar ( #2389 )
2019-03-01 00:06:36 +01:00
omar
1d0b4df3d9
Misc: Asserting in NewFrame() if style.WindowMinSize is zero or smaller than (1.0f,1.0f). Internal: ImHash functions tweaks. Added InputText() to query status section.
2019-02-28 22:57:22 +01:00
omar
ff0c6c2bde
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-02-27 19:00:09 +01:00
omar
f02705fbaa
InputInt, InputScalar: +/- buttons now respects the natural type limits instead of overflowing or underflowing the value.
2019-02-27 18:59:17 +01:00
omar
736d3e2654
DragScalar, InputScalar, SliderScalar: Added support for u8/s8/u16/s16 data types. We are reusing function instances for larger types to reduce code size. ( #643 , #320 , #708 , #1011 )
2019-02-27 18:16:03 +01:00
omar
525a53a86b
Comments
2019-02-27 17:26:18 +01:00
omar
ac47710db7
Internal: InputText: Tweaks to make PVS static analyzer relax a little with its false positive.
2019-02-27 16:49:55 +01:00
omar
6de09a5e48
Renamed ColorEdit/ColorPicker's ImGuiColorEditFlags_RGB/_HSV/_HEX flags to respectively ImGuiColorEditFlags_DisplayRGB/_DisplayHSV/_DisplayHex. This is anticipation of adding new flags to ColorEdit/ColorPicker functions which would make those ambiguous. ( #2384 ) [@haldean]
2019-02-27 16:45:58 +01:00
haldean
8a2f6866a6
add _Show prefix to color flags that control inputs, rename __InputsMask to __ShowMask
...
This is anticipation of changing __InputsMask to control the format of
input colors, and adding _InputRGB and _InputHSV to change how input
colors are interpreted.
2019-02-27 16:24:15 +01:00
omar
688035b5f4
Added px_render_imgui.h ( #1935 )
2019-02-27 15:06:11 +01:00
omar
cef77098ab
Update README.md
2019-02-27 15:00:41 +01:00
omar
75641926e1
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
...
# Conflicts:
# examples/imgui_impl_allegro5.cpp
2019-02-27 14:39:41 +01:00
omar
def723b6b6
Plot: Fixed error in 5e3a1de ( #2387 )
2019-02-27 14:34:11 +01:00
omar
5e3a1de4e6
Plot: Fixed divide-by-zero in PlotLines() when passing a count of 1. ( #2387 ) [@Lectem]
2019-02-27 14:25:37 +01:00
omar
4eecf80a4b
Moved Settings section above Docking to facilitate master<>docking merges.
2019-02-26 15:34:47 +01:00
omar
104294c7e4
Moved Logging/Capturing section above Docking to facilitate master<>docking merges.
2019-02-26 15:33:50 +01:00
omar
6b43a314bf
Merge branch 'master' into docking
2019-02-26 12:53:38 +01:00
omar
cf3cb7cf7e
InputText: Fixed various display corruption related to swapping the underlying buffer while a input widget is active (both for writable and read-only paths). Often they would manifest when manipulating the scrollbar of a multi-line input text.
2019-02-26 12:50:44 +01:00
omar
b7b82520b4
Internal: InputText: Minor changes (intended to have side-effect but clarify next commit, however there is rarely such a thing as zero side effect in InputText land!)
2019-02-26 12:28:27 +01:00
omar
439f726945
InputText; Disabled rendering selection when inactive (it kinda work but I'm not sure this is desirable especially for single-line input, was not intended to be active).
2019-02-24 23:31:00 +01:00
omar
8915f7933a
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-02-24 23:24:07 +01:00
David Wingrove
5d7bd2309b
Fixes warning caused by a missing switch/case. ( #2382 , #2381 )
2019-02-24 23:19:36 +01:00
Elias Daler
c3ea1748dc
Fix -Wconversion warning ( #2379 )
...
The warning was caused by implicit conversion from pointer type which
NULL has to non-pointer type, e.g. if ImTextureID is long int
2019-02-24 18:35:52 +01:00
omar
6f80179a1d
InputText: Fixed deactivated but-last-active InputText instance holding on displaying the last active version of the text and not reflecting change in the source. Fix/amend 2e9a175. [+test]
2019-02-23 17:04:54 +01:00
omar
6cbf4b8121
Fixed uninitialized variable (leading to asserts in the docking branch). ( #2376 , #2371 )
2019-02-23 17:00:59 +01:00
omar
9558e327d2
Log/Capture: Fixed extraneous leading carriage return. Fixed an issue when empty string on a new line would not emit a carriage return.
2019-02-23 16:22:55 +01:00
omar
cd67d4d3c1
Log/Capture: Fixed LogXXX functions 'auto_open_depth' parameter being treated as an absolute tree depth instead of a relative one. Fixed CollapsingHeader trailing ascii representation being "#" instead of "##". Minor tidying up the of code.
2019-02-23 16:07:01 +01:00
omar
2cd7de5666
Internal: Log/Capture: Rework to add an internal LogToBuffer() function which is useful for writing automated tests. Clarified logging state by adding an enum.
2019-02-23 15:57:06 +01:00
omar
3eba840053
Nav: Fixed a tap on AltGR (e.g. German keyboard) from navigation to the menu layer. (follow and extend on e.g #369 , #370 )
2019-02-23 14:50:36 +01:00
omar
87ded34f9f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
2019-02-22 12:29:18 +01:00
omar
9da48c16c5
TabBar: Added extra mis-usage error recovery. Past the assert, common mis-usage don't lead to hard crashes any more, facilitating integration with scripting languages. ( #1651 )
2019-02-22 12:27:41 +01:00
omar
0f83145aa8
TabBar: Fixed a crash when using BeginTabBar() recursively (didn't affect docking). ( #2371 )
...
Added ImPool::Contains() helper.
2019-02-22 12:24:27 +01:00
omar
f988618ebe
Internal: InputText: Tweaks (including a large indentation change, compare ignoring space) to make next commit more digestible.
2019-02-21 23:06:26 +01:00
omar
be593f2c16
Internal: InputText: refactor the flow to easily decorrelate rendering of selection vs cursor, which would allow us to render selection on inactive items, and generally makes the code clearer. + Some renaming.
2019-02-21 22:56:09 +01:00
omar
332f8f2462
Internal: InputText: Made clipboard copy/cut use its own temporary buffer (like paste) so we can guarantee that TempBuffer if not altered and can be preserved. Renamed TempBufferA to TextA to celebrate this.
2019-02-21 19:55:37 +01:00
omar
81a8730022
Internal: InputText: Renamed is_editable to !is_readonly, Hopefully more explicit. Renamed internal member. Shuffled some code. Added comments, assert (_will_ trigger on !readonly > readonly edge, old bug).
2019-02-21 19:55:36 +01:00
omar
cc3be5d428
InputText: Fixed an edge case crash that would happen if another widget sharing the same ID is being swapped with an InputText that has yet to be activated.
2019-02-21 19:55:36 +01:00
omar
2e9a175057
Internal: InputText: Refactor to clarify access pattern to the InputTextState (we are now accessing via a pointer which can be NULL, shortened its name while we are at it) + added an assert to track an issue that existed already before.
2019-02-21 19:55:36 +01:00
omar
677e64e71e
Internal: InputText: Comments. Renamed internal member. Renamed ImGuiStb->ImStb.
2019-02-20 21:34:08 +01:00
omar
79f7778e48
Moved binaries to dearimgui.org/binaries
2019-02-20 15:11:18 +01:00
omar
2068dd509c
Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. ( #2366 , #2186 )
2019-02-20 14:31:19 +01:00
omar
782b747a17
InputText: Renamed some local variables to clarify code. Should be a no-op functionality wise. TODO items.
2019-02-20 00:45:45 +01:00
omar
7c51cba74f
InputInt, InputFloat, InputScalar: Fix to keep the label of the +/- buttons centered when style.FramePadding.x is abnormally larger than style.FramePadding.y. Since the buttons are meant to be square (to align with e.g. color button) we always use FramePadding.y. ( #2367 )
2019-02-20 00:20:11 +01:00
omar
257f5d204e
Version 1.69 WIP
2019-02-20 00:11:36 +01:00
omar
93b06e6e7c
Internal: Changed Scrollbar() signature. Using GetScrollbarID() in InputTextMultiline().
...
Removed multiple semi-colons (#2368 )
2019-02-20 00:08:21 +01:00
omar
91cc32379d
Updated binaries (now auto-generated by a script! next step would be to slowly transition all this stuff into a public repo)
2019-02-19 20:27:47 +01:00
omar
d0c98bf880
Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
2019-02-19 20:13:06 +01:00
omar
77833003ff
Fixed unused argument warning when compiling with IM_ASERT() evaluating to an empty macro.
2019-02-19 17:32:14 +01:00
omar
ff0f9aa856
Comments for Linux/Mac ( #2117 )
2019-02-19 16:36:06 +01:00
omar
9dc02464a4
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-02-19 13:04:35 +01:00
omar
3c15dffc94
Version 1.68
2019-02-19 12:50:46 +01:00
omar
7573d10a4a
Docking: Fixed bad ever-growing/ leak (accumulating text into TabsNames forever, fix d38f4dc14 from February 5th, affected docking branch only). ( #2109 )
2019-02-18 16:50:39 +01:00
omar
5412cdf2c8
Docking: Made DockBuilderSplitNode/DockNodeTreeSplit work even if the node doesn't have a size yet. ( #2357 , #2109 )
...
Followup to fa0ce4b7d , at that time I came to the conclusion that programmatic split couldn't work without knowing the size ahead of it. I forgot the reason for that. May bite us back!
2019-02-18 16:23:54 +01:00
omar
3de440fda2
Docking: Fixed assert in DockContextProcessDock() preventing some uses of DockNodeBuilder api. ( #2357 , #2109 )
2019-02-18 16:13:17 +01:00
omar
5bf9029bf9
Merge branch 'master' into docking
2019-02-18 12:16:13 +01:00
omar
f5bf6e38d2
Font: Fixed assert when specifying duplicate/overlapping ranges within a same font. ( #2353 , #2233 )
2019-02-18 12:11:46 +01:00
omar
db40699990
imgui_freeetype: Updated suggested test code.
2019-02-18 12:08:19 +01:00
omar
d972533d09
Examples: Vulkan: Rewrote scissor processing to match other examples more closely. Removed extraneous +1 of scissor extent height.
2019-02-16 12:33:38 +01:00
omar
dd14adc731
Examples: Vulkan: Support draw_data->FramebufferScale correctly matching a79785c for on Metal/GL2/GL3. ( #2306 , #1676 )
2019-02-16 12:32:44 +01:00
omar
f977871854
ImFont: Minor adjustment to the structure.
...
Examples: Removed unused variable.
2019-02-15 18:56:08 +01:00
omar
09c9bf2edb
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-02-14 20:35:11 +01:00
omar
76dbff37cd
Selectable: Tweaks for #2347 (demo, changelog, member position)
2019-02-14 20:29:50 +01:00
haldean
b277cfffc8
Selectable: add support for specifying text alignment on selectables ( #2347 )
...
Adds a style variable to Selectable that allows clients to specify the
text alignment within Selectables, adds a section in the demo to
demonstrate selectable text alignment, and a pair of sliders in the
style editor to change selectable alignment on the fly.
In terms of implementation, this one is extremely simple: Selectable was
already calling an API that supports text alignment, but had hard-coded
it to top-left. This changes that to just pass the style variable
straight through to RenderTextClipped. Backwards-compatibility is
preserved by defaulting the text_align parameter to (0, 0), i.e.,
top-left.
This also fixes a bug with selectable text rendering that caused
right-aligned text in a selectable to be clipped incorrectly, because
the wrong clipping rectangle was being used.
2019-02-14 19:38:57 +01:00
omar
93d1179805
Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency.
...
Added more link to nothing's oversample document. Spacing bits.
2019-02-14 19:29:09 +01:00
omar
3c07ec6a61
Made it illegal/assert when io.DisplayTime == 0.0f (with an exception for the first frame).
...
Causing too many subtle side-effect, e.g. IsNavInputPressed() would return true multiple times in a row.
2019-02-14 17:14:29 +01:00
omar
2206df9e7a
Demo: Added Auto-Scroll option in Log/Console. Comments. Removed some ImColor() uses.
2019-02-14 14:08:36 +01:00
omar
8522a4bbea
Fixed Clang warning ("multi-line comment"). XCode also also "space between \ and carriage return". Perhaps it would work with 2 spaces? Adding a dot for now..
2019-02-14 14:08:00 +01:00
omar
0236bc246f
Scrollbar: Fade out and disable interaction when too small, in order to facilitate using the resize grab on very small window, as well as reducing visual noise/overlap. (+1 squashed commits)
...
Internals: Added GetScrollbarID(). (#1185 )
2019-02-14 14:07:59 +01:00
omar
b46076458c
Examples: Win32: Removed unused code left-over from merge e9c625a1dc
2019-02-13 18:29:49 +01:00
omar
57a586b4f1
Font: Moved functions to internal block (not enforced). Made ConfigData pointer const. Added link to stb's notes.
2019-02-13 18:21:21 +01:00
omar
fcdf704dfa
Changelog: Added changelog from 1.40 to 1.47 (pasted from the Releases section) + some wrapping.
2019-02-13 14:55:28 +01:00
Elias Daler
cbc8e57410
Update README.md - change imgui-sfml link ( #2345 )
...
Changed link from https://github.com/EliasD/sfml to https://github.com/eliasdaler/sfml (no redirect + more reliable)
2019-02-13 11:50:14 +01:00
omar
417cf2237f
Font: Fixed high-level ImGui::CalcTextSize() used by most widgets from erroneously subtracting 1.0f*scale to calculated text width. Among noticeable side-effects, it would make sequences of repeated Text/SameLine calls not align the same as a single call, and create mismatch between high-level size calculation and those performed with the lower-level ImDrawList api. ( #792 )
2019-02-12 22:43:56 +01:00
omar
0640b6e67c
Shallow tweaks
2019-02-12 22:15:19 +01:00
omar
8691b56136
Merge branch 'master' into docking
2019-02-12 10:30:48 +01:00
omar
cc80d8e118
Examples: Metal: Compilation fix.
2019-02-12 10:30:09 +01:00
omar
169e3981fd
Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings.
2019-02-11 19:09:54 +01:00
omar
7f6a025c93
Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. ( #2306 )
2019-02-11 19:00:33 +01:00
omar
2cada3c143
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_widgets.cpp
2019-02-11 18:59:49 +01:00
omar
d16dbc5b87
Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. ( #2306 , #1676 ) [@rasky]
2019-02-11 18:52:08 +01:00
omar
a79785c0b9
ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale).
...
This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306 , #1676 )
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306 ) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.
2019-02-11 18:52:08 +01:00
Omar Cornut
ef7940699e
Examples: Metal: Removed unnecessary loop. Fixed OSX Clang warning in imstb_truetype. ( #1929 , #1873 )
2019-02-11 17:38:34 +01:00
omar
4b41d3b280
ImFont: Rearranged members toward an optimal CalcTextSize() loop. Removed comments from destructor. Made constructor more explicit.
2019-02-09 15:54:47 +01:00
omar
539f69b950
Updated STB libraries to latest (drift has been reduced with nothings/stb as most of our changes were merged). Using [DEAR IMGUI] markers when changed.
2019-02-08 15:24:59 +01:00
omar
00c637961b
Demo: Font selector allow selecting fonts with same debug name. ( #2332 )
2019-02-08 14:59:09 +01:00
omar
afc36cf802
Window: Fixed initial width of collapsed windows not taking account of contents width (broken in 1.67). ( #2336 , #176 )
2019-02-08 14:34:42 +01:00
omar
1b63ded8fa
Tabs: Fixed border (when enabled) so it is aligned correctly mid-pixel and appears as bright as other borders.
2019-02-07 12:07:53 +01:00
omar
4a3a895be9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2019-02-06 14:47:53 +01:00
omar
29d38b59d0
ListBox/InputTextMultiline: Better optimized when clipped / non-visible.
2019-02-06 14:46:14 +01:00
omar
62084aac0f
DragScalarN, SliderScalarN, InputScalarN: Removed unnecessary string id after the integer PushID() calls.
2019-02-06 14:39:00 +01:00
omar
f366828dd2
Minor tweaks to reduce false positive of PVS Studio static analyzer.
2019-02-06 13:16:52 +01:00
omar
5bdc7d7a6f
Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. ( #1086 )
2019-02-06 12:32:10 +01:00
omar
e3dd95d335
Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. ( #820 , #956 , #1875 )
2019-02-06 11:52:42 +01:00
omar
c59611a3b3
InputText: Fixed redo buffer exhaustion handling (rare) which could corrupt the undo character buffer. ( #2333 )
2019-02-05 23:38:57 +01:00
omar
97ed97b8ce
Plot: Register an ID to take the click the same way as other framed widgets. Set HoveredId in the FramePadding zone (between inner_bb and frame_bb).
2019-02-05 21:17:04 +01:00
omar
cef4e086ba
Internals: Selectable: Fixed rendering width miscalculation when starting pos is not line start pos, which would generally be unnoticeable. Could affect group lock X with a smaller SetCursorPos value but that's unlikely to be used.
2019-02-05 21:17:00 +01:00
omar
b8c24aff4c
Internals: EndGroup: Removed unnecesary parameter to ItemSize()
2019-02-05 21:16:54 +01:00
omar
521470b3cd
Internals: Removed unnecessary code.
2019-02-05 21:16:32 +01:00
omar
f6fbb99a9c
Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch.
2019-02-05 15:45:26 +01:00
omar
5a95c77388
Merge branch 'master' of https://github.com/ocornut/imgui
2019-02-05 13:53:09 +01:00
omar
be107ba8f8
Merge branch 'master' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
2019-02-05 13:52:32 +01:00
omar
b980e0077a
Tabs: Moved Tab List Popup to left-side to match docking button. Highlight selected tab. ( #261 , #351 )
2019-02-05 13:39:48 +01:00
omar
d38f4dc143
Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. ( #261 , #351 )
2019-02-05 13:23:44 +01:00
omar
d93e3c17fc
ImGuiTextBuffer: Fix size() to allow using ImGuiTextBuffer with resize(0) patterns.
2019-02-05 13:16:23 +01:00
omar
65c972e9e4
Update README.md
2019-02-05 11:45:19 +01:00
omar
f7c879eb60
RadioButton: Fixed label horizontal alignment to precisely match Checkbox(). + Internals: Checkbox, RadioButton: Single call to ItemSize() for flow layout purpose.
2019-02-04 23:34:32 +01:00
omar
0b05ba18df
Internals: DragScalar, SliderScalar: Calling ItemSize before ItemAdd as with every other widgets so we can more easily rearrange the signature of ItemXXX functions (toward allowing non-rounded sizes for scaling and flow layout).
2019-02-04 23:34:27 +01:00
omar
8e44aacc8e
Fonts: Fixed crash if FontGlobalScale is zero. Correctly debug naming default font if not 13 px. Demo: Moved PopupRounding along with other rounding values. Metrics: Displaying indexes with idx to be correct / less misleading.
2019-02-04 23:34:20 +01:00
omar
f902435a53
Docking: Fixed less of node size/pos caused by 1f2bdd37 ( #2109 )
2019-02-03 18:58:07 +01:00
omar
80d51c692a
Docking: Fixed dragging docked window with _NoMove flag ( #2325 )
2019-02-03 18:44:30 +01:00
omar
7227454dca
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
2019-02-03 17:31:16 +01:00
omar
c23a19c26f
Internals: Exposed internal SetWindowPos to imgui_internal.h (for imgui-test)
2019-02-03 17:29:51 +01:00
omar
f087359621
Revert part of change from 5536eded. Fixed drag and drop in docking branch. ( #2331 , reopening #2325 )
2019-02-03 13:54:04 +01:00
omar
e215809c4d
Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).
2019-02-01 17:06:40 +01:00
omar
ac6d474103
Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).
2019-02-01 16:37:07 +01:00
omar
03b0266b59
Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). ( #2327 )
2019-02-01 15:23:25 +01:00
omar
5fc6899dc2
Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [@BrutPitt]
2019-02-01 15:13:54 +01:00
omar
d1c45c0d76
Merge branch 'master' into docking (enable range_select merge)
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-02-01 12:25:49 +01:00
omar
5cb7040f66
Internals: Tracking dummy select scope id (currently always zero) to facilitate merging of the range_select branch. ( #1861 )
2019-02-01 12:14:38 +01:00
omar
d5945aa25b
Internals: Minor changes to TreeNodeBehavior() and Selectable() for the benefit of fhe range_select branch. ( #1861 )
2019-02-01 12:14:38 +01:00
omar
0d4a2a2cd0
Internals: Track ActiveIdHasBeenPressed (similar to ActiveIdHasBeenEdited). This is currently mostly for the benefit of the range_select branch. ( #1861 )
2019-02-01 12:14:37 +01:00
omar
e30babef09
Fixed Clang/Win32 warning.
2019-02-01 11:22:53 +01:00
omar
a608156da3
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-02-01 11:19:26 +01:00
omar
65a2350a5f
Docking: Extracted code into a DocknodeUpdateTabListMenu() functions + minor other changes.
2019-02-01 11:12:37 +01:00
omar
cbf24a9151
Comments. Fix duplicate entries in About box. Synchronize a few small changes from Master branch.
2019-02-01 11:04:04 +01:00
omar
52a9f8bd3e
Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.
2019-02-01 10:26:08 +01:00
omar
699e945a82
Merged from Docking branch: non-const ImVec2[] operator.
2019-02-01 10:22:46 +01:00
omar
f906d53f7d
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-01-31 19:19:35 +01:00
omar
1f2bdd37b3
Docking: Builder: Added DockBuilderSetNodePos, DockBuilderSetNodeSize, allow DockBuilderAddNode creating floating node (dockspace requires ImGuiDockNodeFlags_Dockspace) ( #2109 )
2019-01-31 17:01:15 +01:00
omar
dc8ff68871
Docking: VisibleWindow of a node spread its _NoMove attribute to the node (fixed dragging or undocking of dock node host from collapse button). ( #2325 , #2109 )
2019-01-31 15:22:40 +01:00
omar
5536edede9
Docking: Fixed faulty undocking of windows with the _NoMove flag. ( #2325 , #2109 )
...
Whereas BeginAsDockableDragDropTarget could be reworked to filter, we simply set g.HoveredWindowUnderMovingWindow to be NULL when MovingWindow is not set, which was the initial intent.
Also fixed some comments and removed unused braces in TabItemEx().
2019-01-31 14:59:45 +01:00
omar
578e15f006
Docking: Removed unnecessary ImGuiTabItemFlags_DockedWindow internal flag.
2019-01-31 14:55:00 +01:00
Michael Savage
2d363fa315
Fixed doc typo ( #2326 )
2019-01-31 14:19:15 +01:00
omar
16c0a0217c
Updating supporter list.
2019-01-31 13:45:46 +01:00
omar
e1143377c2
Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. ( #1542 , #2117 )
...
Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.
2019-01-30 21:39:05 +01:00
omar
8563ef3ce4
Viewport: Popups by default merge into parent/host viewport as they have no decoration (same as menu/child). ( #1542 )
2019-01-30 21:13:07 +01:00
omar
1fb57c97c6
Internals: InputScalarAsWidgetReplacement: Fixed seemingly unnecessary calling of SetActiveID/SetHoveredID every frame, which in turns allow us to remove the g.ActiveIdAllow/Block settings duplicated.
2019-01-30 15:41:20 +01:00
omar
fb4f1ff7f6
InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. ( #2321 , #787 )
2019-01-30 15:16:09 +01:00
omar
158995f271
InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. ( #2321 ) [@relick]
2019-01-30 13:15:14 +01:00
omar
0a233a505d
imgui-test: Added extra item info callbacks. Using nav_bb for interactions when possible. Comments, Demo tweaks.
2019-01-30 12:53:01 +01:00
Francisco Gallego
aacf993ee1
ImStrncpy: Fixed -Wstringop-truncation warning on GCC8 ( #2323 )
2019-01-30 10:19:40 +01:00
omar
37fb531d1c
Docking: Comments and tidying up (should be no-op)
2019-01-29 18:54:56 +01:00
omar
86d3bba157
Added ImGuiDockNodeFlags_AutoHideTabBar. ( #2109 )
2019-01-29 18:28:31 +01:00
omar
2ccc6d2ed1
Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.
2019-01-29 18:28:31 +01:00
omar
ed240c910b
Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. ( #2318 ) [@bluescan]
2019-01-29 14:36:55 +01:00
omar
8a4422b2fa
Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. ( #2308 )
2019-01-27 23:54:17 +01:00
omar
13ca2fe845
Silence XCode static analysis false positive ( #2309 )
2019-01-27 23:30:44 +01:00
Marc-Alexandre Espiaut
8a605354ef
Replacing one of the third-party Python bindings. ( #2312 )
...
Removing the unmaintained CyImGui (only 7 commits, last one made in 2015) and replacing it with bimpy.
2019-01-27 21:59:48 +01:00
omar
13a5f5ba8b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-01-27 16:46:35 +01:00
omar
b26ac92a12
Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)."
...
This reverts commit 20bc06af70 .
2019-01-27 16:43:56 +01:00
omar
f56d9b74cc
Nav: Removed unnecessary test (always failing).
2019-01-27 16:37:02 +01:00
omar
4e8e177cac
Persistently fixing some PVS-Studio static analyzer false positive warnings.
2019-01-27 16:35:48 +01:00
omar
ee3b4f2bf1
Using IM_UNUSED() macro.
2019-01-27 16:23:23 +01:00
omar
c3c2cd1e82
Fix various XCode and PVS-Studio static analyzer warnings ( #2309 )
2019-01-27 16:18:23 +01:00
omar
20bc06af70
Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).
2019-01-27 16:18:23 +01:00
omar
737a3644fc
Removed trailing spaces (docking branch)
2019-01-27 14:57:07 +01:00
omar
e55678adec
Update README.md (changed e-mail address)
2019-01-24 18:31:31 +01:00
omar
a8277ca873
Reoder Python bindings
2019-01-23 20:04:08 +01:00
omar
07ff47bf1b
Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. ( #2109 )
2019-01-23 19:54:45 +01:00
omar
0737433c71
When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. ( #1495 , #822 )
2019-01-23 19:24:35 +01:00
omar
0bda7f196d
Docking: Fixed overlapping issue with greyed out close button.
2019-01-23 19:24:35 +01:00
omar
9f96fcff3c
Docking: Added ImGuiDockNodeFlags_Dockspace instead of node internal IsDockspace toward allowing the DockBuilder API to create non-dockspace nodes.
2019-01-23 19:24:34 +01:00
omar
c362a96a3f
When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. ( #1495 , #822 )
2019-01-23 19:21:25 +01:00
omar
bfacbac7c4
Docking: Fix a focusing issue where dock node wouldn't be moved to the front as expected.
2019-01-23 11:05:00 +01:00
omar
86fce79a6c
Comments + clear out VisibleWinodw field (should have no effect)
2019-01-23 10:50:58 +01:00
omar
ab9cd44c89
Examples: DirectX9: Fix Clang warning.
2019-01-22 13:47:15 +01:00
omar
c81a5a6070
Docking: Comments and renaming locals to facilitate debugging.
2019-01-22 12:38:10 +01:00
omar
0947fa3de0
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-01-21 16:54:37 +01:00
omar
cb9a6b8a8b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/README.txt
# imgui.cpp
2019-01-21 16:52:22 +01:00
omar
f14f93ef6e
Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.
2019-01-21 16:50:27 +01:00
omar
28901dd104
Internals: Tweaks. Comments about PushID/GetID public function.
2019-01-21 16:50:27 +01:00
omar
f994b8aab8
ImHash: Moved crc32 table out of the function so it can be shared, also avoid cases were compiler tries to makes its initialization thread-safe.
2019-01-21 16:50:27 +01:00
Thomas Ruf
1e4cf67a53
avoid floating point exception when _EM_OVERFLOW is enabled ( #2303 )
2019-01-21 16:43:07 +01:00
omar
2d21a64fed
Comments
2019-01-21 14:25:13 +01:00
omar
ea7206fd4f
Fixed using imgui_freetype.cpp in unity builds. ( #2302 )
2019-01-21 13:58:29 +01:00
omar
54ba8a643e
Removed trailing spaces from text files. ( #2038 , #2299 )
2019-01-20 22:23:29 +01:00
omar
00ffdb9fa9
ImGuiTextBuffer: Added append() function (unformatted).
2019-01-20 22:21:26 +01:00
omar
f94af2f5c5
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
2019-01-20 22:13:35 +01:00
omar
8079344cee
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
2019-01-20 22:12:06 +01:00
omar
259f3c78a2
Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. ( #2297 )
2019-01-20 18:13:39 +01:00
omar
2c38b32db1
Removed trailing spaces ( #2038 , #2299 )
2019-01-20 17:56:17 +01:00
omar
e837099b67
Update for stb_ files. ( #2038 )
2019-01-20 17:51:51 +01:00
omar
f94ba546ba
Added checks for "zero-as-null-pointer-constant" warnings for older Clang ( #2299 , followup to #2277 )
2019-01-20 17:46:00 +01:00
Ryan Mast
8a63c72ac4
Fix the year for screenshot gallery part 7 and 8 links ( #2298 )
2019-01-19 20:45:17 +01:00
omar
fcd61e0c59
Comments about DLL boundaries and using TLS variables for GImGui. ( #2292 )
2019-01-18 23:04:45 +01:00
omar
82e31d34f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
2019-01-18 12:31:33 +01:00
omar
92d29531fa
Qt links
2019-01-18 11:34:25 +01:00
omar
295ada0364
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
2019-01-17 18:30:15 +01:00
omar
b8020032f9
Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. ( #2264 )
2019-01-17 16:55:23 +01:00
omar
bebb07f12d
ImFontAtlas: Added 0x2000-0x206F general punctuation range to default ChineseFull/ChineseSimplifiedCommon ranges. ( #2093 )
2019-01-17 16:48:11 +01:00
omar
acdb4823dd
Examples: Win32: Fix for older Windows SDK.
2019-01-17 14:35:26 +01:00
omar
b5144e477f
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-01-17 14:06:42 +01:00
omar
e9c625a1dc
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
2019-01-17 14:05:40 +01:00
omar
872477548b
Examples: Win32: Using IsChild() to be compatible with windows created within a parent. ( #1951 , #2087 , #2156 , #2232 )
2019-01-17 11:45:32 +01:00
Gilad Reich
14c40242db
Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. ( #2288 , #2290 )
2019-01-17 11:39:40 +01:00
omar
f2c92808f8
EditorConfig: Further tweaks ( #2038 )
2019-01-16 22:02:42 +01:00
Chris Savoie
83810039d1
Add editor config for 4 spaces instead of tab.
2019-01-16 22:00:33 +01:00
omar
8cbb91261e
ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). ( #2287 ) [@baktery]
...
+ Demo tweaks
2019-01-16 17:47:49 +01:00
omar
d1851ed6b7
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]
2019-01-16 16:19:38 +01:00
omar
32c4e01267
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
2019-01-16 16:13:23 +01:00
omar
06aaf23877
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
2019-01-16 16:10:51 +01:00
omar
882f1bc135
Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).
2019-01-16 15:10:31 +01:00
omar
2f9bae140b
Docking: Demo: Fixed docking document window into parent window. ( #2286 )
2019-01-16 14:43:27 +01:00
omar
09f1cb642b
FreeType: Minor tweaks previous commit ( #2285 )
2019-01-15 21:50:43 +01:00
alexey_skryabin
daac9c7559
By default ImGuiFreeType will use ImGui::MemAlloc()/MemFree().
...
ImGuiFreeType::SetAllocatorFunctions() can be used to specify custom allocator.
2019-01-15 21:47:46 +01:00
omar
8a45c56c2c
Merge branch 'viewport' into docking
2019-01-15 21:22:29 +01:00
omar
9391a97fbf
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
2019-01-15 21:22:21 +01:00
omar
79d497edae
Viewport: Made platform_io.Monitors mandatory for proper multi-viewport use.
2019-01-15 21:20:00 +01:00
omar
f435aa193b
Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
2019-01-15 21:19:02 +01:00
omar
133f112af0
Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created in a different thread. ( #1951 , #2087 , #2156 , #2232 ) [many people]
2019-01-15 20:27:32 +01:00
omar
95ee99e6aa
Version 1.68 WIP
2019-01-15 20:19:05 +01:00
omar
515ad62335
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/TODO.txt
2019-01-15 15:14:16 +01:00
omar
73353fad64
Merge branch 'master' into viewport
2019-01-15 15:13:29 +01:00
omar
d38d7c6628
TODO update + internals: changed order or ImGuiLayoutType enums to allow using them for indexing.
2019-01-15 15:06:24 +01:00
omar
b8c6e31c2d
Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. ( #2282 )
2019-01-15 15:05:56 +01:00
omar
ff4bd758ca
Merge branch 'viewport' into docking
2019-01-14 21:30:07 +01:00
omar
e24674fc0e
Merge branch 'master' into viewport
2019-01-14 21:30:01 +01:00
omar
7a5058e3bf
Version 1.67
2019-01-14 17:41:44 +01:00
omar
1da40df279
DragFloat: Fixed broken mouse direction change with power!=1.0. ( #2174 , #2206 ) [@Joshhua5]
2019-01-14 17:38:19 +01:00
omar
6e41745f31
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. ( #2277 )
2019-01-13 18:57:46 +01:00
omar
529fccd9c2
Merge branch 'viewport' into docking
2019-01-13 14:19:40 +01:00
omar
4ee4f65c70
Merge branch 'master' into viewport
2019-01-13 14:19:31 +01:00
omar
abdd39b700
Merge branch 'atlas_fixes'
2019-01-13 14:19:07 +01:00
omar
7e78865613
Demo: Fixed bounds of DragFloat in Clipping section to avoid passing zero-sized to InvisibleButton().
2019-01-12 19:48:07 +01:00
omar
49994ceb6e
FAQ entry, moved ImTextureId, Gallery links.
2019-01-12 19:48:07 +01:00
omar
8df8482ef4
imgui_freetype: Fixed redundant FT_Load_Glyph() calls, unused parameters, and compilation warning/error. ( #2270 )
2019-01-12 11:45:58 +01:00
omar
651130002f
ImFontAtlas: Fixed allocating for last bit (would only affect is that last codepoint is a multiple of 32). ( #2270 )
2019-01-11 15:25:43 +01:00
omar
21828b08a0
ImFontAtlas: Rewrote FreeType based builder.
...
- Fixed abnormally high atlas height. (#618 )
- Fixed support for any values of TexGlyphPadding (not just only 1). (#618 )
- Atlas width is now properly based on total surface rather than glyph count (unless overridden with TexDesiredWidth). (#618 )
- Fixed atlas builder so missing glyphs won't influence the atlas texture width. (#2233 , #618 )
- Fixed atlas builder so duplicate glyphs (when merging fonts) won't be included in the rasterized atlas. (#618 )
2019-01-10 22:30:34 +01:00
omar
9a9712807e
ImFontAtlas: Rewrote stb_truetype based builder.
...
- Atlas width is now properly based on total surface rather than glyph count (unless overridden with TexDesiredWidth).
- Fixed atlas builder so missing glyphs won't influence the atlas texture width. (#2233 )
- Fixed atlas builder so duplicate glyphs (when merging fonts) won't be included in the rasterized atlas.
2019-01-10 22:23:05 +01:00
omar
7cc86d4bc9
Docking: Fixed docking a split node into the empty central node of a dockspace leading to the central node tag being incorrectly carried along. ( #2109 )
2019-01-10 18:20:52 +01:00
omar
e3ccc96789
Internals: Added ImBoolVector helper.
2019-01-10 16:10:02 +01:00
omar
56caf7da29
imgui_freetype: Minor tweaks and comments.
2019-01-10 16:10:02 +01:00
omar
7ed8e55fc7
ImVector: Added size_in_bytes() helper.
2019-01-10 16:10:02 +01:00
omar
8011197c50
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
2019-01-10 16:02:32 +01:00
omar
c96aaef132
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-01-10 16:01:36 +01:00
omar
e4c19f5af1
ImFontGlyphRangesBuilder: Using 32-bits fields for storage instead of 8-bit ones, comments, todo.
2019-01-10 16:00:26 +01:00
omar
7ffbcfe467
ImVector: Made reserve() another silly one-liner. It's not longer than other functions and our weird obsessions deserve to be carried with stringent consistence. + Comments
2019-01-10 15:51:09 +01:00
omar
1f6e0b2f98
ImVector: Made a struct. Using T/T* in the code instead of value_type/iterator. Renamed index_from_pointer() to index_from_ptr() (was not documented, added in 1.63, users not supposed to use ImVector, hopefully not a big deal).
2019-01-10 15:51:08 +01:00
omar
81eaa49773
Internals: Added comment index in imgui_internal.h
2019-01-10 15:51:08 +01:00
Vladimír Vondruš
289569ef27
Update link to Magnum bindings. ( #2269 )
...
The various community projects that integrated Dear ImGui into Magnum
were merged together and are now an official part of the engine.
2019-01-10 14:58:59 +01:00
omar
61a99f994e
Minot internal tweaks, comments
2019-01-08 23:11:54 +01:00
omar
9ad341902d
ImDrawList: Optimized some of the functions for performance of debug builds where non-inline function call cost are non-negligible.
2019-01-08 17:37:22 +01:00
omar
f53cd3ee0f
Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase.
...
Demo: Typo.
C98 fix.
2019-01-08 17:37:07 +01:00
omar
57b1622afc
Added IMGUI_USE_STB_SPRINTF (undocumented) ( #1038 )
2019-01-08 15:28:33 +01:00
omar
b33977bc15
Tests: Reworking hook prototypes for imgui-test to be faster and multi-context friendly.
2019-01-07 23:59:05 +01:00
omar
c2db7f63bd
Selectable() should have an ID even though they are disabled, to be consistent with other widgets. Not sure of the reasoning ~1.41 which made this turn to 0.
2019-01-07 23:48:50 +01:00
omar
3997e8b555
Fixed animated window titles from being updated when displayed in the CTRL+Tab list. + Adding overkill helpers for reusing buffers. ( #787 )
2019-01-07 22:46:42 +01:00
omar
6b32570644
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
2019-01-07 21:29:15 +01:00
omar
5af930f97a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-01-07 21:28:29 +01:00
omar
1ae7f88495
Tabs: Added ImGuiTabBarFlags_NoTooltip flag. ( #261 , #351 ) + added helpful assert
2019-01-07 18:07:09 +01:00
omar
50faccf764
Demo: Log: Comments. Using clipper. Not linking with rand() anymore.
2019-01-07 17:33:02 +01:00
omar
acfa4050ec
Tweak changelog + tweak internal render helper functions.
2019-01-07 16:43:55 +01:00
omar
5cb7ce2085
Renamed ImFont::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).
2019-01-06 16:59:51 +01:00
omar
1353c74dcf
Comments/formatting on obsolete stuff
2019-01-06 16:37:57 +01:00
omar
c3af134cc8
IO: Renamed InputCharacters[], marked internal as was always intended. AddInputCharacter() goes into a queue which can receive as many characters as needed during the frame. This is useful for automation to not have an upper limit on typing speed. Will later transition key/mouse to use the event queue later.
2019-01-06 16:37:42 +01:00
omar
1705a81efb
Moved ImVector higher up in imgui :( because we will need it in ImGuiIO.
2019-01-06 16:29:40 +01:00
omar
8b5f635624
Added alternative Rust bindings
2019-01-06 14:43:43 +01:00
omar
9ba202821f
Nav: Fixed an keyboard issue where holding Activate/Space for longer than two frames on a button would unnecessary keep the focus on the parent window, which could steal it from newly appearing windows. ( #787 )
2019-01-04 19:03:56 +01:00
omar
d223d1e951
Added bindings in Readme. Added internal IMGUI_DEBUG_LOG() helper. Comments, missing breaking changes note relative to imgui_impl_xxxx changes, not really part of core but worth adding in the imgui.cpp breaking change section.
2019-01-04 18:01:43 +01:00
DomRe
4483320f0a
Examples: Allegro 5: Properly destroy all globals on shutdown. ( #2262 )
2019-01-04 13:30:55 +01:00
omar
515ecbddc2
Docking: Fix for handling of orphan/inactive dock node with ConfigDockingTabBarOnSingleWindows (would crash).
2019-01-03 23:02:40 +01:00
omar
7f7e8eeecd
Docking: Fixed a bug undocking a window from its tab when it is the only docked window of a root dockspace with ConfigDockingTabBarOnSingleWindows enabled.
2019-01-03 22:11:14 +01:00
omar
4e98d4329b
Comments
2019-01-03 21:59:13 +01:00
omar
6777544855
Added sanity check to debug parent/child ordering issues (they would generally manifest with an assert/crash in EndFrame bu tthis assert will catch some earlier).
2019-01-03 21:42:36 +01:00
omar
5278da98d2
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_demo.cpp
2019-01-03 21:40:08 +01:00
omar
e1ed27aeaa
(Breaking change) Reorganized Viewports advanced flags, moved into new io.ConfigViewportsXXX flags. Pay attention that ImGuiConfigFlags_ViewportsDecoration became ConfigViewportsNoDecoeration, so the value is inverted! ( #1542 )
2019-01-03 21:33:33 +01:00
omar
c8349d3305
Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.
2019-01-03 21:28:54 +01:00
omar
606175b98f
Viewport: Fix for minimization of individual viewports (the current back-end forcing a parent/child relationship between secondary viewports and the main viewport have hidden this issue). Follows d8ab2c1ac.
2019-01-03 21:27:47 +01:00
omar
05bc323be0
Viewport: Fixed minimization of main viewport leading to it being omitted from platform_io.Viewport list where the users assume it is at index 0. Fix d8ab2c1ac. It wasn't a problem when other viewports were child of the main viewport because they would all be minimized together. ( #1542 )
2019-01-03 21:27:39 +01:00
omar
ca6ac34f9d
Natvis: Added Hidden info about ImGuiWindow.
2019-01-03 18:38:41 +01:00
omar
599a52629a
Viewport: Added minimum viable information in the Changelog.
2019-01-03 17:46:23 +01:00
Alzathar
25ac85f15d
Examples: Downgrading projects to xcode 9.2 (maybe 8.0) ( #2134 )
...
* example_apple_opengl2: The deployment target was set to 10.12 from XCode 9.2.
* imgui_impl_metal: header not found by XCode 9.2.
* example_apple_metal: The deployment target was set to 10.12 from XCode 9.2.
2019-01-03 14:01:14 +01:00
omar
64c66529ae
Moving issue/pr template to docs/. Added links in README.
2019-01-03 13:35:53 +01:00
omar
c3efccaa9c
Docking: Merge fix duplicate line + added assert to ease debugging.
2019-01-02 23:49:31 +01:00
omar
b26f16a27f
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
2019-01-02 23:16:10 +01:00
omar
a0c2e55e8c
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-01-02 23:11:52 +01:00
omar
237109caa5
Internals: Extracted code out of EndFrame() into UpdateMouseMovingWindowEndFrame()
2019-01-02 23:08:32 +01:00
omar
b3469fa94b
Alternative fix for bug introduced in d845135 ( #1651 ), fix CTRL+Tab and fallback tooltip.
2019-01-02 23:08:32 +01:00
omar
3e30bfd6c9
Revert "Fixes crash/assert bug introduced in d845135 ( #1651 ): would assert when showing the CTRL+Tab list and or fallback "...." tooltip."
...
This reverts commit 1b0e38df47 .
2019-01-02 22:56:17 +01:00
omar
1b0e38df47
Fixes crash/assert bug introduced in d845135 ( #1651 ): would assert when showing the CTRL+Tab list and or fallback "...." tooltip.
2019-01-02 22:14:28 +01:00
omar
5aebfedfad
Docking: Forward WindowClass from node to host window.
2019-01-02 21:41:00 +01:00
omar
ce1626a51e
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-01-02 21:36:21 +01:00
omar
0cabe4dedf
Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. ( #1542 )
2019-01-02 21:33:23 +01:00
omar
0d6e3ab2b0
Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
2019-01-02 21:28:16 +01:00
omar
cfcad42b89
Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. ( #1542 )
2019-01-02 19:03:45 +01:00
omar
4a6f95acc8
Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
2019-01-02 19:03:36 +01:00
omar
5305c32242
Viewport: Reorder flags. Set owned viewport common decoration flags in Begin(). Moved code in UpdateViewportsEndFrame() before we introduce family/class based overrides.
2019-01-02 19:03:11 +01:00
omar
951c9dd68b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2019-01-02 19:00:31 +01:00
omar
4ea9fdbbea
Docking: Agressively assert when CentralNode is a not a leaf node in order to find our bug.
2019-01-02 16:22:45 +01:00
omar
e194219f2e
Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. ( #2109 )
2019-01-02 16:22:44 +01:00
omar
d9a4cbc429
Examples: Comments about GLFW/SDL versions
2019-01-02 16:04:13 +01:00
omar
c017a4fb5f
Moved guidelines to issue #2261 to Pin and increase visibility for now.
2019-01-02 14:28:49 +01:00
omar
acacd93836
Renamed extra_flags to flags in InputXXX parameters.
2019-01-02 11:08:14 +01:00
omar
c738f9ef92
InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. ( #2257 )
2019-01-02 11:03:56 +01:00
omar
6b97ded438
Happy new year! & comments
2019-01-02 10:57:57 +01:00
omar
e21bc44684
Comments: fixed missing line in the "how a simple rendering function may look like" section ( #2258 )
2019-01-02 09:57:25 +01:00
omar
d845135273
Error recovery: Extraneous/undesired calls to End() are now being caught by an assert in the End() function itself at the call site (instead of being reported in EndFrame). Past the assert, they don't lead to crashes any more. Missing calls to End(), pass the assert, should not lead to crashes any more, nor to the fallback/debug window appearing on screen. ( #1651 ).
2018-12-23 18:00:37 +01:00
omar
a9a60a24c1
Tweaked asserts
2018-12-23 17:51:50 +01:00
omar
a71d3c8cb3
Viewport: Misc comments following user feedbacks..
2018-12-21 18:40:16 +01:00
omar
238321c159
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
2018-12-21 16:56:26 +01:00
omar
e181b0c3fc
Merge branch 'viewport' into docking
2018-12-21 16:53:13 +01:00
omar
2889a14f86
Build fix for master.
2018-12-21 16:45:24 +01:00
omar
9d0bc3f9ab
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2018-12-21 16:43:12 +01:00
omar
b1cd52b674
Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). ( #421 )
2018-12-21 16:41:29 +01:00
omar
afe9c5c5f7
Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to 8dd83c5. ( #1542 , #2117 )
2018-12-21 16:26:17 +01:00
omar
81a2546cea
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
2018-12-20 23:06:29 +01:00
omar
ee5560a958
Merge branch 'master' into viewport + added style tweak block when viewports are enabled
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
2018-12-20 23:04:40 +01:00
omar
d5b22fb635
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
2018-12-20 22:58:34 +01:00
omar
62cfdceac1
Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. ( #1542 )
2018-12-20 22:40:22 +01:00
omar
d9fda22763
Viewport: Fixed not clearing request flags in main viewport, which led some back-end (SDL) to break on resize as PlatformRequestResize would stay true forever and inhibit new sizes passed to AddUpdateViewport(). ( #1542 )
2018-12-20 22:33:51 +01:00
omar
8dd83c5fe8
Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. ( #1542 , #2117 )
2018-12-20 22:28:31 +01:00
omar
b471813f54
Made it illegal to call Begin("") with an empty string. This somehow accidentally worked before but had various undesirable side-effect as the window would have ID zero. In particular it is causing problems in viewport/docking branches.
2018-12-20 20:01:02 +01:00
omar
5794c0491a
Docking: Fix an edge case failing to dock into an explicit dockspace which only have inactive nodes (because all the windows are inactive). ( #2246 , #2109 )
2018-12-20 19:20:26 +01:00
omar
e043b89814
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.h
2018-12-20 17:03:21 +01:00
omar
8fc19d2194
Removed IMGUI_HAS_TABS from Docking branch, it's not defined anywhere anymore.
2018-12-20 16:56:48 +01:00
omar
02501f07c3
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-12-20 16:54:32 +01:00
omar
a0e5bb9532
Viewport: Corrected/clarified comments. Moved RenderPlatformWindowsDefault() next to UpdatePlatformWindow(). Removed unnecessary flag check.
2018-12-20 16:49:31 +01:00
omar
39dde66b21
IO: Realigned all fields, very minor comments change. This is nearly a no-op if you don't ignore Spaces.
2018-12-20 11:48:52 +01:00
omar
5691385a33
IO: Added BackendPlatformUserData, BackendRendererUserData, BackendLanguageUserData void* for storage use by back-ends. ( #2004 + for cimgui)
2018-12-20 11:41:24 +01:00
omar
8399fb5071
Changed ImGuiCol_ChildBg to (0,0,0,0) in Dark style instead of (1,1,1,0), to match other styles. Shouldn't have any effect for the end-user.
2018-12-19 15:20:18 +01:00
omar
6890e08bc5
Fixed using SetNextWindowPos() on a child window (which wasn't really documented) position the cursor as expected in the parent window, so there is no mismatch between the layout in parent and the position of the child window. Demo tweak and adding some child window stuff
2018-12-19 15:19:31 +01:00
omar
89ac0ea7c1
Various user-facing comments
2018-12-19 11:19:55 +01:00
omar
84d1ce3958
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
2018-12-18 16:17:27 +01:00
omar
ca953f0fee
Fix merge issue on master.
2018-12-18 15:11:11 +01:00
omar
088ef6623a
Merge branch 'viewport' into docking
2018-12-18 15:03:01 +01:00
omar
9c916cdaf9
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-12-18 15:02:35 +01:00
omar
ae76a1fda7
Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.
2018-12-18 15:01:15 +01:00
omar
510ca373a2
Moved setting up NavHideHighlightOneFrame from lower-level ClosePopupToLevel() to CloseCurrentPopup() with an explanation. (Followup on 68d3e139a7)
2018-12-18 14:59:22 +01:00
omar
1a6ec208cc
Docs: various updates, rewording, clarifying the purpose of a PR.
2018-12-18 12:02:55 +01:00
omar
ac9512e095
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2018-12-14 18:46:24 +01:00
omar
65dac02171
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
2018-12-14 18:44:17 +01:00
omar
f6f5c51106
Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.
2018-12-14 18:42:28 +01:00
omar
f1c7596409
Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.
2018-12-14 18:42:22 +01:00
omar
5d20da1b36
Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. ( #1676 )
2018-12-14 12:12:26 +01:00
omar
587506dd57
Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)
2018-12-14 11:27:02 +01:00
omar
9b09c7597f
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_demo.cpp
2018-12-13 19:21:51 +01:00
omar
2a1e903f43
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.h
2018-12-13 19:20:34 +01:00
omar
8497948ba0
Comments, minor tweaks.
2018-12-13 19:17:36 +01:00
omar
e50894c95e
Metrics: Fixed crash when viewports are disabled (g.MouseLastHoveredViewport is never set).
2018-12-13 19:16:44 +01:00
omar
991b16cc6a
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
2018-12-11 19:46:46 +01:00
omar
1b263f6ab0
Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. ( #261 ) incorrectly missing from the merge from Docking branch.
2018-12-11 19:37:22 +01:00
omar
febc3e6aa1
Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
2018-12-11 19:19:12 +01:00
omar
d9a84de9d9
Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed.
2018-12-11 19:08:06 +01:00
omar
ccce47c6a2
Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.
2018-12-11 18:10:43 +01:00
omar
5a6b8e00db
BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). ( #261 )
2018-12-11 15:22:10 +01:00
omar
2886e0b6f5
Demo: Fix collateral damage of 54a60aa
2018-12-11 13:25:29 +01:00
omar
95dcc534ed
Demo: Fix collateral damage of 54a60aa
2018-12-11 13:25:16 +01:00
omar
067b691fd8
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
2018-12-11 13:23:00 +01:00
omar
c40feabe4d
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-12-11 12:41:40 +01:00
omar
54a60aaa40
Added BETA api for Tab Bar/Tabs widgets. ( #261 , #351 ) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)
...
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
2018-12-11 12:36:47 +01:00
omar
cc1283fb78
Added ImGuiWindowFlags_UnsavedDocument window flag to append '*' to title without altering the ID, as a convenience to avoid using the ### operator. (merged from Docking branch)
2018-12-11 12:20:48 +01:00
omar
15447f5b7b
Using named flags instead of 0 + shallow formatting tweaks from other branches.
2018-12-11 12:14:27 +01:00
omar
2d4018aa89
Docking: Fix io.ConfigWindowsMoveFromTitleBarOnly for docking branch.
2018-12-11 11:03:28 +01:00
omar
e6439e1a16
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
2018-12-10 16:21:49 +01:00
omar
26b9e2d0a5
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2018-12-10 16:14:31 +01:00
omar
9476e07d5a
Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. ( #899 )
...
Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height.
2018-12-10 16:05:30 +01:00
omar
59f3c4fc20
Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do.
2018-12-10 15:41:01 +01:00
omar
d20e3ee710
Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.
2018-12-10 14:30:41 +01:00
omar
3a5e758ee3
Tabs: Fixed crash when using TabItem in a regular (non-docking) tab bar. ( #2231 )
2018-12-08 12:35:15 +01:00
omar
f768727284
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
2018-12-06 16:36:17 +01:00
omar
a03846bd9e
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-12-06 16:33:39 +01:00
omar
f3a0b17bb8
Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. ( #1542 , #2117 ) + various comments.
2018-12-06 16:30:10 +01:00
omar
ac52d9d44c
Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration .
2018-12-06 15:36:36 +01:00
omar
e2082a675c
Viewport: Fix handling of PlatformRequestResize/PlatformRequestPos. when OS decoration are enabled via ImGuiConfigFlags_ViewportsDecoration .
2018-12-05 23:39:04 +01:00
omar
b94f0241f1
Docking: Adjusting the docking popup menu position so it tends to stay within the same viewport.
2018-12-05 21:19:42 +01:00
omar
b96b1f2412
Docking: Documenting an issue. Renamed member of ImGuiDockFamily.
2018-12-04 16:38:27 +01:00
omar
125e62491e
Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks.
2018-12-04 14:34:49 +01:00
omar
b58bd5b311
Version 1.67 WIP + todo notes
2018-12-04 13:49:29 +01:00
omar
6644f1ff64
Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes).
...
Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those.
2018-12-04 13:37:46 +01:00
omar
8cac70d8af
Docking: Focus fix (missing line in 8bac6d4)
2018-12-04 13:34:16 +01:00
omar
5105c6c0d0
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2018-12-04 00:06:26 +01:00
omar
3a678d48b1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
2018-12-04 00:05:45 +01:00
omar
8bac6d428d
Docking: Another attempt at tidying the inconsistent focus / tab bar reordering issues, and toward generalizing single window dock nodes. ( #2109 )
2018-12-04 00:01:20 +01:00
omar
2da200fc16
Docking: Fix generalizing the transition from loose windows to dock node so we can switch to single window dock node while transferring viewports (vs creating two viewports and dropping one). + Extracted DockContextGenNodeID out of DockContextAddNode().
2018-12-04 00:01:19 +01:00
omar
fb6ef8b1db
Comments, tweak
2018-12-03 23:50:59 +01:00
omar
f6b6ad1959
Viewport: Minor tweaks, better struct layout.
2018-12-03 20:30:00 +01:00
omar
3e84f7cd1d
Viewport: Fixed a viewport bug which led some popups to merge in underlying host viewport when they should be z-over their parent viewport.
2018-12-03 18:16:47 +01:00
omar
eb311abc92
Fixed IMGUI_API tag on ImFontAtlas::IsBuilt() preventing to build as DLL on some setups. ( #2226 )
2018-12-03 17:49:38 +01:00
omar
8d58055a54
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
2018-12-03 17:47:10 +01:00
omar
10e13dd6bb
Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).
2018-12-03 12:19:23 +01:00
omar
ac10889bde
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2018-12-03 11:44:51 +01:00
omar
89a530b442
Somehow VS keeps modifying this GUID so I am going to playing along with it.
2018-12-03 11:44:08 +01:00
omar
65e579e558
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
2018-12-03 11:41:53 +01:00
omar
801645d350
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
2018-12-03 10:17:17 +01:00
omar
34e18ef771
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
2018-11-30 23:48:39 +01:00
omar
8289e5f6b4
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
2018-11-30 23:48:25 +01:00
omar
84238240d6
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
2018-11-30 23:47:23 +01:00
omar
48f6fdb349
Fixed typo.
2018-11-30 18:30:21 +01:00
omar
7658035e5a
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
2018-11-30 18:30:21 +01:00
omar
3849def253
Added ShowAboutWindow(), About Window now showing various config/build information.
2018-11-30 18:30:21 +01:00
omar
025e00cccc
About: Added build/system info relating to Docking branch.
2018-11-30 18:29:35 +01:00
omar
f78b5a0cdb
Merge branch 'viewport' into docking
2018-11-30 18:27:14 +01:00
omar
ec49a486c7
About: Added build/system info relating to Viewport branch.
2018-11-30 18:27:04 +01:00
omar
afeefadb4e
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
2018-11-30 18:24:43 +01:00
omar
a423f032ee
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
2018-11-30 18:18:15 +01:00
omar
4ef06f5aa2
Added ShowAboutWindow(), About Window now showing various config/build information.
2018-11-30 18:02:01 +01:00
Sebastian Krzyszkowiak
3335e6688f
Include <alloca.h> also on macOS (and osxcross) ( #2218 )
2018-11-30 16:57:09 +01:00
Sebastian Krzyszkowiak
b2e7a3806a
Examples: Allegro5: Add touchscreen support
2018-11-30 16:54:30 +01:00
omar
1bfcf8f339
Separator: Fixed Separator() outputting an extraneous empty line when captured into clipboard/text/file.
2018-11-30 16:42:32 +01:00
omar
753223bd7b
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-11-30 14:38:54 +01:00
omar
f663277591
Merge misc/shallow changes from Docking branch to minimize drift: moved some blocks, added comments.
2018-11-30 14:35:13 +01:00
omar
1c7be88a1a
Viewport: Fixed a bug where tooltips on their first frame didn't find a monitor leading to the "recovery" code to revert it to the main viewport for a frame. ( #1542 )
2018-11-30 14:35:13 +01:00
omar
baf67d393f
When the focused window become inactive don't restore focus to a window with the ImGuiWindowFlags_NoInputs flag. ( #2213 )
2018-11-29 23:25:29 +01:00
omar
4a94b251fd
Comments
2018-11-29 22:00:17 +01:00
omar
3c114b280a
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
2018-11-29 21:30:26 +01:00
omar
2fbbcaa339
Viewport: Avoid calling platform functions when window is not created (apart from Platform_GetWindowDpiScale, documented as such). Main viewport situation is still ambiguous. ( #1542 )
2018-11-29 21:28:47 +01:00
omar
36cbe1e521
Viewport: Misc renaming.
2018-11-29 21:21:04 +01:00
omar
19d17ed274
Docking: Added io.ConfigDockingTransparentPayload option (to use with ImGuiConfigFlags_ViewportsNoMerge)
2018-11-29 16:18:01 +01:00
omar
01f940dc9a
Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.
2018-11-28 22:50:48 +01:00
omar
19c4fa8dd5
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
2018-11-28 15:43:00 +01:00
omar
3bcc25f588
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-11-27 19:56:23 +01:00
omar
4cadb57c46
Viewport: Comments.
2018-11-27 19:53:33 +01:00
omar
99c32ed4a5
Merge branch 'master' into viewport
2018-11-27 19:46:40 +01:00
omar
c08b4b46f4
Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. ( #2196 )
2018-11-27 19:46:36 +01:00
omar
4105cc7e97
Added ImGuiConfigFlags_None, ImGuiBackendFlags_None for good measure.
2018-11-27 19:46:14 +01:00
omar
e138a5fcb5
Docking: Fixed debug Rebuild operation.
2018-11-27 17:40:25 +01:00
omar
1fa2cb8748
imgui.h: Comments
2018-11-27 14:10:40 +01:00
omar
ce07d55d1b
imgui.h: Moved ImGuiListClipper
2018-11-27 14:01:07 +01:00
omar
8495c931c0
mgui.h: Moved ImGuiInputTextCallbackData,, ImGuiSizeCallbackData, ImGuiPayload structures so they are not in the "Helpers" section.
2018-11-27 14:01:07 +01:00
omar
fc16e54612
Docking: Maintain CentralNode. When SetNextWindowDockID() on a now split node id, we dig to find the central node or the last focused node. ( #2109 )
2018-11-27 13:35:05 +01:00
omar
4575354bc0
Docking: Comments + maiintain LastFrameFocused per node + using bitfiield for docking bools.
2018-11-27 13:29:09 +01:00
omar
3f51c831de
Docking: Added internal DockBuilderGetCentralNode(). Fixed being unable to undock whole node from dock button in DockSpace with a central node. ( #2109 )
2018-11-26 22:18:55 +01:00
omar
962dcb466d
Docking: Added ImGuiDockNodeFlags_NoResize. ( #2109 )
2018-11-26 21:52:40 +01:00
omar
b8d9c5c130
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
2018-11-26 21:36:48 +01:00
omar
1a0d2578a1
Viewport: Merging fixes + relying on multiple viewport overlaps. Follow-up to previous attempts are reworking the split/merge mechanisms. ( #1542 )
2018-11-26 21:35:44 +01:00
omar
12a1e7d04e
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
2018-11-26 19:20:37 +01:00
omar
4a8efd7e68
Docking: Hidden tab-bar triangle reflects focus but using Button colors. ( #2109 )
2018-11-26 17:57:01 +01:00
omar
66cfbbff5e
Docking: Fixed double-overlay when dragging window over one of the (four cardinal) outer drop boxes. ( #2109 )
2018-11-26 17:39:38 +01:00
omar
d23c69d319
Docking: Added context menu option to hide the tab bar of single-window dock nodes, similar to Unreal. ( #2109 )
2018-11-26 17:25:06 +01:00
omar
1e7b50aeae
Viewport: Fixes moving child menu viewport (fix 379733a).
2018-11-26 16:56:58 +01:00
omar
c93e92671a
Viewport: Fixes moving child menu viewport (fix 379733a).
2018-11-26 16:55:40 +01:00
omar
ddc3f8f069
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
2018-11-26 15:32:04 +01:00
omar
5261e5a6ba
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2018-11-26 14:53:51 +01:00
omar
379733aba1
Viewport: Fix viewport regression with protruding child window creating their own viewport. (fixes cae4d02, 760c1d95) ( #1542 )
2018-11-26 14:53:04 +01:00
omar
131de7ab62
Docking: Added ImGuiConfigFlags_DockingNoSplit flag. ( #2109 )
2018-11-23 18:42:16 +01:00
omar
35d648341b
Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. ( #2187 )
2018-11-23 18:12:37 +01:00
omar
d8ab2c1ac9
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. ( #1542 ) + todo
2018-11-23 16:55:33 +01:00
omar
862781b195
Viewport: Avoid unnecessary reapplying platform pos/size every frame. ( #2205 ) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)
2018-11-23 16:35:17 +01:00
omar
cae4d020dc
Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. ( #1542 )
2018-11-22 21:18:14 +01:00
omar
1f78e08427
Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.
2018-11-22 21:16:43 +01:00
omar
760c1d95b9
Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. ( #1542 )
2018-11-22 21:13:07 +01:00
omar
510f0e505c
Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.
2018-11-22 20:13:55 +01:00
omar
0c4dee083c
Internals: Added ImPool helper data structure (used by testing system, and already in docking branch)
2018-11-22 18:59:57 +01:00
omar
d27ffefbd4
Version 1.67 WIP
2018-11-22 18:59:57 +01:00
omar
d9c54826bb
Viewport: Stop relying on viewport->CreatedPlatformWindow to create Platform_DestroyWindow and Renderer_DestroyWindow. Explicitly require Platform_GetWindowFocus() to require supporting empty data.
2018-11-22 17:27:35 +01:00
omar
2515413080
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
2018-11-22 15:29:18 +01:00
omar
d87b80c6c1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-11-22 15:28:27 +01:00
omar
da3c4330c1
Version 1.66
2018-11-22 15:11:52 +01:00
omar
c00a3bd98f
Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. ( #2181 )
2018-11-21 18:43:25 +01:00
omar
a5cf227503
Added link to experimental imgui_scoped.h PR/thread ( #2197 , #2096 )
2018-11-21 18:31:22 +01:00
omar
be66f94639
Examples: OpenGL3: More explicit testing for == GL_UPPER_LEFT in case glGetIntegerv(GL_CLIP_ORIGIN is not honored properly. ( #2186 , #2195 ) Fix f52f0a5277
2018-11-21 18:24:24 +01:00
omar
cc4b1f9e47
Nav: Fixed explicit directional input not re-highlighting current nav item if there is a single item in the window and highlight has been previously disabled by the mouse. ( #787 )
2018-11-21 16:07:04 +01:00
omar
b9ae9bb1e3
Internals: Using GetOverlayDrawList(ImGuiWindow*) to match syntax of viewport/master branches. Fixed compiling with IMGUI_DEBUG_NAV_RECTS
2018-11-21 15:37:29 +01:00
omar
50c43d1c8e
Removed unnecessary ImGui:: prefixes.
2018-11-15 16:43:05 +01:00
omar
6b4443755d
Internals: Added FindWindowByID() helper. ( #2190 )
2018-11-15 16:41:48 +01:00
omar
4a43f347bb
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
2018-11-15 14:00:01 +01:00
omar
dcbf976a8e
Merge branch 'master' into viewport + comments
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2018-11-15 13:58:46 +01:00
omar
aa668c410a
Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. ( #2168 ) + adding a else block to make NavCalcPreferredRefPos() more explicit.
2018-11-15 13:56:27 +01:00
omar
f2d577c33f
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
2018-11-13 22:14:40 +01:00
omar
ae34241f8b
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
2018-11-13 22:11:39 +01:00
omar
1546153ca2
Docking: Fixed a regression where clicking a Tab wouldn't immediately set NavWindow. Which led to breaking the NavSaveLastChildNavWindow/NavRestoreLastChildNavWindow logic. ( #2109 )
2018-11-13 19:31:10 +01:00
omar
f52f0a5277
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). ( #2186 )
2018-11-13 18:54:02 +01:00
omar
19b4fcdacb
Made IsWindowFocused() work outside of NewFrame()-EndFrame() and added comments about how ImGuiFocusedFlags_AnyWindow should NOT be used in place of io.WantCaptureMouse. ( #2185 )
2018-11-13 11:23:15 +01:00
omar
5b1394c5ac
Update README.md
2018-11-09 15:02:19 +01:00
omar
6c1ae6cc71
Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).
2018-11-09 14:41:40 +01:00
omar
6d7677534f
Internals: SliderBehavior: Using axis indexing.
2018-11-09 14:31:14 +01:00
omar
a3d6554e8e
Merge branch 'master' into viewport + specific changes for GLFW callbacks
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
2018-11-08 16:56:51 +01:00
omar
772354377b
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. ( #1759 )
2018-11-08 16:24:41 +01:00
omar
9d155c73bc
Examples: Misc comments mainly related to GLFW callbacks. ( #1759 )
2018-11-08 16:06:22 +01:00
omar
a419d46205
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). ( #2178 )
2018-11-08 15:14:09 +01:00
omar
565af90958
Merge branch 'viewport' into docking
2018-11-06 09:52:38 +01:00
omar
131bf5ee4a
Examples: SDL: Tweaked Windows instructions and batch files. ( #2175 )
2018-11-06 09:51:21 +01:00
omar
797f2044cd
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. ( #2175 )
2018-11-06 09:51:09 +01:00
omar
5ea08394f5
Examples: SDL: Tweaked Windows instructions and batch files. ( #2175 )
2018-11-06 09:46:43 +01:00
omar
9ee86f22b7
Examples: Win32: Handle UTf-8 in platform window title setting. ( #2164 )
2018-11-05 17:37:06 +01:00
omar
52ca91ca57
Merge branch 'master' into viewport
2018-11-05 17:29:31 +01:00
omar
f388216ff0
Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. ( #2010 , #2043 , #2091 )
2018-11-05 17:28:09 +01:00
omar
c808eb92c6
Config: Added IMGUI_DISABLE_WIN32_FUNCTIONS to disable linking with _any_ Win32 function, as a general forward compatible measure.
2018-11-05 17:28:00 +01:00
omar
eb592bf7d3
ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. ( #2173 ). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing.
2018-11-05 14:49:17 +01:00
Torkel Bjørnson-Langen
1441756a0f
Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() ( #2153 )
2018-11-05 14:17:51 +01:00
Michał Janiszewski
2e6e1bec58
Examples: Add missing include guards ( #2166 )
2018-11-01 20:56:36 +01:00
Cort
ed0f7004d0
Examples: Vulkan: Avoid unreferenced parameter warning. ( #2162 )
2018-10-30 21:15:30 +01:00
omar
7fa3e71abb
Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155 )
2018-10-30 10:48:21 +01:00
Hui
e6db078eda
gladLoadGL() return 0 to indicate failure ( #2157 )
2018-10-29 15:51:32 +01:00
omar
168af9b377
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_demo.cpp
2018-10-25 23:45:19 +02:00
omar
1a6eea012d
Docking: Tweaked tooltip on tabs so they don't show immediately when holding and releasing a tab (using HoveredIdNotActiveTimer) + Minor refactor + Removed legacy .ini parsing.
2018-10-25 23:41:32 +02:00
omar
50f6e12d31
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-10-25 23:41:13 +02:00
omar
f3e642322f
Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.
2018-10-25 23:40:33 +02:00
omar
eed1fba157
Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. ( #2152 )
2018-10-25 23:34:05 +02:00
Konstantin Podsvirov
faecf90383
SliderAngle: Added optional format argument to allow users customize precision and make localization. ( #2150 )
2018-10-25 22:29:29 +02:00
omar
12c72d2893
Fixed OpenGL texture loading example in comment + Discourse link to root of discourse
2018-10-25 21:32:29 +02:00
omar
a72d5ada61
Misc comments improvements
2018-10-25 19:02:43 +02:00
omar
ac9aaf4b6e
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
2018-10-25 17:45:48 +02:00
omar
c547b2e8ee
Added DockSpaceOverViewport() call, not sure about this because of the menu bar limitation. ( #2109 )
2018-10-25 15:34:53 +02:00
omar
56ba60ee68
Docking: Fixed not saving .ini file correct if DockingEnable flag is cleared. ( #2109 )
2018-10-24 12:25:58 +02:00
omar
f270c81c49
Viewport, Docking: Fixed incorrectly setting the ImGuiViewportFlags_NoInputs flag, affecting split docking node. ( #2109 )
2018-10-23 18:26:45 +02:00
omar
745fda081e
Viewport, Docking: Fixed incorrectly setting the ImGuiViewportFlags_NoInputs flag, affecting split docking node. ( #2109 )
2018-10-23 18:26:35 +02:00
omar
e610afeea3
Font readme: Added OpenFontIcons, tweaks, links, removed spaces ( #2141 )
2018-10-22 11:54:57 +02:00
omar
5f8c9ae0ef
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-10-18 10:57:54 +02:00
omar
056af2b1af
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-10-18 10:56:26 +02:00
Brandon
5f79a28a07
Examples: SDL: Fixed usage of SDL_GetDisplayDPI ( #2137 , #1676 )
2018-10-18 10:48:18 +02:00
omar
82873c7ad4
Update README.md
2018-10-18 10:44:14 +02:00
omar
745f01022e
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) ( #2133 , #1929 )
2018-10-17 10:48:53 +02:00
omar
31fd6c585a
Removed unnecessary ImGui:: qualifiers in internal code.
2018-10-17 10:47:27 +02:00
Warren Moore
b4488d4f48
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) ( #2133 )
2018-10-17 10:46:49 +02:00
omar
000c1fc221
Demo: Added comments / tweaks related to the popups.
2018-10-16 10:25:32 +02:00
omar
5be915d6ab
Added ImGuiWindowFlags_NoMouseInputs which is basically the old ImGuiWindowFlags_NoInputs (essentially we have renamed ImGuiWindowFlags_NoInputs to ImGuiWindowFlags_NoMouseInputs). Made the new ImGuiWindowFlags_NoInputs encompass both NoMouseInputs+NoNav, which is consistent with its description. ( #1660 , #787 )
2018-10-15 18:23:18 +02:00
omar
90b50bd4c3
Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. ( #1660 )
2018-10-15 18:16:49 +02:00
omar
69db792bf0
Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. ( #1542 , #1660 , #1878 , etc.)
2018-10-15 17:38:36 +02:00
omar
8b956216b7
Demo: Testing return value of BeginTabBar() for consistency.
2018-10-15 17:19:52 +02:00
Elias Daler
8606d9fa11
Fix Clang/GCC's null-conversion warning: ( #2081 )
...
The warning is "implicit conversion of NULL constant to 'unsigned int' [-Wnull-conversion]". Happens when ImTextureID is not a void*, but unsigned int, for example.
2018-10-15 17:07:06 +02:00
omar
b039dbc62e
Update README.md
2018-10-15 08:34:42 +02:00
Konstantin Podsvirov
edb06a6c4d
Fixed typo in misc/README.txt ( #2131 )
2018-10-14 08:43:06 +02:00
omar
e6cc547a94
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
2018-10-12 15:51:31 +02:00
omar
e73217d6f7
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2018-10-12 15:50:48 +02:00
omar
ca753829cb
Revert using wchar_t functions ( 9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
2018-10-12 15:48:38 +02:00
omar
28953208d4
Tests: Added imgui-test engine hooks (experimental).
2018-10-12 15:47:15 +02:00
omar
2eaf5b03df
Fixes crash introduced in previous commit 9cf94d5.
2018-10-12 13:30:00 +02:00
omar
ede3a3b92d
Fixes crash introduced in previous commit 9cf94d5.
2018-10-12 13:29:13 +02:00
omar
c398153b40
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
2018-10-12 13:01:20 +02:00
omar
33994bbfa1
Docking: Fixed Modal window from being dockable.
2018-10-12 12:56:56 +02:00
omar
9cf94d5dd6
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
2018-10-12 12:34:47 +02:00
omar
0fe48cbb61
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.( #2035 , #2096 )
...
Added misc/README file.
2018-10-12 11:16:51 +02:00
omar
74c0309126
InputText: Clarified comments around ImGuiInputTextFlags_CallbackResize and other callbacks. ( #2006 , #1443 , #1008 )
2018-10-12 10:34:58 +02:00
omar
ed4dcd9072
Shutdown: Unlock font atlas before destroying context, so we can destroy a context between NewFrame and EndFrame if we wait (facilitate main loop structures). Internals: GetWindowScrollMaxX(), GetWindowScrollMaxY()
2018-10-11 22:38:26 +02:00
omar
7525637804
Merge branch 'viewport' into docking. 15ec78e Fixes the update of title buffer when docked in a leaf dock node with a single window. Added comment about overwriting DockIsActive in DockNodeUpdate().
...
# Conflicts:
# imgui.cpp
2018-10-11 21:36:00 +02:00
omar
15ec78e9d8
Internal: Moved stored window name update code to the first_begin_of_the_frame block. This will be useful in the Docking branch.
2018-10-11 21:32:20 +02:00
omar
cf0afb48ac
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
...
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
2018-10-11 12:53:10 +02:00
omar
d02b11dfbd
ImGuiTextBuffer: Avoid heap allocation when empty.
2018-10-11 12:08:09 +02:00
omar
1efafa1d29
Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)
2018-10-10 12:09:06 +02:00
omar
3a7828de6b
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration ( #1542 )
2018-10-09 18:35:45 +02:00
omar
7b3433c68b
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration ( #1542 )
2018-10-09 18:33:39 +02:00
omar
84507cc744
Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. ( #2109 )
2018-10-08 12:37:10 +02:00
omar
3fcc178c23
Update README.md
2018-10-08 11:37:13 +02:00
omar
dd748f0e39
Update README.md
2018-10-08 11:22:33 +02:00
hesiod
500a60debc
Examples: OpenGL3: Cast compile/link status to GLboolean ( #2112 , #2125 )
...
Some OpenGL loaders/bindings do not allow comparisons between GLints and GLbooleans.
2018-10-07 18:14:24 +02:00
omar
02afbaeef0
Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. ( #2112 ) [@hesiod]
2018-10-06 11:35:05 +02:00
omar
cb76c086e0
Docking: Removed context parameter from internal DockBuilderXXX api at it is expected we transition it to be public facing. ( #2109 )
2018-10-05 16:14:51 +02:00
omar
a3b0e0acfa
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. ( #2088 )
2018-10-05 11:36:49 +02:00
Michael Vetter
084c26aa41
Fix spacing in imgui_imp_sdl example ( #2111 )
2018-10-05 10:04:10 +02:00
omar
407822e6a5
BeginTabItem: Fixed missing parameter name in .h file messing up with cimgui generator. ( #2115 )
2018-10-04 19:39:02 +02:00
omar
3c427e284f
Update pull_request_template.md
2018-10-04 12:49:48 +02:00
omar
4e30698706
Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. ( #2109 )
2018-10-03 22:32:23 +02:00
omar
2dd8338e7d
Docking: Added ImGuiDockNodeFlags_NoOuterBorder, tweaked DockSpace demo to remove window border. Made docking splitter use the same standard setting as resizing from edges. ( #2109 )
2018-10-03 18:30:36 +02:00
omar
059560d28b
ButtonBehavior, ImGuiButtonFlags_FlattenChildren flag can be used from a child window. Would typically affect calling SplitterBehavior() from a child window.
2018-10-03 18:11:35 +02:00
omar
d348d86df4
Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. ( #2109 )
2018-10-03 17:50:07 +02:00
omar
1d3862b6b3
Docking: Added ImGuiDockNodeFlags_NoDockingInsideDocRootNode flag. Honoring ImGuiDockNodeFlags_NoSplit in child node is already split (so we can use DockBuilder and then lock the layout). Added those options to the demo. ( #2109 )
2018-10-03 14:57:28 +02:00
omar
bd82539ad5
Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). ( #2109 )
2018-10-03 14:42:47 +02:00
omar
83f55c9de5
Merge branch 'viewport' into docking
2018-10-02 18:55:48 +02:00
omar
33b88a0339
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-10-02 18:55:36 +02:00
omar
fbfe193fcd
Window, Inputs: Fixed resizing from edges when io.MousePos is not pixel-rounded by rounding mouse position input. ( #2110 )
2018-10-02 18:49:55 +02:00
omar
ae7f833c69
Window: Resizing from edges (with io.ConfigResizeWindowsFromEdges Beta flag) extends the hit region of root floating windows outside the window, making it easier to resize windows. Resize grips are also extended accordingly so there are no discontinuity when hovering between borders and corners. ( #1495 , #822 , #2110 )
2018-10-02 18:43:10 +02:00
omar
44bfa24cc3
Docking: Fixed crash using DockBuilderSplitNode(). ( #2109 )
2018-10-02 11:09:53 +02:00
omar
2cff3f6a65
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
2018-10-01 18:35:21 +02:00
omar
76e31bd51a
Fixed typo. ( #2108 , #2083 )
2018-10-01 17:56:06 +02:00
omar
e623be998d
Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. ( #143 )
2018-10-01 15:53:18 +02:00
omar
b48ed9ebc0
Docking: Better tracking of current dock id for inactive and uncreated windows (in settings etc.). + Fixed assert when docking a single-visible leaf node of a hierarchy into another
2018-10-01 11:56:26 +02:00
omar
4e717b524c
Docking: Fixes for C++03 compilers.
2018-10-01 10:40:43 +02:00
omar
ae657a349a
Docking: Fixed extracting a dock node from a document root: document root should be preserved.
2018-09-30 23:39:38 +02:00
omar
ed3c015f4e
Docking: Reorganizing some of the tab-bar selection and window focus related code.
2018-09-30 23:39:38 +02:00
omar
9cfc40c2cc
Docking: Demo: Displaying a message if master docking flag is disabled. + DockSpace() early out + comments.
2018-09-30 23:39:37 +02:00
omar
6ebc63d3ef
Docking: Various sanity fixes + fixed tab-bar items sorting issue when docking single window with a dock node into single window without dock node.
2018-09-30 22:07:57 +02:00
omar
1ae0a1e658
Docking: Fix DockContextRebuild() temporarily invalidating dockid reference leading to undesirable merging of nodes.
2018-09-30 19:34:03 +02:00
omar
46dff42239
Docking: Fixed dock node with single window accidental stealing of non-owned host viewport (leading to general havoc).
2018-09-30 19:30:51 +02:00
omar
35d1fb7b34
Style: Added style.TabRounding setting.
2018-09-30 18:41:07 +02:00
omar
876a3299fc
Docking: Added DockBuilderCopyDockspace() wip. Added DockBuilderCopyWindowSettings(), renamed DockBuilderForkNode() to DockBuilderCopyNode().
2018-09-28 17:58:55 +02:00
omar
3dcd552628
Fixed extraneous static attribute. ( #2105 )
2018-09-27 13:01:51 +02:00
Loïc HAMOT
9aae21483a
Fix missing IMGUI_API and mismatching namespace internal's CreateNewWindowSettings ( #2105 )
2018-09-27 12:59:22 +02:00
omar
93896d550e
Added FindOrCreateWindowSettings() internal helper.
2018-09-26 23:01:51 +02:00
omar
18ffb7dd86
Docking: Reworked DockContextPruneUnusedSettingsNodes() to prune entire unused trees.
2018-09-26 23:01:51 +02:00
omar
c0a89f8f4e
ImPool: Added Reserve() helper function.
2018-09-26 21:51:30 +02:00
omar
c6193d0605
Merge branch 'viewport' into docking
2018-09-26 21:35:09 +02:00
omar
6cc380fc41
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
2018-09-26 21:34:52 +02:00
omar
61d94ff88e
Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
2018-09-26 21:30:37 +02:00
omar
a7d3ae8937
BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. ( #1698 , #894 , #713 ) + reworked the Begin/BeginChild comments in imgui.h.
2018-09-26 21:24:42 +02:00
omar
4053d9d638
Docking: Fixed tab order restoring (follow up to 67be485e, broken in 455dc6e2)
2018-09-26 17:11:37 +02:00
omar
45731cca19
Docking: Added DockBuilderForkNode() primitive for usage for user code to fork/copy entire layouts. This will probably need to be added to as I find ways to migrate patterns from user code to the library. Added IMGUI_DEBUG_DOCKING_INI helper to facilitate debugging. (+1 squashed commits)
2018-09-26 17:11:37 +02:00
omar
dc92431328
Docking: Minor renaming. DockContextAddNode() uses 0 as marker for automatic ID selection + TODO update and moved docking entries to docs/TODO.txt
2018-09-26 12:58:14 +02:00
omar
d3e8e5731a
Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().
2018-09-25 17:45:06 +02:00
omar
53a5d32df1
Docking: Reworked SetNextWindowUserType() as SetNextWindowDockFamily(), allowing multiple scene to be tagged with their scene id and not receive tabs from other scene + persistent storage for family id to allow for docking tree fork/remap.
2018-09-25 16:15:25 +02:00
omar
85e1e2b0c8
Docking: Added DockBuilderGetNode() wrapper for consistency.
2018-09-25 14:14:07 +02:00
omar
9960ccddb2
Docking: Added DockBuilderRemoveNode() + various tweaks. Fixed dragging/undocking dock node from CollapseButton.
2018-09-24 23:19:18 +02:00
omar
4021776d0f
Docking: Fix for undocking node where the dockspace node is attached to an immovable parent window. + Tweak .ini output.
2018-09-24 22:14:12 +02:00
omar
fa0ce4b7d5
Docking: Some DockBuilder functions are applied on settings data if windows are not present. Added DockBuilderCreateNode which needs a size else if we can't split properly. DockNodeTreeSplit() doesn't clamp SizeRef. (+1 squashed commits)
2018-09-24 16:38:44 +02:00
omar
781a7950d7
ImVector: Fixed a oddly unqualified return type in the assignment operator (I assume C++ handles it nicely as this never warned anywhere, but it is completely unintentional).
2018-09-24 11:33:26 +02:00
omar
2a5ce1849a
Docking, Viewport: Reworked viewport inheritance/transition so that extracting a dock node from a split node owning its viewport will have both viewports be in the expected OS z-order. (The lower window re-use the exiting viewport, the detached node uses a new viewport:
2018-09-24 10:53:51 +02:00
omar
ae4b838840
Docking, Viewport: Rework ownership transfer/stealing to fix issues where non-child windows could be stick marked as not owning their viewport.
2018-09-24 10:48:56 +02:00
omar
79c075ca09
Docking+Viewport: Fixed PlatformRequestClose (e.g. ALT-F4) being redrected to the first window of the docking node instead of the selected one.
2018-09-24 10:48:55 +02:00
omar
1127804109
Viewport: Misc tweaks.
2018-09-24 10:39:15 +02:00
omar
788febf044
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097 )
2018-09-24 10:13:01 +02:00
omar
67be485e24
Docking: Fixed losing tab bar selection when extracting a whole docked node + reusing existing dock node when possible.
2018-09-21 16:23:00 +02:00
omar
fda57f48d5
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
2018-09-21 11:52:32 +02:00
omar
840652830d
Docking: Fixed undocking on whole dock node from leaving undesirable empty node in the docking tree. Fixed calls to MarkIniSettingsDirty().
2018-09-21 11:50:49 +02:00
omar
5eabf44021
Nav: Use Platform_SetWindowFocus when CTRL+Tabbing to another viewport.
2018-09-21 11:49:43 +02:00
omar
599d5f185c
TabBar: Recover if SelectedTabId doesn't exist anymore.
2018-09-21 11:02:03 +02:00
omar
5719b23e01
ImDrawList: Fixed AddConvexPolyFilled() undefined behavior when passing points_count smaller than 3, in particular, points_count==0 could lead to a memory stomp if the draw list was previously empty.
2018-09-21 10:00:26 +02:00
omar
7abc368927
Viewport: GLFW: Build fix for pre GLFW 3.2 ( #1542 )
2018-09-20 18:46:36 +02:00
omar
7c3b9172ad
Examples: Referring to missing gamepad support in back-end that are missing it.
2018-09-20 10:37:55 +02:00
omar
b57baa5ba0
Viewport: Enabled viewports by default in more example apps.
2018-09-20 10:31:23 +02:00
omar
3d318a6577
ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different.
...
Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.
2018-09-20 10:24:29 +02:00
omar
3e47978a80
Docking: Renamed ImGuiDockSpaceFlags to ImGuiDockNodeFlags. Clarified in comments/demos that DockSpace creates a Node. Renamed IsExplicitRoot to IsDockSpace. Assert against explicitly calling DockSpace twice in a frame.
2018-09-20 09:52:51 +02:00
omar
e647f89c33
Docking: Added undocking of whole dock node by dragging from the Collapse button. Super useful and works great!
2018-09-19 22:38:40 +02:00
omar
82978fc88f
Docking: Fix of title bar flicker during rebuild. Fixed dragging of DockNode always triggering BeginAsDockableDragDropSource() when io.ConfigDockingWithKeyMod is false.
2018-09-19 19:41:31 +02:00
omar
95d49c3b98
Docking: Internals renaming LastExplicitSize to SizeRef (invalidate .ini data) + todo
2018-09-19 18:25:26 +02:00
omar
455dc6e229
Docking: Creating tab bar and adding window into tab bar immediately (not sure why I didn't do that before). Probably broke something subtle, will find out. *Edit* Initially broke restoring selected tab.
2018-09-19 16:00:13 +02:00
omar
291bfe6841
Docking: work to allow programmatic control of dock nodes, various refactor + assert fix. Probably broke something (but I haven't found what yet!)
2018-09-19 16:00:13 +02:00
omar
0b190f11b9
Contributing, Issue Template
2018-09-18 18:04:32 +02:00
omar
35032d41fa
Docking: Internals: Transitioning some code toward consistently using ImGuiContext* ctx parameter instead of ImGuiDockContext
2018-09-17 17:06:52 +02:00
omar
28094b7cea
Docking: Fixed central docking display with ImGuiDockSpaceFlags_NoSplit, affecting in particular with io.ConfigDockingWithKeyMod = false. + comments, asserts
2018-09-17 15:39:35 +02:00
omar
571676ebd2
Added Fonts readme details and links to Sweet16 font. ( #2085 )
2018-09-17 13:16:32 +02:00
Tesla Ice Zhang
4b353ce482
Fix file names ( #2083 )
2018-09-15 21:41:07 +02:00
omar
b55b9aee9b
Fixed bad merge ( a82be53) where we lost the version number in Docking branch + moved Docking related API together for now.
2018-09-14 18:09:46 +02:00
omar
0f1c21a6c9
Docking: Changed DockSpace() signature to take an ID, as ID will frequently be used by other API it makes more sense to let the user compute it.
2018-09-14 18:09:04 +02:00
omar
175bab4f5f
Docking: Removed SplitRatio from ImGuiDockNode and ImGuiDockNodeSettings, which we don't need anymore.
2018-09-14 17:51:30 +02:00
omar
ba7b68798d
Docking: Misc rework/rename toward being able to rebuild a branch selectively, so we can honor settings changes on a per Dockspace basis. + Comments
2018-09-14 16:01:47 +02:00
omar
e32256b4b4
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
2018-09-14 11:38:10 +02:00
omar
132d8c5a99
Viewport: Increased threshold for setting ImGuiViewportFlags_NoFocusOnAppearing. ( #1542 ), 2 doesn't seem enough with some docking setup.
2018-09-14 11:37:17 +02:00
omar
b85f345369
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
2018-09-14 11:32:55 +02:00
omar
c12da2a607
BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.
2018-09-14 11:28:08 +02:00
omar
ca5dc0c019
ColorPicker: Replaced the Separator with a Spacing call. ( #2068 )
2018-09-14 10:05:53 +02:00
omar
85a3fb3bef
Viewport: Fix an issue introduced on ~August 16, which would assert when viewport are disabled. Also made the DestroyPlatformWindow process more sturdy. ( #1542 )
2018-09-13 17:11:06 +02:00
omar
6d91055462
Docking: Fixed floating->docking transition on a platform window mistakenly destroying the platform window because the upcoming tab isn't visible and triggers viewport GC. Fixed missing title bar data on recreate window.
2018-09-13 16:56:57 +02:00
omar
1afd29d382
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
2018-09-13 16:50:13 +02:00
omar
136fc56af0
Docking: Better handling of window losing its dock node or having its dock node not active.
2018-09-13 14:38:37 +02:00
omar
c355ed1267
Docking: Flicker fix when clicking on a Tab leading of a new window, in particular would be noticeable when using nested tab bars.
2018-09-13 12:44:29 +02:00
Elias Daler
ec04e8bb05
Fix MSVC's C4312 warning about casting user texture type to void* in ImageButton ( #2080 )
2018-09-12 22:58:45 +02:00
omar
9cc63ba279
Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. ( #2078 )
2018-09-11 22:00:57 +02:00
ice1000
201fcfd2e5
Internals: Replace unsigned short with ImWchar when dealing with character storage. ( #2078 )
2018-09-11 22:00:57 +02:00
omar
1cefc48f13
Docking: Internal renaming and comments. + Fixed DockNodeMoveChildNodes() to transfer the LastExplicitSize value (was inconsequential afaik).
2018-09-11 18:53:08 +02:00
omar
211a9c8fd2
Docking: Added ImGuiDockSpaceFlags_KeepAliveOnly, important for multiple level of tabs. (also renamed ImGuiDockFlags to ImGuiDockSpaceFlags.)
2018-09-11 17:58:09 +02:00
omar
f29b3b4033
Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. ( #1542 , #787 )
2018-09-11 15:35:53 +02:00
omar
df65d4a14f
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-09-11 11:18:46 +02:00
omar
d014d0285a
DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. ( #2024 )
2018-09-11 11:15:06 +02:00
omar
af6cf25255
DragFloat: Fixed a situation where dragging with value rounding enabled or with a power curve erroneously wrapped the value to one of the min/max edge. ( #2024 , #708 , #320 , #2075 ).
2018-09-11 10:55:52 +02:00
omar
c4e26f4b92
Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. ( #1542 , #787 )
2018-09-10 22:19:54 +02:00
omar
416918429d
Docking: Added Type enum in ImGuiDockRequest. Renamed fields. DockSpace() skips node update if already submitted (when transitioning from implicit -> explicit DockSpace).
2018-09-10 22:09:43 +02:00
omar
e2436ca625
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
2018-09-10 20:40:21 +02:00
omar
d5692bff00
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
2018-09-10 20:30:14 +02:00
omar
dcef0c0237
Docking: Updating LastFrameActive earlier in Begin() because BeginDocked() will need to use it. Extracted some code into a DockNodeIsDropAllowedOne() function. Comments.
2018-09-10 20:23:03 +02:00
omar
a68c98bb67
Docking: Added SetNextWindowUserType() + user type filtering in dockspace and window merging. Added DockSpace() flag ImGuiDockFlags_NoSplit. Renaming. Reworked the DockNodeUpdateFindOnlyNodeWithWindows code so DockNodeUpdate can access the first window.
2018-09-10 14:32:00 +02:00
omar
b872aa5c8e
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
2018-09-10 11:24:27 +02:00
MindSpunk
7eadcf7d7d
example_glfw_vulkan was missing a reference to imgui_widgets.cpp ( #2071 , #2036 )
2018-09-09 21:09:58 +02:00
omar
062b1f0463
Fixed calling SetNextWindowSize()/SetWindowSize() with non-integer values leading to accidental alteration of window position. We now round the provided size. ( #2067 )
2018-09-07 22:30:46 +02:00
omar
2eaf722fd7
Fixed calling DestroyContext() always saving .ini data with the current context instead of the supplied context pointer. ( #2066 )
2018-09-07 17:24:56 +02:00
omar
a82be53407
Merge branch 'docking2' into viewport_docking
...
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2018-09-06 22:28:21 +02:00
omar
49533bc86e
Examples: Enabled Docking + Nav by default in the branch. ( #351 )
2018-09-06 21:53:35 +02:00
omar
e381f22ac1
Docking: Added Docking system. (Part 3) ( #351 )
2018-09-06 21:45:46 +02:00
omar
9ac1e93aa1
Docking: Added Docking system. (Part 2) ( #351 )
2018-09-06 21:45:46 +02:00
omar
bd5b38e232
Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) ( #351 )
2018-09-06 21:45:46 +02:00
omar
5adcb9ce6d
Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).
2018-09-06 21:45:45 +02:00
omar
2ec135c9f7
Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.
2018-09-06 21:45:45 +02:00
omar
58d46e1fe6
Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. ( #261 , #351 )
2018-09-06 21:45:44 +02:00
omar
c039a77d21
Internals: Added ImPool helper structure. Moved ImVec1f.
2018-09-06 21:45:10 +02:00
omar
741bdf151a
Added ImGuiWindowFlags_UnsavedDocument flags.
2018-09-06 21:45:10 +02:00
omar
5070c769b8
Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
2018-09-06 21:45:09 +02:00
omar
52e0de84a9
Internals: Split RenderTextClipped into two functions.
2018-09-06 21:45:09 +02:00
omar
eb7033e75b
Version 1.66 WIP
2018-09-06 21:44:59 +02:00
omar
b974fffea0
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-06 15:59:35 +02:00
omar
e0cab5664a
Version 1.65
2018-09-06 15:58:58 +02:00
omar
5a679a45cc
Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. ( #1718 , #2036 )
...
If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths.
The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
2018-09-06 15:58:25 +02:00
omar
a2616c79fe
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-06 11:42:11 +02:00
omar
e58bc3d5b7
Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ( #2036 )
2018-09-06 11:36:00 +02:00
omar
0b18c11440
Refactor: Moved ImFile functions. ( #2036 )
2018-09-06 11:36:00 +02:00
omar
ab64e8f993
Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. ( #2036 )
2018-09-06 11:36:00 +02:00
omar
31b5b18611
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-05 20:59:27 +02:00
omar
bb3184af74
Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ( #2036 )
2018-09-05 20:54:28 +02:00
omar
cbdce80837
Internals: Refactor: Moved render functions to their own section. ( #2036 )
2018-09-05 20:46:57 +02:00
omar
8601c39571
Viewport: Making the code a little more sturdy (flag changes) + added descriptions. ( #1542 )
2018-09-05 17:50:55 +02:00
omar
af27ec296b
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-09-05 17:38:47 +02:00
omar
65876f348a
Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. ( #787 )
2018-09-05 17:33:00 +02:00
omar
77ba883f23
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. ( #1427 ) + changed ImGuiIO layout.
2018-09-05 17:29:47 +02:00
omar
bbcc976739
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
2018-09-05 17:29:47 +02:00
omar
b944aa623c
Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
2018-09-05 11:52:48 +02:00
omar
a848807847
Minor inconsequential merges from Master/Docking branches
2018-09-05 11:51:45 +02:00
omar
bdb30d7145
Merge branch 'master' into viewport
2018-09-05 11:08:57 +02:00
omar
897e5c6231
Viewport: Moved code following refactor. ( #2036 , #1542 )
2018-09-05 11:08:44 +02:00
omar
40db2ca098
Fixed a build issue with non-Cygwin GCC under Windows.
2018-09-04 18:58:20 +02:00
omar
5451cb7e1e
Readme, Changelog ( #2059 )
2018-09-04 11:48:08 +02:00
omar
1007873d94
Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
2018-09-03 19:51:22 +02:00
Jiří Šebele
f8b7e4d94f
Examples: imgui_impl_opengl3 Fix GLAD error condition ( #2059 , #2002 )
...
`gladLoadGL` returns 0 on fail, not the other way around.
2018-09-03 19:36:02 +02:00
omar
d07f494305
Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. ( #2036 )
...
Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT
2018-09-03 14:49:13 +02:00
omar
bcb1441ce7
Version 1.65 WIP
2018-09-03 14:38:04 +02:00
omar
fd201a90f1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-08-31 18:39:02 +02:00
omar
767649afb1
Fix missing include on some systems to use intptr_t. ( #2036 , #2054 )
2018-08-31 18:07:47 +02:00
omar
5d40d295b3
Comments, readme updates
2018-08-31 11:37:14 +02:00
Omar Cornut
be6ea86f8d
OSX: Added imgui_widgets.cpp to xcode project files.
2018-08-31 11:29:25 +02:00
omar
a52ce7ac8b
Merge branch 'master' into viewport
2018-08-31 11:14:05 +02:00
omar
fd90afef43
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) ( #2036 , #1542 )
2018-08-31 11:11:18 +02:00
omar
5207afa0dd
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) ( #2036 , #1542 )
2018-08-31 11:06:21 +02:00
omar
9174958b43
imgui_stl: Comments ( #2035 )
2018-08-31 10:53:38 +02:00
omar
0699310b9c
Merge branch 'viewport_164' into viewport
2018-08-31 10:28:37 +02:00
omar
0c24fe276c
Merge branch 'master_164' into viewport_164
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
2018-08-31 10:28:21 +02:00
omar
36435b43c7
Merge branch 'master_164'
2018-08-31 10:12:49 +02:00
omar
48db5713d6
Version 1.64
2018-08-31 10:00:03 +02:00
omar
38cfcf9fbc
Tweak comments and indexes
2018-08-31 09:59:58 +02:00
omar
c83391262e
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. ( #2036 )
2018-08-30 21:21:14 +02:00
omar
00262d51ad
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) ( #2036 )
2018-08-30 21:19:30 +02:00
omar
d7c04ccbfb
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) ( #2036 )
2018-08-30 21:18:16 +02:00
omar
b1f263b34b
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) ( #2036 )
2018-08-30 21:16:30 +02:00
omar
a58e4dfd0f
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )
2018-08-30 21:16:23 +02:00
omar
8a216fe756
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. ( #2036 )
2018-08-30 21:15:12 +02:00
omar
fd2bfb7e07
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) ( #2036 )
2018-08-30 21:00:51 +02:00
omar
064b949bc2
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) ( #2036 )
2018-08-30 20:59:24 +02:00
omar
2a0d26e603
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) ( #2036 )
2018-08-30 20:58:36 +02:00
omar
df37a156e8
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )
2018-08-30 20:51:57 +02:00
omar
18d6490dbd
Merge branch 'master_164' into viewport_164
...
# Conflicts:
# imgui.cpp
2018-08-30 20:36:37 +02:00
omar
346f83e014
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) ( #2036 , #787 )
2018-08-30 19:41:02 +02:00
omar
fefcc77f13
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) ( #2036 , #787 )
2018-08-30 19:40:40 +02:00
omar
b6cdfef442
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) ( #2036 , #787 )
2018-08-30 19:38:44 +02:00
omar
172e426ba9
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) ( #2036 , #787 )
2018-08-30 19:36:59 +02:00
omar
f74d9ec7f7
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) ( #2036 , #787 )
2018-08-30 19:36:40 +02:00
omar
9093166eea
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) ( #2036 , #787 )
2018-08-30 19:35:19 +02:00
omar
f5ed5478e1
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) ( #2036 , #787 )
2018-08-30 19:35:12 +02:00
omar
9a4234ea8e
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) ( #2036 , #787 )
2018-08-30 19:35:06 +02:00
omar
af002dc861
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) ( #2036 , #787 )
2018-08-30 19:34:48 +02:00
omar
adeb993122
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:33:02 +02:00
omar
81bc4265e5
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:32:52 +02:00
omar
a44c5f7afe
Refactor: Internals: Moved various functions in imgui.cpp ( #2036 )
2018-08-30 19:30:17 +02:00
omar
66b51940bd
Refactor: Moved README, ChangeLog, TODO files to docs/ folder + update Changelog. ( #2036 )
2018-08-30 19:30:10 +02:00
omar
d4e49a2697
Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
2018-08-30 19:29:46 +02:00
omar
728b2ef026
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
cda45737ab
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
acf3cc4c3f
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
8a6fd237f6
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
84eb2682b7
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
73052dc00c
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
6bda59e5b7
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
60ee4de56d
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) ( #2036 , #787 )
2018-08-30 19:23:10 +02:00
omar
ce58795bdf
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) ( #2036 , #787 )
2018-08-30 19:23:10 +02:00
omar
f2926f910f
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:23:10 +02:00
omar
15172f0742
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:23:10 +02:00
omar
98f618ed18
Refactor: Internals: Moved various functions in imgui.cpp ( #2036 )
2018-08-30 19:23:10 +02:00
omar
5afd4b61f2
Refactor: Moved README, ChangeLog, TODO files to docs/ folder + update Changelog. ( #2036 )
2018-08-30 19:23:09 +02:00
omar
521405488b
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:21:50 +02:00
omar
24dfa0c957
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:12:33 +02:00
omar
158a65c98f
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:49 +02:00
omar
6caf074bd5
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:42 +02:00
omar
905e14f384
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:36 +02:00
omar
4be79a8955
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:04 +02:00
omar
2d952504ed
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:01:05 +02:00
omar
43219d36a6
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:00:59 +02:00
omar
99b27488e7
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:00:52 +02:00
omar
18972c5513
Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. ( #2036 )
2018-08-30 19:00:42 +02:00
omar
e312363007
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly ( #2036 )
2018-08-30 19:00:33 +02:00
omar
6c34bffbb5
Version 1.64 WIP
2018-08-30 19:00:22 +02:00
omar
2714f8fa23
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:46 +02:00
omar
c25f48b902
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:46 +02:00
omar
ad0bfdcd95
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:45 +02:00
omar
5dc954f5d7
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:45 +02:00
omar
a265c62636
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:45 +02:00
omar
0e9577d0da
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:44 +02:00
omar
f26b8c1e07
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 14:55:27 +02:00
omar
6468a3c0ce
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 14:50:32 +02:00
omar
3eaa063984
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 14:50:32 +02:00
omar
52c115fb2c
Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. ( #2036 )
2018-08-30 14:50:32 +02:00
omar
01586d33f3
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly ( #2036 )
2018-08-30 14:29:11 +02:00
omar
f2aa124eb8
Version 1.64 WIP
2018-08-30 14:25:23 +02:00
omar
36b2f64051
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2018-08-29 17:40:52 +02:00
omar
1c4008aa97
Changelog tweaks/typos
2018-08-29 17:34:08 +02:00
omar
9e0f24dcb6
Version 1.63
2018-08-29 16:20:25 +02:00
omar
ac0fcbca46
Changelog: fixed inconsistent white space before list items.
2018-08-29 16:20:02 +02:00
omar
92edb7a4e3
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
2018-08-29 16:12:54 +02:00
omar
ec148988f0
Reordered some declarations in imgui.h (in prevision of 1.64 refactor)
2018-08-29 16:12:23 +02:00
omar
2598d26c73
ColorEdit4: Fixed a bug when text input or drag and drop leading to unsaturated HSL values would erroneously alter the resulting color. ( #2050 )
2018-08-29 13:30:46 +02:00
omar
f9634feb66
Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR ( #846 )
2018-08-28 19:10:59 +02:00
omar
220e6a55b7
Travis: Fix (still not sure there is a way to test those files). ( #1044 )
2018-08-28 18:40:51 +02:00
omar
1b61b6b208
Examples: Vulkan: Minor tweaks.
2018-08-28 18:22:36 +02:00
omar
db790dab4c
Travis: Added xcode build for the OSX+Metal example. ( #1044 ) [@petmac]
2018-08-28 18:15:22 +02:00
omar
b127027cbd
Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. ( #2001 , #2002 ). Changelog, tweaks, applied changes to SDL+OpenGL3 example.
2018-08-28 16:08:04 +02:00
Jérémie Dumas
e476b7e727
WIP on configurable OpenGL loader. ( #2001 , #2002 )
2018-08-28 16:07:58 +02:00
omar
af50ebe7b6
Documentation
2018-08-27 09:36:15 +02:00
omar
705ff49400
Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to 4dea032 ( #1542 )
2018-08-25 21:21:14 +02:00
omar
f81caac459
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-08-25 21:19:42 +02:00
omar
4dea0327e7
Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.
2018-08-25 21:16:08 +02:00
omar
0ada716184
Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. ( #1542 )
2018-08-25 20:15:18 +02:00
omar
a082692b0a
ImFontAtlas Comments ( #2042 ) + added ImGuiFontAtlas_None for consistency.
2018-08-25 20:06:17 +02:00
omar
e9c849884a
Viewport: Fixed warnings due to bad merge.
2018-08-24 15:42:31 +02:00
omar
06e917f135
Internals: Renaming of non-user facing parts from ValueChanged to Edited terminology. ( #2034 , #820 , #956 , #1875 )
2018-08-23 13:47:37 +02:00
omar
042f88e5f0
Removed obsolete redirection functions: CollapsingHeader() variation with 2 bools - marked obsolete in v1.49, May 2016.
2018-08-23 13:40:38 +02:00
omar
3612885dea
Comments, demo
2018-08-23 13:37:06 +02:00
omar
0810d57819
Renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete fast as IsItemDeactivatedAfterChange() is very recent). ( #820 , #956 , #1875 , #2034 )
2018-08-23 13:26:14 +02:00
omar
e28b1078f5
Added IsItemEdited() to query if the last item modified its value (or was pressed). This is equivalent to the bool returned by most widgets. It is useful in some situation e.g. using InputText() with ImGuiInputTextFlags_EnterReturnsTrue. ( #2034 )
2018-08-23 13:21:01 +02:00
omar
abaa274592
Internals: Wired a ImGuiItemStatusFlags_ValueChanged into ItemStatusFlags, for an hypothetical IsItemValueChanged() function. ( #2034 )
2018-08-22 22:31:51 +02:00
omar
102d5e6de6
Rearrange header comments to find enums easily + fixed inconsistent sorting.
2018-08-22 22:13:05 +02:00
omar
a4191857c1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
2018-08-22 21:35:44 +02:00
omar
7011d87bf8
InputText: Improved sturdiness if the ResizeCallback purposefully modify data->BufTextLen or data->BufSize. ( #2006 , #1443 , #1008 )
2018-08-22 21:27:27 +02:00
omar
7d9d9bc34e
InputText: Fix ResizeCallback callback on restoring initial value with Escape key. Avoid over-allocating for InitialText storage. ( #2006 , #1443 , #1008 )
2018-08-22 21:11:55 +02:00
omar
7268c65d73
Examples: imgui_impl_vulkan: Comments (re)
2018-08-22 17:59:58 +02:00
omar
3fdfac3377
Examples: imgui_impl_vulkan: Comments
2018-08-22 16:43:29 +02:00
omar
ea9f5d7600
Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). ( #2035 , #2006 , #1443 , #1008 )
2018-08-22 13:25:08 +02:00
omar
8d639ec60d
InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. ( #2006 , #1443 , #1008 ).
2018-08-22 13:09:44 +02:00
omar
ea1906004b
InputText: Fixed a few pathological crash cases on single-line InputText widget with multiple millions characters worth of contents. Because the current text drawing function reserve for a worst-case amount of vertices and how we handle horizontal clipping, we currently just avoid displaying those single-line widgets when they are over a threshold of 2 millions characters, until a better solution is found.
2018-08-22 12:46:47 +02:00
omar
5122c76441
InputText: Fixed not tracking the cursor horizontally When modifying the text buffer through a callback.
2018-08-22 12:46:47 +02:00
omar
68448c5faa
ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.
2018-08-22 12:46:47 +02:00
omar
975b5a7310
ImDrawList: Fixed clipping of leading lines above the clipping rectangle from counting in the worst case vertices reservation. (fix code added in #200!)
2018-08-22 12:46:47 +02:00
omar
2dc5ec95d7
Internals: InputText: Renaming. Comments.
2018-08-22 12:46:46 +02:00
omar
9f393c38e9
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
2018-08-22 12:46:45 +02:00
omar
24ff259816
InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. ( #2006 , #1443 , #1008 ).
2018-08-21 21:36:07 +02:00
omar
4de6e1f7e4
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
2018-08-21 15:14:10 +02:00
omar
0fd6e9bc0d
InputText: Fixed minor off-by-one issue when submitting a buffer size smaller than the initial zero-terminated buffer contents.
2018-08-21 14:27:57 +02:00
omar
e6c78f9470
InputText: (Breaking change) removed ImGuiTextEditCallbackData::ReadOnly since it is a duplication of (ImGuiTextEditCallbackData::Flags & ImGuiInputTextFlags_ReadOnly) ( #211 )
2018-08-21 14:27:57 +02:00
omar
5942c08143
Added IMGUI_VERSION_NUM for easy compile-time testing. ( #2025 )
2018-08-21 14:27:57 +02:00
omar
f23d29b481
Added links to Discourse forums.
2018-08-20 10:45:10 +02:00
omar
4910629f6a
Internals: Moved code out of SliderBehaviorT to reduce code bloat and also because caller may have use for the grab_bb for styling purposes.
2018-08-20 09:59:51 +02:00
omar
73fa5c29f4
Update README.md
2018-08-17 16:44:23 -07:00
omar
9d7480774f
Merge branch 'master' into viewport
2018-08-17 11:37:03 -07:00
omar
bb2de30e3e
Internals: Added ImTextCountUtf8BytesFromChar() helper.
2018-08-17 11:33:45 -07:00
omar
ac39c4b2a8
SplitterBehavior: Fix for when the sizes are already under the minimum desired size.
2018-08-17 11:33:40 -07:00
omar
341ebd961b
Fixed assertion when transitioning from an active ID to another within a group, affecting ColorPicker (broken in 1.62). Made ActiveIdIsAlive track the actual ID to avoid incorrect polling in BeginGroup/EndGroup when the ID changes within the group. ( #2023 , #820 , #956 , #1875 ).
2018-08-16 13:33:16 -07:00
omar
8972ebae73
Metrics: Added io.MetricsActiveAllocations, moving away from the cross-context global counters than we previously used. ( #1565 , #1599 , #586 )
2018-08-15 16:28:39 -07:00
omar
5d630c930d
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). ( #1542 )
2018-08-15 16:15:44 -07:00
omar
9852649e97
Viewport: Initial viewport DpiScale only queried on viewport creation. Because AddUpdateViewport() is called repeatedly on MovingWindow or with ImGuiConfigFlags_ViewportsNoMerge, the DpiScale update would break ImGuiConfigFlags_DpiEnableScaleViewports. ( #1542 )
2018-08-14 19:17:33 -07:00
omar
4e33aeed82
Selectable: Added ImGuiSelectableFlags_Disabled flag in the public API. ( #211 )
2018-08-14 16:07:01 -07:00
omar
1722a31155
Viewport: ImGuiWindowFlags_NoFocusOnAppearing affects viewport accordingly. ( #1542 )
2018-08-14 14:58:19 -07:00
omar
e5f2295398
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2018-08-13 17:50:48 -07:00
omar
caaa746424
Nav: NavWindowingList doesn't save to .ini file. TODO entries.
2018-08-13 17:29:20 -07:00
omar
d4cd121ae1
TODO + added missing _None enum for some internals flags.
2018-08-09 21:03:17 +02:00
omar
fda9dc8e18
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. ( #2013 )
2018-08-09 18:07:49 +02:00
omar
421dc19798
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. ( #2015 )
2018-08-09 17:49:48 +02:00
Ryan Crandall
9c0805010f
imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID ( #2015 , #301 )
2018-08-09 17:44:29 +02:00
omar
d5793102db
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. ( #2002 , #1873 )
2018-08-09 17:42:53 +02:00
Ryan Crandall
34203d5008
imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined ( #2014 )
2018-08-09 17:32:31 +02:00
luk1337
e3eb4111cc
Examples: Fix 'How to build' instructions for SDL2 examples ( #2012 )
2018-08-08 18:55:09 +02:00
omar
35124cdd07
imgui_impl_opengl3.cpp Using GLES3 on IOS instead of gl3w. ( #2002 , #1873 )
...
Not modifying the main.cpp yet because we need to test GL ES 3 context creation on iOS (only imgui_impl_opengl3.cpp was tested).
2018-08-08 17:41:30 +02:00
omar
0065fe16a2
Nav: Made CTRL+TAB skip menus + skip the current navigation window if is has the ImGuiWindow_NoNavFocus set. ( #787 )
...
While it was previously possible, you won't be able to CTRL-TAB out and immediately back in a window with the ImGuiWindow_NoNavFocus flag.
2018-08-08 16:03:13 +02:00
omar
9d8a0374d3
Use literals in place of LLONG_MIN, LLONG_MAX ULLONG_MAX if they are not available. Amend 498c0dcb4c. We prefer using the defines if available in limits.h because they somehow tend to work without warnings when enabling strict C++03 compilation. The 3 literals are fallbacks.. ( #1926 ).
2018-08-06 13:07:19 +02:00
omar
0905202f44
Internals: Minor renaming for consistency.
2018-08-05 18:13:24 +02:00
omar
9e9c8a8991
Update to Contributing, and Issue/PR templates.
2018-08-05 18:13:15 +02:00
omar
bc6ac8b2ae
Metrics: Changed io.MetricsActiveWindows to reflect the number of active windows (!= from visible windows), which is useful for lazy/idle render mechanisms as new windows are typically not visible for one frame.
...
Metrics: Added io.MetricsRenderWindow to reflect the number of visible windows.
2018-08-03 18:12:36 +02:00
omar
00e29832d4
Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. ( #1996 )
2018-08-03 15:04:35 +02:00
omar
498c0dcb4c
Using limits.h LLONG_MIN etc. to increase old-compiler compatibility (as ll and ull prefixes were not standard). Not tested much on old compilers, relying on Clang/GCC warnings.
2018-08-03 11:41:07 +02:00
omar
fd2a90ee60
Update CONTRIBUTING.md
2018-08-02 16:53:51 +02:00
omar
8ef0ca9765
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2018-08-01 12:27:56 +02:00
omar
d69b2a1c1d
Changelog for #1989
2018-08-01 12:23:59 +02:00
Matthias Moulin
6011ddf1e5
imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 ( #1989 )
2018-08-01 12:22:04 +02:00
omar
cc64bd9e3c
Comments
2018-08-01 11:54:54 +02:00
omar
87e2fea09d
Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. ( #1427 , #1495 , #822 , #473 , #650 )
...
Demo: Exposed flags in Demo.
2018-08-01 11:50:57 +02:00
omar
b1fc988c6b
imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. ( #1941 )
2018-08-01 11:34:17 +02:00
omar
b217251a63
Added Visual Studio 2017+ build cruft to Ignore List (.vs/ folder)
2018-07-31 18:48:24 +02:00
omar
671e516377
Demo: Fix using ambiguous InputFloat() call which redirect to obsolete version. ( #1990 )
2018-07-31 18:38:15 +02:00
omar
65b46f62ef
Fixed PushID() from keeping alive the new ID Stack top value (if a previously active widget shared the ID it would be erroneously kept alive) (drag and drop demo could soft-lock the UI until pressing Escape!)
2018-07-31 17:28:18 +02:00
omar
7e1678ff00
Drag and Drop: Elapse payload as soon as delivery is made. ( #153 )
2018-07-31 17:28:08 +02:00
omar
c031ea088a
Viewport: Fixed an assert on loss of valid mouse position while dragging a tooltip (would happen often when using debugger breakpoint). Not totally sure about best solution, may not be important.
2018-07-31 13:46:37 +02:00
omar
faf2c34149
Drag and Drop: Added ImGuiDragDropFlags_SourceAutoExpirePayload flag to force payload to expire if the source stops being submitted. ( #1725 , #143 ).
2018-07-31 13:46:19 +02:00
omar
79ae6d3bf6
Drag and Drop: Clear payload buffers more consistently in ClearDragAndDrop() + BeginDragDropTargetCustom() can't succeed with hidden contents. ( #143 )
2018-07-31 13:45:25 +02:00
omar
9824bf1ba1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2018-07-31 12:12:56 +02:00
omar
e13e5982ff
Drag and Drop: Payload stays available and under the mouse if the source stops being submitted, however the tooltip is replaced by "..." + moved FrameScopeActive = false at the bottom of EndFrame() for safety. ( #1725 )
2018-07-31 12:11:18 +02:00
omar
f88bf9cea3
InvisibleButton: Added an assert to catch common type of passing zero-sized dimensions. ( #1983 )
2018-07-30 18:48:10 +02:00
omar
067edd09f9
imgui_impl_opengl3: Comments. ( #1987 )
2018-07-30 18:44:58 +02:00
omar
a7ac9e8346
Made assertion more clear when trying to call Begin() outside of the NewFrame()..EndFrame() scope. ( #1987 )
2018-07-30 18:20:25 +02:00
omar
d5400d9517
Fixes for pre-C++11 compilers.
...
That said, I think we can consider upgrading requirement to an early VS-friendly subset of C++11. The thing I would like the most from C++11 are forward-declared enum (from VS 2012 onward).
2018-07-30 17:42:27 +02:00
omar
4d5dcdb57a
Internals: Changed signature of ShadeVerts functions to remove pointers. ( #1286 , #1700 , #1986 )
2018-07-30 17:24:04 +02:00
omar
f05aede098
Revert "Assert that fmt != NULL before calling vsnprintf ( #1969 )"
...
This reverts commit 84183f5bb6 .
2018-07-30 16:50:47 +02:00
omar
80db2383d8
Speculative va_copy() fix for old versions of GCC/Clang. (cannot repro) ( #1085 )
2018-07-30 16:01:06 +02:00
omar
2a67aeaa3d
Visual Studio: calling into _vsnprintf. ( #1085 )
2018-07-30 16:01:06 +02:00
Dado
81562b2b5a
Examples: imgui_impl_opengl3.cpp Using #ifdef GL_SAMPLER_BINDING instead of if (glBindSampler) ( #1985 )
2018-07-30 15:38:13 +02:00
omar
15a93d6fe3
Internals: Fixed HoveredIdTimer so it is safe to call SetHoveredId() multiple times without altering the timer.
2018-07-30 14:36:33 +02:00
omar
6d78045ff8
Demo: Added extra demo in the Basic Horizontal Layout section. ( #1977 ) + PR guidelines
2018-07-30 14:33:27 +02:00
Tommy Nguyen
b5b972d0ef
ImFontAtlas::AddFontDefault: Made it possible to override glyph ranges. ( #1965 )
2018-07-30 14:18:20 +02:00
Marcel Smit
faa7dad537
Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. ( #1978 )
2018-07-30 14:15:24 +02:00
omar
544db70852
Examples: OpenGL3: Tweaks, added changelog. ( #1941 )
2018-07-30 14:00:53 +02:00
Omar Sherif Fathy
fc737d2333
Examples; imgui_impl_opengl3.cpp to work with Emscripten ( #1941 )
...
* Add some ifdefs to add emscripten specific params and includes
* Update imgui_impl_opengl3.cpp
* Update imgui_impl_opengl3.cpp
* Update imgui_impl_opengl3.cpp
* replace __EMSCRIPTEN_BUILD__ with __EMSCRIPTEN__
* replace GLFW_INCLUDE_ES3 with direct header
* removing useless glfw include
* Making call to glPolygonMode() optional
2018-07-30 13:52:18 +02:00
omar
f9e8b5c652
CollapseButton: Added hovering highlight + minor consistency tweaks.
2018-07-27 13:32:33 +02:00
omar
6211f40f3d
Internals: Drag and Drop: default drop preview use a narrower clipping rectangle (no effect here, but other branches uses a narrow clipping rectangle that was too small so this is a fix for it) + Comments
2018-07-27 12:39:42 +02:00
omar
0095b7a0ea
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-07-26 23:55:23 +02:00
omar
28c1a9857e
Internals: Changed SplitterBehavior() signature to be consistent with other similar signatures. ( #319 ).
2018-07-26 23:50:05 +02:00
omar
63df9d6311
Internals: Extracted part of Begin into UpdateWindowParentAndRootLinks(). Useful to call to keep state updated immediately (namely useful for docking) + small tidying up of imgui_internal.h
2018-07-26 23:49:36 +02:00
OswaldHurlem
84183f5bb6
Assert that fmt != NULL before calling vsnprintf ( #1969 )
...
In the case of Visual Studio 15.6 + Windows SDK 10.0, vsnprintf() with NULL format string appears to corrupt the stack...
2018-07-26 22:26:50 +02:00
omar
6b4f6cd2c5
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-26 19:25:55 +02:00
omar
dd0d5debef
Internals: Child windows that are clipped or part of a collapsed parent are not marked as collapsed anymore, but just a separate hidden marker set. We distinguish hiding for size measurement vs hiding for other reasons. Cleaned a little the end of Begin.
2018-07-26 19:24:27 +02:00
omar
0b045d8de5
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
2018-07-26 19:03:02 +02:00
omar
1b646a4440
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
2018-07-26 19:01:51 +02:00
omar
7adac4ab3e
FAQ update
2018-07-26 12:55:40 +02:00
omar
0c88fad6c2
Internals: SplitterBehavior() added hover_visibility_delay parameter which is helpful to reduce visual noise. ( #319 )
2018-07-25 16:07:05 +02:00
omar
f22024cb19
Internals: Exposed NavScoreItemGetQuadrant() as ImGetDirQuadrantFromDelta() in imgui_internal.h
2018-07-24 16:54:29 +02:00
omar
049c515840
Added non-const ImVec2 [] operator for consistency (and because some docking code needs it.)
2018-07-24 16:54:19 +02:00
omar
352695bc57
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2018-07-24 16:50:49 +02:00
omar
357534e588
Made it possible to move a window by dragging from the Collapse button (past the drag threshold). Extracted some code out to a CollapseButton() function.
2018-07-24 16:45:11 +02:00
omar
3a522b2400
Internals: Renamed one of the arrow functions so their name don't collide.
2018-07-24 16:41:17 +02:00
omar
ff83d0e369
Examples: Using fully qualified "Dear ImGui" name in window titles.
2018-07-23 17:31:13 +02:00
omar
528b50a89f
Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. ( #1463 , #1380 , #1502 )
2018-07-22 19:04:15 +02:00
omar
4b8ce24e46
Internals: Extracted part of NewFrame() into a UpdateMouseWheel() function.
2018-07-22 18:57:28 +02:00
omar
4ebd442a24
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). ( #1958 )
2018-07-22 18:53:27 +02:00
omar
e07f5d4c78
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
2018-07-22 18:46:41 +02:00
omar
ec76009bc4
Readme: fixed typo + patron
2018-07-22 18:09:44 +02:00
Elias Daler
af38a5c41a
Ignore GCC warning (-Wclass-memaccess) in imgui.h ( #1959 )
2018-07-22 18:05:13 +02:00
omar
fded746d03
Tweaked Contributing guidelines, Issue and PR templates
2018-07-22 17:32:31 +02:00
omar
74077491ce
Viewport: Fixed a situation when the implicit Debug window can hold on a zombie viewport which platform window is not properly destroyed. ( #1542 )
2018-07-22 16:24:06 +02:00
omar
048add5ef2
ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. ( #1879 )
2018-07-19 15:22:18 +02:00
omar
d016ef1825
Examples: SDL: Removed SDL_HAS_WARP_MOUSE_GLOBAL in the non-viewport branch. ( #1954 ) (+1 squashed commits)
2018-07-19 12:51:20 +02:00
omar
23b67e6ff5
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-17 19:52:14 +02:00
omar
93321d3280
Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. ( #787 )
2018-07-17 19:48:53 +02:00
Rokas Kupstys
7e59eb026b
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. ( #1950 )
2018-07-17 17:17:56 +02:00
omar
7b4fbf4301
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. ( #1542 )
2018-07-17 16:37:10 +02:00
omar
b8b74970d7
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. ( #1542 )
2018-07-17 16:04:47 +02:00
omar
defbf1c4b3
Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. ( #1542 )
2018-07-17 15:56:02 +02:00
omar
16c6734bcb
Viewport: Revert part of 7abf72e, the viewport ownership stealing is problematic. ( #1542 ). Will rework in the context of docking. (+1 squashed commits)
...
+ Fixed unused prototype warning (left-over from a merge)
2018-07-17 15:14:19 +02:00
omar
0c207b7bc9
Demo: Clarified the use of IsItemHovered()/IsItemActive() right after being in the "Active, Focused, Hovered & Focused Tests" section. This will be of more importance with the introduction of tabs.
2018-07-17 11:49:41 +02:00
omar
ee98a069f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
2018-07-16 22:25:36 +02:00
omar
d3be9185b3
Demo: Fixed spacing from b629f90 change.
2018-07-16 22:24:39 +02:00
omar
73e13a0762
Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
2018-07-16 22:17:34 +02:00
omar
abe7b190dc
Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. ( #1944 )
2018-07-13 11:25:54 +02:00
omar
badde9a970
Demo: Spacing.
2018-07-12 11:58:50 +02:00
omar
b30b82835a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2018-07-12 11:48:49 +02:00
omar
b629f90393
Demo: Re-ordered example app code to match their menu order and forward declaration order + added header to delimitate them.
2018-07-12 11:42:33 +02:00
omar
d107146687
Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48 for viewport branch)
2018-07-12 11:19:17 +02:00
omar
5e73e969fb
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
2018-07-12 11:08:24 +02:00
omar
88df66ec83
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
2018-07-12 10:03:18 +02:00
omar
23288547ec
Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939 )
2018-07-12 09:53:10 +02:00
omar
59fb3274a7
Examples: include for intptr_t on tdm-gcc + mingw32 ( #1936 ) + mouse buttons comments
2018-07-11 20:03:47 +02:00
omar
9007dff5eb
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. ( #1940 , #211 )
...
+ shallow changelog tweaks
2018-07-10 19:16:57 +02:00
omar
fff014dfed
Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. ( #1938 , #1900 , #1513 , #1466 , etc.)
2018-07-10 18:29:57 +02:00
omar
b829671df1
Fixed missing value in GetStyleColorName(). ( #1939 ) broken with c7016c2
2018-07-10 16:45:54 +02:00
omar
de13261f1b
OpenGL3: Added error output when shaders fail to compile / link. ( #1938 )
2018-07-10 16:09:34 +02:00
omar
4dfb9ef751
Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.
2018-07-10 11:16:40 +02:00
omar
ce18371d1b
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
2018-07-09 21:49:49 +02:00
omar
dc021f1c23
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
2018-07-09 21:38:37 +02:00
omar
9dea27b273
Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking)
2018-07-09 21:18:41 +02:00
omar
140ece0aeb
Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.
2018-07-09 21:18:10 +02:00
omar
7abf72ec78
Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. ( #1542 )
2018-07-09 21:13:51 +02:00
omar
17f36038e0
Internals: Misc/shallow merge from Docking branch.
2018-07-09 21:10:47 +02:00
omar
574185426c
Internals: Misc/shallow merge from Docking branch.
2018-07-09 21:06:46 +02:00
omar
7033b2043b
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
2018-07-09 20:34:12 +02:00
omar
dd61c4802a
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
2018-07-09 19:22:49 +02:00
omar
c7016c25e8
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
2018-07-09 19:16:48 +02:00
omar
14cef31467
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-09 16:24:01 +02:00
omar
0708f91617
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
2018-07-09 16:20:14 +02:00
omar
6201cad2b4
Examples: Comments, Demo: Log early out, TODO. ( #1553 )
2018-07-09 11:43:53 +02:00
omar
17efd7b3b0
Demo: Added basic Drag and Drop demo. ( #143 , #1931 )
2018-07-08 20:06:49 +02:00
omar
bd6097ac6f
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. ( #143 ) + additional safety checks.
2018-07-08 20:06:49 +02:00
omar
64938178b7
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
2018-07-08 18:23:12 +02:00
omar
a33f0d1f7f
Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. ( #143 )
2018-07-08 16:38:57 +02:00
vby
3a42eb6620
Fix missing ImmReleaseContext in default Win32 IME handler ( #1932 )
2018-07-08 15:24:12 +02:00
omar
b0cdfe0ece
Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. ( #1909 )
2018-07-08 13:27:16 +02:00
omar
6277781e83
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-08 13:08:16 +02:00
omar
c790723cfa
Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). ( #1875 , #143 )
2018-07-08 13:03:39 +02:00
omar
89e2ddf07f
Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx
2018-07-08 11:16:11 +02:00
omar
569e0f07f1
Examples: Removed old example_apple/ + tweak comments ( #1873 )
2018-07-08 10:57:16 +02:00
Omar Cornut
839e4d34bd
Merge branch 'warrenm_osx'
2018-07-08 10:47:55 +02:00
Omar Cornut
c3f9220c15
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
2018-07-08 10:47:31 +02:00
omar
d11d211e5d
Allow popup from ignoring the style.WindowMinSize values so short menus are not padded. ( #1909 ) Wider generalization of b16603745c.
2018-07-06 18:29:39 +02:00
omar
93950b8c32
Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code.
2018-07-06 15:50:07 +02:00
omar
42bf149ac6
Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor io.OptResizeWindowsFromEdges=true to enable the feature globally. ( #1495 ) The feature is not currently enabled by default because it is not satisfying enough.
2018-07-06 15:30:21 +02:00
Warren Moore
d64157e803
Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873 )
2018-07-05 21:58:15 +09:00
omar
0146f4b456
Internals: BeginChildEx tweaks.
2018-07-05 09:17:16 +02:00
omar
7b2662d245
Examples: Comments, bits of documentation
2018-07-04 19:06:28 +02:00
omar
deb7aa29cd
OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. ( #1873 )
2018-07-04 13:24:16 +02:00
omar
0d7e779b37
Merge branch 'master' into osx
...
# Conflicts:
# examples/.gitignore
# examples/README.txt
2018-07-04 13:13:11 +02:00
omar
665bd1e140
Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body.
2018-07-04 10:29:28 +02:00
omar
a765c83bad
Ignore list: added emscripten output
2018-07-03 15:57:34 +02:00
omar
770cba0bd0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
2018-07-02 20:13:16 +02:00
Konstantin Podsvirov
ddb09c6011
Examples: Ignore all *.user files ( #1919 )
...
For example `Qt Creator` create `CMakeLists.txt.user` file with user settings.
2018-07-02 19:43:33 +02:00
omar
645ab6633c
Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. ( #1917 , #1319 , #276 )
2018-07-01 12:25:37 +02:00
omar
c4e34aaace
Examples: Comments to clarify how the keyboard data is indexed.
2018-06-30 14:33:45 +02:00
codecnotsupported
b62cc5c150
Fix include Example_glfw_vulkan cmake ( #1916 )
...
Probably got broken because of the refactor.
2018-06-30 10:53:36 +02:00
omar
6e67afc500
Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. (followup to #1914 )
2018-06-29 16:36:40 +02:00
omar
62b3d7c51e
Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. ( #1913 , #1914 )
2018-06-29 16:36:40 +02:00
Aiekick
ecd9a223e3
add hand cursor support (+11 squashed commit)
2018-06-29 16:36:40 +02:00
omar
004fe8916a
Internals: Settings: Simple optimization caching index into the settings buffer, to remove an unnecessary O(N*M) search during saving. (with N=active root windows during the session, M=stored settings which grows over time)
2018-06-28 18:42:38 +02:00
omar
242d7e0b0b
ImVector: Added index_from_pointer() helper.
2018-06-28 18:37:38 +02:00
omar
b16603745c
Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. ( #1909 )
2018-06-28 11:33:03 +02:00
omar
7adae3299e
Double-click on resize grip doesn't need to test HoveredWindow (as button has the flattenchild flag anyway) + double-click on title bar verify that we don't have overlapping items to allow contents in title bar. + Comments
2018-06-27 17:29:31 +02:00
Omar Cornut
42a919f303
Examples: Apple: Fixed paths of GLFW+GL2 example. ( #1906 ) Update ignore list.
2018-06-27 09:39:52 +02:00
omar
c38fe6b0e1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-06-26 12:41:36 +02:00
omar
79153cf19f
Internals: Various renaming. e.g. NewFrameUpdateHoveredWindowAndCaptureFlags() to UpdateHoveredWindowAndCaptureFlags() + exposed UpdateMovingWindow() in imgui_internal.h.
2018-06-26 12:40:37 +02:00
omar
14ceaaf460
ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.
2018-06-26 12:37:20 +02:00
omar
9d67d18d86
Internals: Moved some of the SliderBehaviorT code into SliderBehavior to reduce the amount of instanciated code.
2018-06-25 14:01:21 +02:00
omar
a1ec7723ef
Examples: OpenGL3: Remove misleading or unnecessary "#version 150" strings.
2018-06-25 09:50:06 +02:00
omar
c1d8dee6c5
Version 1.63 WIP
2018-06-25 09:40:09 +02:00
omar
fb0106fad2
Demo: Fixed incorrect response to Begin() returning false in overlay demo (which cannot happen since we don't have a title bar, but that doesn't make it a good behaving demo!).
2018-06-25 09:32:55 +02:00
omar
20e89201cb
Examples: Fixes.
2018-06-23 09:42:47 +02:00
omar
d3ee3e7ab5
Fixed merge.
2018-06-23 09:39:05 +02:00
omar
00418d13e3
Demo: Fixed mismatched TreePush/TreePop in Property Editor, due to incorrect revert in 826d77185e ( #1895 )
2018-06-22 17:45:03 +02:00
omar
ce500f8727
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
2018-06-22 12:01:42 +02:00
omar
d68633398b
Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.
2018-06-22 10:02:02 +02:00
omar
1b74e3be02
Version 1.62
2018-06-22 09:41:25 +02:00
omar
f9a5ff7a19
Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. ( #301 )
2018-06-21 12:13:04 +02:00
omar
cac4c3f9b8
Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. ( #1888 ) + Comments in imgui.h
2018-06-21 12:04:00 +02:00
omar
528b0b4af6
Examples: SDL+OpenGL2: Fixed Makefile. ( #1886 )
2018-06-20 11:17:33 +02:00
omar
c44a4bed84
Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. ( #1887 )
2018-06-20 11:06:29 +02:00
omar
2ce121b7d0
Readme, Links, Bindings
2018-06-16 10:43:05 +02:00
omar
40845852b9
Fixed warnings + readme
2018-06-16 10:23:11 +02:00
Omar Cornut
a402edb66c
Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. ( #1873 )
2018-06-15 23:01:26 +02:00
omar
9a5f742e63
Fixed merge.
2018-06-15 19:48:51 +02:00
omar
7e6700d261
Viewport: Fix lagging overlay clipping rectangle on viewport owning window (affecting sync of multi-layered docking overlays). This was extremely tricky to find and fix (*). ( #1541 )
...
(*) Merely assigning viewport->Pos = pos in UpdateMovingWindow() broke a series of thing because the code that assign viewports and viewport flags relied on moving window leaving its own viewport the first time to set the NoInputs flag.
2018-06-15 19:40:17 +02:00
omar
c71522adc5
Viewport: Comments. Removed misleading test for !window->ViewportOwned in UpdateSelectWindowViewport(). ( #1541 )
2018-06-15 19:40:00 +02:00
omar
70b0bd13aa
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
# imgui.h
2018-06-14 15:30:15 +02:00
omar
b5d385824d
Added assert in TreePop() to ease catching ID stack underflow earlier.
2018-06-14 15:11:14 +02:00
omar
826d77185e
Revert 640c0566: TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless -> more flexible to keep allowing it by default so it setup an ID scope.
2018-06-14 15:10:46 +02:00
omar
ce0b36ba10
Added _None values to various enum flags, useful for readability and some coding style likes it. (Unfortunately we can't refer to them as default value in imgui.h functions because they need to be declared below).
2018-06-13 23:22:19 +02:00
omar
2a6fbb2197
Speculative fix for Win32 clipboard handler if SetClipboardText() fails + Minor fix for static analyzer + using :: prefix when calling in Win32 functions.
2018-06-13 22:22:52 +02:00
omar
185b4dde87
Examples: Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. Added clipboard support. Unindexing buffers ourselves as Allegro indexed drawing primitives are buggy in the DirectX9 back-end.
2018-06-13 19:22:47 +02:00
omar
087ab2acbf
Examples: Fixed example vcproj names in Viewport branch.
2018-06-13 15:59:21 +02:00
omar
335f6fde7e
Comments + missing changelog bits in 1.52 for SetNextWindowPos, SetNextWindowPosCenter. (obsolete #771 )
2018-06-13 14:06:58 +02:00
omar
d57fc7fb97
Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. ( #820 , #956 , #1875 )
2018-06-13 00:10:33 +02:00
omar
be4b8b5615
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
2018-06-13 00:02:19 +02:00
omar
3569d74f98
Demo: Moved test of the Hovered/Active/Focused functions to the Widgets section.
2018-06-12 18:51:23 +02:00
omar
cd455a4600
Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. ( #820 , #956 , #1875 )
2018-06-12 18:44:33 +02:00
omar
c725710c6d
Comments
2018-06-12 18:25:04 +02:00
omar
24aeca3d0c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
2018-06-12 16:24:24 +02:00
omar
a48815b870
Comments, changelog
2018-06-12 12:12:56 +02:00
Omar Cornut
e54b61aa0f
Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. ( #1873 )
2018-06-11 21:07:14 +02:00
omar
f96c7fac91
Examples: FreeGLUT: Fixed mapping of Space key. ( #801 )
2018-06-11 20:03:35 +02:00
omar
cdf51cad2d
Comments, documentation
2018-06-11 19:52:40 +02:00
omar
a1b6766d43
Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. ( #801 )
2018-06-11 19:27:57 +02:00
omar
bdb3d72d37
Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). ( #1874 )
2018-06-11 17:36:18 +02:00
omar
7acb46bec5
Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible ( #1027 ). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag.
2018-06-11 12:33:51 +02:00
omar
fac0c801da
Examples: Added imgui_impl_osx.mm bindings ( #1870 , #281 )
2018-06-11 10:19:17 +02:00
omar
6f7b7807ad
Fixed Travis path + various paths in comments/documentations
2018-06-10 16:14:43 +02:00
omar
9660657e95
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2018-06-10 15:59:35 +02:00
omar
5a13e4dcde
Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp ( #1870 ) + changelog bits
2018-06-10 15:58:21 +02:00
omar
8d58fbb5ed
Examples: Renamed example folders. ( #1870 )
2018-06-10 15:42:14 +02:00
omar
689ec0bd06
Merge branch 'font_min_max_advance'
2018-06-10 15:07:18 +02:00
omar
13a3a2d0f3
Merge branch 'examples_refactor2' into viewport ( #1870 )
...
# Conflicts:
# examples/README.txt
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl2.cpp
# examples/imgui_impl_sdl2.h
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
2018-06-10 15:04:46 +02:00
omar
ff4f40de41
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-06-08 20:22:07 +02:00
omar
85f9694bd4
Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ( #1870 )
...
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
2018-06-08 19:37:33 +02:00
omar
f5bf9f509c
ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. ( #1869 )
2018-06-08 12:52:46 +02:00
omar
24fc7c30dd
Examples: Documentation
2018-06-08 00:00:12 +02:00
omar
06aa9d8d9a
Examples: Fixed Makefile, batch files.
2018-06-07 22:30:10 +02:00
omar
8c374512fd
Examples, Platform: Removed the call to ImGui::NewFrame() from the platform _NewFrame() function e.g. ImGui_ImplWin32_NewFrame(), ImGui_ImplSDL2_NewFrame(), ImGui_ImplGlfw_NewFrame(), etc. Moved to main.cpp for consistency. ( #1542 )
2018-06-07 22:10:31 +02:00
omar
77d51ebf24
Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.
2018-06-07 19:20:04 +02:00
omar
8e48ab6b19
Nav: Addendum: only set io.WantSetMousePos if necessary. ( #1867 )
2018-06-07 18:08:59 +02:00
omar
e3710448ae
Nav: Removed an unnecessary assertion that could fail when using Mouse and Keyboard simultaneously with the NavEnableSetMousePos flag. ( #1867 )
2018-06-07 18:04:44 +02:00
omar
929529a0db
SliderFloat(): When using keyboard/gamepad and a zero precision format string (e.g. "%.0f"), always step in integer units. ( #1866 )
2018-06-07 13:29:54 +02:00
omar
b3a5b8debd
Popup: Improved handling of (erroneously) repeating calls to OpenPopup() to not fully close/re-open the popup so its child popups won't get closed. ( #1497 , #1533 , #1865 ).
...
Followup/fix the change made in deab2ab015
2018-06-06 19:25:49 +02:00
omar
f63a404df0
Added missing IMGUI_API markers in non-inline section of the IMGUI_DISABLE_OBSOLETE_FUNCTIONS block: old Begin(), InputFloat().
2018-06-06 15:40:40 +02:00
omar
5a288b2d3a
Readme, FAQ tweaks ( #1807 )
2018-06-06 13:02:19 +02:00
omar
d44faa165a
Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. ( #1859 )
...
Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.
2018-06-06 12:35:36 +02:00
omar
2a56105f85
TreeNodeEx(): The helper ImGuiTreeNodeFlags_CollapsingHeader flag now include ImGuiTreeNodeFlags_NoTreePushOnOpen. The flag was already set by CollapsingHeader(). The only difference is if you were using TreeNodeEx() manually with ImGuiTreeNodeFlags_CollapsingHeader and without ImGuiTreeNodeFlags_NoTreePushOnOpen. In which case you can remove the ImGuiTreeNodeFlags_NoTreePushOnOpen flag from your call (ImGuiTreeNodeFlags_CollapsingHeader & ~ImGuiTreeNodeFlags_NoTreePushOnOpen). ( #1864 )
2018-06-06 11:39:29 +02:00
omar
21f553fa55
stb_textedit, InputText(): Fixed Undo after pasting large amount of text (Redo will still fail when undo buffers are exhausted, but text won't be corrupted).
...
See issue 620 in nothings/stb/
2018-06-05 23:29:06 +02:00
omar
67b139ccae
Updated stb_textedit 1.09 + patches --> 1.12 + minor patches. ( #715 )
2018-06-05 23:27:42 +02:00
omar
916528080e
InputTextMultiline(): Fixed double navigation highlight when scrollbar is active. ( #787 )
2018-06-05 16:16:54 +02:00
omar
512ffa37bd
Nav: Fixed clipped scoring when exiting a NavFlattened child back to a parent item (clipping not desirable then). (followup and fix to c665c15). ( #787 )
2018-06-05 16:12:46 +02:00
omar
93b032ea92
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
2018-06-05 15:51:52 +02:00
omar
6d98c0323b
Nav: Added support for PageUp/PageDown (explorer-style: first aim at bottom/top most item, when scroll a page worth of contents). ( #787 )
2018-06-05 15:49:33 +02:00
omar
2bdf0b54a2
Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().
2018-06-05 15:34:22 +02:00
omar
c665c15a7d
Nav: When entering into a NavFlattened child we only consider the visible items for scoring (note that this only work assuming the NavFlattened child window has interactive items). Fixes accidentally hoping into a NavFlattened child. ( #767 )
2018-06-04 18:18:12 +02:00
omar
f4120e20d5
Nav: NavFlattened: Fixed navigation miscrolling parent window when the current window is scrolling enough to keep the item in view. Fix feature added in e11610d6, typically affect large navigation steps (used by PageUp/PageDown). + comments ( #787 )
2018-06-04 18:18:11 +02:00
omar
5a7e98c7cf
Internals: Nav: Removed ParentID from move result (unused, would need to be full-filled for PageUp/PageDown code) + FAQ typo fix.
2018-06-04 15:43:33 +02:00
omar
948009a8b2
Intensive FAQ answer for the million of people asking the same questions over and over again. ( #1848 , #1791 , #1840 , #1493 , #1295 )
2018-05-30 16:31:34 +02:00
Marc J. Schmidt
0903a12c2a
Fixed documentation example ( #1847 )
2018-05-30 10:28:27 +02:00
omar
a2198bcf6b
Made mouse drag distance calculation more robust to invalid mouse position. ( #1845 )
2018-05-29 10:47:18 +02:00
omar
08e20ae465
Internals: Reintroducing LastActiveIdTimer because it is useful and to reduce merge conflicts. ( #1537 )
2018-05-28 21:48:25 +02:00
omar
d4b151076c
Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666fb9. ( #1739 , #143 ).
2018-05-28 21:40:09 +02:00
omar
3218666fb9
Made drag source tooltip display at the same position as a regular tooltip to avoid discontinuity where dynamically swapping tooltip at the target site. Made drag source tooltip override previous tooltip if any. ( #1739 , #143 ).
2018-05-28 21:24:03 +02:00
omar
92b7d6bc4f
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site ( #143 )
2018-05-28 20:57:41 +02:00
omar
7fd9199a1d
Internals: Selectable: Renamed variables. Todo update.
2018-05-28 17:13:40 +02:00
omar
f843facba4
Internals: PushItemFlag() flags are inherited by BeginChild().
2018-05-28 15:30:42 +02:00
omar
0e83d74698
Documentation: FAQ, ID Stack, Fonts ( #1839 , #1840 ), #1842 )
2018-05-27 22:32:46 +02:00
omar
929522febe
Missing examples changelog bits and todo list
2018-05-25 12:51:24 +02:00
omar
03c8a78f04
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
2018-05-25 12:44:56 +02:00
omar
9770c8b21d
Examples: OpenGL3: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. ( #1836 )
2018-05-25 12:09:14 +02:00
omar
251f178a6f
Drag and Drop: Source doesn't report as hovered (at a lower-level). Source disable AllowOverlap flag if any set. ( #143 )
2018-05-24 18:05:50 +02:00
omar
5fd23eeb74
Examples: iOS: Fixed missing call to CreateContext() + various shallow coding style tweaks. ( #1835 )
2018-05-24 17:42:50 +02:00
omar
b88fbd69cc
Drag and Drop: BeginDragDropSource(): Offset tooltip position so it is off the mouse cursor, but also closer to it than regular tooltips, and not clamped by viewport. ( #1739 )
2018-05-23 23:19:01 +02:00
omar
09ea376a6a
BeginCombo(), BeginMainMenuBar(), BeginChildFrame(): restore modified style at end of Begin instead of End so doesn't affect child windows, BeginTooltip() etc.. (allowed since 7b6b7038c5)
2018-05-23 23:05:26 +02:00
omar
002e513b82
Added float GetWindowDpiScale(). ( #1542 , #1676 )
2018-05-23 18:25:37 +02:00
omar
ed84b2aaeb
Viewport, Platform: Fixed a crash if the back-end set the PlatformRequestMove/PlatformRequestSize flags while viewports were disabled (it happened in the SDL back-end, and generally we want to tolerate it to make back-end implementation simpler). ( #1542 )
2018-05-23 18:01:50 +02:00
omar
bef0a13283
Examples: Comments about GLSL version not being the same as GL context version. ( #1828 )
2018-05-21 11:28:30 +02:00
omar
663e2c9237
Examples: GLFW: Made it possible to Shutdown/Init the backend again (by reseting the time storage properly). Changelog. Added to Vulkan example. ( #1827 )
2018-05-21 10:36:50 +02:00
ice1000
e8a72d3e72
Examples: GLFW* Make subsequent window creation possible.
2018-05-21 10:34:17 +02:00
omar
bf56b6b9a5
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. ( #1826 )
2018-05-21 10:13:21 +02:00
omar
1176460e44
Viewport: Fixed using ImGuiConfigFlags_ViewportsNoMerge always showing the Debug window by testing the Active flag as well. ( #1542 )
2018-05-19 20:45:49 +02:00
omar
7c7e96e1aa
ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions
2018-05-18 23:00:48 +02:00
omar
6c684ae39b
Fixed GCC pre-8 build. ( #1822 ) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo
2018-05-17 18:10:20 +02:00
omar
01429e7d16
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
2018-05-17 15:03:56 +02:00
omar
64b1645deb
Disabled GCC 8.1.0 warnings -Wclass-memaccess ( #1822 )
2018-05-17 14:19:20 +02:00
omar
d5c8f404b2
Remove trailing white spaces.
2018-05-17 14:12:37 +02:00
omar
ede5059e69
Internals: Forward declaring and commenting internal structures. Renamed ImGuiDrawContext to ImGuiWindowTempData, but kept .DC member name for backward compatibility purpose
2018-05-17 10:48:15 +02:00
omar
4c35e00f49
Viewport: Made GetWindowViewport() not flag the window as written to.
2018-05-16 22:48:54 +02:00
omar
86f8cdbd98
Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.
2018-05-16 18:03:37 +02:00
omar
7f960616e0
Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. ( #1542 )
2018-05-16 14:34:46 +02:00
omar
1cafdb5b46
Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. ( #1542 )
2018-05-15 11:04:07 +02:00
omar
640c056602
TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.
2018-05-14 23:36:37 +02:00
omar
99ff6fc7e4
Nav: Draft internal api to forward move request with loop/wrap options. Will rework for parallel scoring of two paths (as a generalization of the NavFlattened concept). ( #787 )
2018-05-14 23:07:35 +02:00
omar
e11610d6ff
Nav: To keep the navigated item in view we also attempt to scroll the parent window as well as the current window. ( #787 )
2018-05-14 19:50:48 +02:00
omar
036dce634e
Version 1.62 WIP
2018-05-14 19:19:19 +02:00
Kirill Artemov
721ca97d95
ImVector: Tweaked reserve() flow to avoid calling MemFree(NULL) which is unnecessary. ( #1796 )
2018-05-14 17:52:29 +02:00
omar
19544629be
Examples: OpenGL3: Trying to make the call to glBindSampler optional to make the example code easier to use/share with different context version. ( #1806 )
2018-05-14 17:47:22 +02:00
omar
b0fb340b57
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-05-14 13:15:21 +02:00
omar
78b28d545f
Version 1.61 + todo additions
2018-05-14 12:34:47 +02:00
omar
d7cc4bc317
Demo: Tweaked custom rendering custom, added a Thickness drag. Clarified use of vertical/horizontal line. Add a single pixel demo (wowow)
2018-05-13 23:42:19 +02:00
omar
3f29ed6fd5
ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.
2018-05-13 23:41:43 +02:00
omar
725c13ca68
Fix for atof with glibc.
2018-05-13 22:43:43 +02:00
omar
2a2bb8970d
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
2018-05-13 22:31:29 +02:00
omar
ff033f431b
Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.
2018-05-13 21:04:07 +02:00
omar
f8ca7f45c4
Comments about AddConvexPolyFilled(), PathFillConvex() requiring a clockwise order path. ( #1811 )
2018-05-13 15:55:15 +02:00
omar
e61b224b24
Update README.md
2018-05-12 19:20:54 +02:00
omar
d53bae4c14
Demo: Fixing build due to using INT_MAX, UINT_MAX, LLONG_MAX, ULLONG_MAX.
2018-05-12 18:58:59 +02:00
omar
8adbf081af
Demo: Renamed "fixed overlay" to "simple overlay" because it's not fixed any more!
2018-05-12 18:07:22 +02:00
omar
a7a1b3b0a7
Demo: Added demo for DragScalar(), InputScalar(), SliderScalar(). ( #643 )
2018-05-12 17:53:34 +02:00
omar
7475c1e7dd
Data types: DragScalar: Fixed speed of integer values tweaking with keyboard/gamepad when speed < 1. Enforce min/max bounds when power curves are used. SliderScalar: Fixed integer/slow tweaking. ( #643 )
2018-05-12 17:39:34 +02:00
omar
85f3ba844c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
2018-05-11 22:22:41 +02:00
omar
fc7fc83f9e
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
2018-05-11 19:27:27 +02:00
omar
0dc18a6ca6
Documentation tweaks, comments
2018-05-11 16:54:50 +02:00
omar
8149408408
Merge branch 'data_types'
...
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
2018-05-11 16:48:50 +02:00
omar
090eb437ed
Viewport, Platform: Cleaned up xxx_UpdateMouseCursor() functions to make them more consistent. ( #1542 )
2018-05-11 16:41:43 +02:00
omar
d574604a5d
Viewport, Platform: Win32: Fixed handling of io.WantSetMousePos + added a bunch of comments. GLFW, SDL2: Added handling of io.WantSetMousePos. ( #1542 )
2018-05-11 16:41:03 +02:00
omar
14f575ff76
Scrolling: Fixed a case where using SetScrollHere(1.0f) at the bottom of a window on the same frame the window height has been growing would have the scroll clamped using the previous height. ( #1804 )
2018-05-10 14:31:04 +02:00
omar
6eacddb50f
Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. ( #1542 )
2018-05-10 13:10:04 +02:00
omar
91e39e72a3
Combo: Horizontally offset items using WindowPadding instead of Indent, for consistency.
2018-05-09 23:12:35 +02:00
omar
773d484009
Internals: Made ContentsRegionRect absolute to reduce confusion. Renamed InnerRect to InnerMainRect, renamed WindowRectClipper to OuterRectClipped.
2018-05-09 23:12:34 +02:00
omar
f83f566530
Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.
2018-05-09 21:48:03 +02:00
omar
39f4761ff7
TODO list update + Changelog and comments for #1803 .
2018-05-09 15:48:33 +02:00
Elias Daler
895647a240
Fixed clipboard paste memory leak in SDL examples. ( #1803 )
2018-05-09 15:48:33 +02:00
omar
4cabf599c4
Data types: Fix format srtings with leading blanks. Fix ColorEdit4() to not use obsolete formats (when using IMGUI_DISABLE_OBSOLETE_FUNCTIONS) ( #643 )
2018-05-08 23:41:46 +02:00
omar
ad2927888b
Apply fix from data_types branch, some widgets broken when format string doesn't contains a %. Broken by 92f0165f85. Data_types branch fix c5fb929555.
2018-05-08 20:07:25 +02:00
omar
5f464877ed
Internals: Declaring DragBehavior, SliderBehavior in there (no warantee given) as they may be useful to custom widgets.
2018-05-08 19:52:56 +02:00
omar
8da0d42ef2
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType ( #320 , #643 , #708 , #1011 )
2018-05-08 19:52:55 +02:00
omar
c5fb929555
Data types: Fixed empty format string (or no % specifier) breaking the parsing back of values.
2018-05-08 19:52:55 +02:00
omar
280c05e4f8
Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit.
2018-05-08 11:02:38 +02:00
omar
f13f10e725
Settings: Comments ( #923 , #993 )
2018-05-07 22:37:10 +02:00
omar
4ff23d3306
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
2018-05-07 22:23:58 +02:00
omar
0bf43b3a1b
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. ( #923 , #993 )
2018-05-07 22:18:45 +02:00
omar
023cc25c7c
Internals: Removed unnecessary allocation indirection for g.LogClipboard (this only made sense when there was a global context instance)
2018-05-07 22:15:25 +02:00
omar
35e74c72ab
imgui_freetype: skip missing glyphs as well to match our stb loader ( #1671 , #1703 )
2018-05-07 20:32:17 +02:00
omar
6eda9ed3fb
Skip missing font glyphs V2 revert changes to stb_truetype.h (
2018-05-07 19:57:53 +02:00
omar
787a475650
Skip missing font glyphs to 1) avoid using space for missing glyphs and 2) allow merging fonts with overlapping ranges. Demo: Fixed displaying ? instead of greyed out empty box. ( #1671 , #1703 )
2018-05-07 18:03:00 +02:00
omar
807c4f0ea4
Ran a spell checker for sanity.
2018-05-07 14:44:35 +02:00
omar
4310bad32a
Examples: DirectX9: Comments, updated changelog, notes about usage of imconfig.h ( #1790 , #1687 )
2018-05-07 11:52:48 +02:00
SR_team
d0051ce5cb
add renderstate D3DRS_SHADEMODE for Dx9 impl
...
add backuping transform for Dx9 impl
(#1790 , #1687 )
2018-05-07 11:52:48 +02:00
omar
c7687fc1d6
Viewports: Comments on ImGuiConfigFlags_DpiEnableScaleViewports and ImGuiConfigFlags_DpiEnableScaleFonts. ( #1542 )
2018-05-07 10:44:08 +02:00
omar
3e8087458d
SliderScalar, VSliderScalar(): Support for any data types. Tested with various ranges/limits. Note that Drag/Slider/Input currently fail if the format string doesn't preview the actual value. Will fix next. ( #320 , #643 , #708 , #1011 )
2018-05-04 20:55:51 +02:00
omar
944f414cc6
Internals: A few selected math helpers are now using template to handle all supported types. Added ImPow() to wrap float/double in a standard manner without calling pow(double) when not needed in Drag code.
2018-05-04 18:14:59 +02:00
omar
f4c16fbb99
Internals: Data types: Made format string optional. DragBehavior: Moved a bit of code outside of the template. Slider tidying up. Removed unnecessary call to fabsf().
2018-05-04 17:57:47 +02:00
omar
dcd26f1295
DragFloat, DragInt: Default format string is none is passed to the function. Fixed demo using old style %.0f.
2018-05-04 16:41:48 +02:00
omar
dbe16b6a70
Made IMGUI_DISABLE_OBSOLETE_FUNCTIONS exceptionally not affect the layout of ImGuiIO. ( #1695 )
2018-05-04 14:55:38 +02:00
omar
f47c756755
Internals: Missing const, some renaming. Tweak legacy fast path.
2018-05-03 22:12:55 +02:00
omar
0699ae161f
DragInt, DragScalar: Actually made the fast-past handle the now-most-common case..
2018-05-03 21:49:38 +02:00
omar
7640439747
DragInt: Patch old format strings to replace %f by %d when using the DragInt() entry point. ( #320 , #643 , #708 , #1011 )
2018-05-03 21:35:04 +02:00
omar
17d3c6305e
Ran a spell checker for sanity.
2018-05-03 21:11:53 +02:00
omar
069b284f17
Internals: Tidying up internal helpers. Fixed a case ImParseFormatTrimDecorations() can return an off by one (out of bound) pointer if the format string is invalid. Extracted ImParseFormatFindEnd() out of TrimDecorations so we can use it to find the format type and replace the %f in old Int apis.
2018-05-03 20:22:29 +02:00
omar
086c3925c4
Internals: Fixed DragInt* default format string. InputScalar(), InputScalarN(), removed InputFloatN(), InputInt(). Note that DragInt2/3/4 will %f format strings will currently be broken. ( #320 , #643 , #708 , #1011 )
2018-05-03 19:42:35 +02:00
omar
6c932479f2
Internal: DragScalar(), InputScalar() now support signed/unsigned, 32/64 bits, float/double data types. ( #320 , #643 , #708 , #1011 )
2018-05-03 17:34:38 +02:00
omar
93b8580a8d
Internals: DragFloat: Fixed power handling. Use an temporary accumulator and no absolute values so we will be able to manipulate double as well as 64-bit integers. ( #1011 , #708 , #320 )
2018-05-03 17:34:33 +02:00
omar
3f04fd0644
Internals: DragFloat: Removed DragSpeedScaleFast/DragSpeedScaleSlow since it's not yet usable and Nav version doesn't have an equivalent.
2018-05-03 17:34:29 +02:00
omar
4780ac1ca4
Internals: Data types: Added s64, u64 data types. Added support in InputScalar(). Removed internal.h InputScalarEx() to InputScalar(). Removed cheap-relative-operators support in recently added U32 data path, since this is heading toward being legacy code. + Fixed InputDouble parsing code. ( #1011 , #320 , #708 )
2018-05-03 17:34:22 +02:00
omar
d9fa1f869e
Comments about using "power curves". Demo tweaks. ( #648 )
2018-05-03 17:34:15 +02:00
omar
8a370f6491
SliderFloat: Fixed grab size and steps with %g format. ( #642 , #1301 )
2018-05-03 17:34:09 +02:00
omar
10e3f17235
DragFloat/SliderFloat internal InputScalar trim leading/trailing spaces emitted from the format string when presenting an edit box to the user. ( #648 )
...
Follow up to 6881d065b8
2018-05-03 17:34:02 +02:00
omar
a62f195e83
Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.
2018-05-03 17:33:55 +02:00
omar
ef05141a06
Internals: InputScalarEx: Tweak internals so there is a fast path for the simple case.
...
(in particular because it makes it clear what the extra code is for, so people tempted to create their own InputText data transform/handler understand how little is actually needed)
2018-04-30 20:12:14 +02:00
omar
ed756d474e
Internals: Added ImGuiDataType_Uint32 data type which is usable with InputScalarEx().
2018-04-30 20:02:33 +02:00
omar
7df985bc5c
Nav: Fixed hovering a Selectable() with the mouse so that it update the navigation cursor. Fixed c8b9b2c6 which was incorrect ( #787 )
2018-04-30 19:40:25 +02:00
omar
a1da7f9860
Internals: Tweaked ParseFormatPrecision(), clarified its more limited purpose, allowing 2-digits precisions since it makes (some) sense for doubles. ( #648 )
2018-04-30 16:52:16 +02:00
omar
92f0165f85
DragFloat, SliderFloat: Rounding scalar using the provided format string instead of parsed precision. ( #648 )
2018-04-30 16:44:57 +02:00
omar
6881d065b8
DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. ( #648 )
2018-04-30 15:59:59 +02:00
omar
d7e24416dd
DragFloat/SliderFloat internal InputScalar relies on the user supplied format string to format and parse value. ( #648 )
...
The trailing text after the format will be displayed in the InputText but not affect back parsing. Ideally we can try to strip it later.
2018-04-30 15:21:51 +02:00
omar
429f48bb4f
Clarified usage of ListBoxHeader() before we rename those functions + fixed demo code that didn't honor it correctly. ( #1783 )
2018-04-29 12:20:22 +02:00
omar
f2e9dddeca
DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.
2018-04-28 10:43:15 +02:00
Branimir Karadžić
d317951b37
Demo: Fixed demo from using obsolete functions.
2018-04-28 10:33:48 +02:00
omar
f80314754c
InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. ( #648 )
2018-04-28 00:11:40 +02:00
omar
73445ff248
Renamed all "display_format" arguments to "format" to emphasis that they also affect rounding of values. ( #648 , #642 )
2018-04-27 23:44:27 +02:00
omar
8a38271a7c
SliderFloat, DragFloat: Fix to allow input of scientific notation when Ctrl+Clicking a slider or drag, matching the change done in c19b2781 for InputFloat(). ( #648 , #1011 )
2018-04-27 23:18:28 +02:00
omar
066550de68
DragFloat, DragInt: Cancel mouse tweak when current value is initially past the min/max boundaries and mouse is pushing in the same direction (keyboard/gamepad version already did this).
2018-04-27 19:15:25 +02:00
omar
a84aff1875
Internals: DragBehavior: tweaks internals.
2018-04-27 18:22:10 +02:00
omar
1d99b5f963
Internals: Reordered parameters of DataTypeFormatString() internal helper functions and shallow tweaks.
2018-04-27 18:19:59 +02:00
omar
101f9b42b7
InputText: Fixed returning true when edition is cancelled with Esc and the current buffer matches the initial value.
2018-04-27 17:32:03 +02:00
omar
28edece04f
Comments, minor tweaks
2018-04-27 17:32:03 +02:00
omar
c47d34cf70
Viewport: Exposing SetNextWindowViewport(). Used in demo and old/obsolete SetNextWindowPosCenter() (which is an interesting case). Fixed back-end likely crash calling GetFocus() after viewport destruction. Fixed metrics crash.
2018-04-27 15:13:22 +02:00
omar
cd51f37fc0
Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. ( #1542 )
2018-04-26 16:18:47 +02:00
omar
da70c837da
Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. ( #1542 )
2018-04-26 15:30:19 +02:00
omar
f1ae07e532
Viewport, Platform: Using Platform_GetWindowFocus to provide a much stronger heuristic of platform z-order, in replacement for when the back-end cannot provide io.MouseHoveredViewport. The pressure for it to work well increased with the use of viewports by popups/menus. ( #1542 )
2018-04-26 11:52:38 +02:00
Bruce Mitchener
f8c9c33d33
Fixed static analyzers warnings with bool literals ( #1775 )
...
* Use `false` instead of `0` for a bool literal.
* Simplify calls to RadioButton to not need bool literals.
2018-04-26 09:51:46 +02:00
omar
d9cd494eaf
Viewport: Moved ScaleWindow* code in a proper location. Various comments.
2018-04-25 23:21:26 +02:00
omar
27ac9f4761
Comments ( #1695 )
2018-04-25 22:16:16 +02:00
omar
eb1c36fdfb
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. ( #1695 , #1769 )
2018-04-25 22:07:14 +02:00
omar
5979233a3c
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
2018-04-25 18:23:39 +02:00
omar
0b1d6a0d52
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2018-04-25 18:13:23 +02:00
omar
711a63befc
Misc: Stop moving window if mouse position becomes invalid. Flagged menus are _NoMove for sanity.
2018-04-25 17:58:54 +02:00
omar
d317d90610
Misc: NavCalcPreferredRefPos selects between mouse and nav reference position + added sanity assert (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:54 +02:00
omar
9cbca8c127
Begin: Shuffled some code, _should_ have no side-effect. Clear NextWindowData in one call and more consistently. (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:54 +02:00
omar
e3453d0dc4
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:53 +02:00
Bruce Mitchener
b28535d1da
ImGuiTextBuffer::appendfv needs to va_end the args_copy.
2018-04-25 17:40:39 +02:00
omar
7b433605f9
Viewport: Avoid creating viewport on drag (fix cc882b0723)
2018-04-25 15:38:32 +02:00
omar
3b9b1956cd
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
2018-04-25 15:32:04 +02:00
omar
01fa934222
Internals: Removed unecessary Pos/PosFloat separation, only reason appears to be mostly pre-1.0. The only piece of code that I expected sub-pixel window position to matter actually already round its delta (wrongly so, will fix later/separately if we want).
2018-04-25 15:24:26 +02:00
omar
7a41e0b1ea
Platform: Added platform_io.Platform_SetWindowFocus, Platform_GetWindowFocus function wrappers (unused yet). Exact specs tbd because our simplified concept of focus doesn't necessary match the more complex OS native concepts. ( #1542 )
2018-04-25 15:15:14 +02:00
omar
cc882b0723
Viewport: Tidying up AddUpdateViewport() calls. Moved flags argument. Removed extraneous mid-frame call to FindPlatformMonitorFromRect(). ( #1542 )
2018-04-25 15:14:51 +02:00
omar
6d6580f6be
Viewport: Fixed glitches with newly appearing menus creating viewport while the underlying imgui window should be hidden. ( #1542 )
2018-04-25 11:23:58 +02:00
omar
7684f53328
Viewport: Fixed issues with popups drifting in particular when reference mouse position become invalid (e.g. changing app focus while viewported-menu is open). Storing monitor index in viewport at beginning of the frame. ( #1542 )
2018-04-25 11:23:58 +02:00
Bruce Mitchener
7ebdadf92b
Fix various typos.
2018-04-25 09:40:14 +02:00
omar
e3e4b7bdf5
Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. ( #1542 )
...
Platform: Clarifying some comments in back-ends.
2018-04-24 17:10:27 +02:00
omar
679f4882a5
Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)
2018-04-24 17:10:26 +02:00
omar
46698c96c5
Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)
2018-04-24 16:48:26 +02:00
omar
dc03c93164
Internals: Removed misleading ImRect::FixInverted + fix minor formatting in Readme.
...
Demo: Fixed Overlay: Added a context menu item to enable freely moving the window.
2018-04-24 14:19:10 +02:00
omar
cb78e62df9
Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok. ( #1542 )
...
SDL2 ime support under Win32 never worked properly because of SDL interferences.
2018-04-24 12:40:38 +02:00
omar
376f2aec54
Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the beginning of the list. ( #1542 )
2018-04-23 23:01:37 +02:00
omar
010757266e
Viewports: Todos, Tooltips/menus not automatically forced into their own viewport when the NoMerge flag is set (however the multiplication of viewports makes them more likely to protude and create their own). Win32: try to make primary monitor the first tin the list. ( #1542 )
2018-04-23 23:00:14 +02:00
omar
d268471285
Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.
2018-04-23 18:56:25 +02:00
omar
7b6b7038c5
Window: Relaxed the internal stack size checker to allow Push/Begin/Pop/.../End patterns to be used with PushStyleColor, PushStyleVar, PushFont without causing a false positive assert. ( #1767 )
2018-04-23 17:58:49 +02:00
omar
423577e14e
Viewport, Platforms: SDL: Fixed initial focus click being ignored as a mouse button. GLFW: Fixed mouse cursor support for multi-viewport with GLFW 3.3 (current master) - somehow doesn't appear to work with GLFW 3.2 but I'm not too fussed about it. ( #1542 )
2018-04-23 16:46:25 +02:00
omar
f1c31ebc67
Viewport: Fixed initial popup positioning not using the monitor area properly. ( #1542 )
2018-04-23 12:52:01 +02:00
omar
4433ce4312
Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. ( #1542 )
2018-04-23 12:38:20 +02:00
omar
22773e03a2
InputText: On Mac OS X, support Cmd+Shift+Z for Redo. Cmd+Y is also supported as major apps seems to default to support both. ( #1765 )
2018-04-23 11:15:13 +02:00
omar
e2f831c80e
InputText: tweaks, minor refactoring, renaming + comments ( #1695 )
2018-04-23 11:09:16 +02:00
omar
456bbffcc4
Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. ( #1542 )
2018-04-20 21:36:36 +02:00
omar
037d5a7e98
Columns: Fixed a bug introduced in 1.51 where columns would affect the contents size of their container, often creating feedback loops when ImGuiWindowFlags_AlwaysAutoResize was used. ( #1760 )
2018-04-20 16:03:21 +02:00
omar
49a451d247
Window: Fixed windows using the ImGuiWindowFlags_NoSavedSettings flag from not using the same default position as other windows. ( #1760 )
2018-04-20 15:40:12 +02:00
omar
17a7f352b5
Viewporrt. Examples: DirectX10,11: Make the platform SetWindowSize handler not crash on failure to resize, which could happen (rarely) on invalid data or bug in the code.
2018-04-19 17:23:43 +02:00
omar
f93dce9513
InputText: Tweak to make the if statement more readable + update Changelog ( #1747 )
2018-04-19 16:21:32 +02:00
Mikko Sivulainen
1554d97492
on OSX, ignore text input when CMD key is down
2018-04-19 16:17:57 +02:00
omar
6beafe555c
Update issue template so that removing the carriage return doesn't merge the user's text with the list/bullet item.
2018-04-19 14:47:29 +02:00
omar
637d9c42bf
Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. ( #1542 )
2018-04-19 13:12:02 +02:00
omar
f5700f238d
Documentations for Github users. Metrics: Fixed display of NavRectRel, added display of ParentWindow.
2018-04-19 11:08:20 +02:00
omar
bcac02809f
Examples: Allegro 5: Renamed bindings from imgui_impl_a5.cpp to imgui_impl_allegro5.cpp.
2018-04-18 21:55:12 +02:00
omar
3913297384
Examples: Allegro 5: Added support for 32-bit indices setup via defining ImDrawIdx, to avoid an unecessary conversion (Allegro 5 doesn't support 16-bit indices).
2018-04-18 21:51:14 +02:00
omar
1c385c2ca4
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui_internal.h
2018-04-18 19:06:49 +02:00
omar
6d6f4a85f6
Fixed DisplaySafeAreaPadding not affecting popups/tooltips/menus at it should have (partly broken in 2e5577f44f).
2018-04-18 17:40:38 +02:00
omar
6a0b2627ad
BeginMainMenuBar: Followup to 1e41bad9. Removed public window flag. DisplaySafeAreaPadding defaults to (3,3) instead of (4.4). Comments, tab to spaces, Changelog. ( #1439 )
2018-04-18 17:37:35 +02:00
Doug Binks
1e41bad90f
Added DisplaySafeAreaPadding to MainMenuBar height and fixed starting x position. Fixes main menu bar problems with TVs. ( #1439 )
2018-04-18 15:13:09 +02:00
omar
7241dc61d4
Fixed default proportional item width lagging by one frame on resize + miscellaneous minor tweaks.
2018-04-17 23:36:59 +02:00
omar
25f25d546d
Viewport: Fixed manual mouse resize to handle mouse viewport change, which will allow resizing a window while it changes viewport. Releasing manual resize may merge a window. Added ConvertViewportPosToViewportPos() helper. Renamed NewFrameUpdateMovingWindowDropViewport() to UpdateTryMergeWindowIntoHostViewport() and removed the now-unnecessary half of the function. + renaming ( #1542 )
2018-04-17 23:34:19 +02:00
omar
6ac50634e3
Viewport: Tweaked selection of g.MouseRefViewport, in particular aimed at fixing browsing child-menus while holding mouse buttons with menus in multiple viewports. ( #1542 )
2018-04-17 18:25:05 +02:00
omar
50e453a3e2
Viewport: Comments, tweaks, renaming. Removed unnecessary stuff. Fixed zealous Clang warning. ( #1542 )
2018-04-17 18:25:05 +02:00
omar
4649bf042e
Viewport: Render: Fix draw list build code to allow child windows to be in a different viewports (which will happen with e.g. extruding menus). ( #1542 )
2018-04-16 17:12:00 +02:00
omar
2bd0ee27f0
Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. ( #1542 )
2018-04-16 17:12:00 +02:00
omar
0d16492eb7
Viewport: Moved ImGuiWindowFlags_FullViewport to an internal ViewportOwned flag. Renamed AddViewport to AddUpdateViewport. (#Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. ( #1542 ))
2018-04-16 17:11:59 +02:00
omar
2ae19801a9
Viewport: Remove old code that never worked (testing wrong flag type, always false) + shuffled a few things in Begin() to clarify dependencies. Fixed viewport change on Begin/Begin/End/End patterns. ( #1542 )
2018-04-16 17:11:59 +02:00
daniel-murray
83d97d4a9b
Fix typos KeyDown => KeysDown
2018-04-14 10:28:10 +02:00
omar
d1c16d4ccd
Documentation bits. Misc comments.
2018-04-13 22:23:34 +02:00
omar
950539b768
Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. ( #1542 , #1676 )
2018-04-13 20:26:36 +02:00
omar
f270d6c52c
Viewport: Fix to allow changing/animated window name to be reflected in the OS e.g. task bar, so named documents can appear properly. ( #1542 )
2018-04-13 16:21:34 +02:00
omar
22d6f00110
Viewport: Fixed DPI changing viewport from interfering with moving another window (disabling code) + metrics crash fix on closed viewport window + Windows 10 call to SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) for DPI, with no noticeable improvements. ( #1542 , #1676 )
2018-04-13 11:14:06 +02:00
omar
38e357ef10
Viewport: Virtual mouse position are patched immediately when viewports are moved in the virtual space, avoiding interaction glitchs on a resizing frame. ( #1542 )
2018-04-12 19:57:35 +02:00
omar
0b7f3edc26
Viewport: Debug/metrics tweaks + renaming comments
2018-04-12 19:57:34 +02:00
Guillaume Chereau
58fd8ea303
Fix minor error in doc
...
Not a big deal.
2018-04-12 13:18:26 +02:00
omar
285269ef55
Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. ( #1542 )
2018-04-11 21:27:19 +02:00
omar
e25da4230b
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-04-11 21:25:44 +02:00
omar
8be6f40ae1
Viewport: per-viewport overlay draw list created on demand. With this pattern it'll be easier to consider adding more (e.g. background draw list). ( #545 )
2018-04-11 21:21:52 +02:00
omar
d1d2bbf86a
Internals: Popup: Moved popup/menu/tooltip positioning code (viewport branch needs it organized in a different manner, so we are pushing the bulk of it here to minimize differences).
2018-04-11 17:01:19 +02:00
omar
bfc0efaae9
Internals: Window: Aggregating ImDrawList into the ImGuiWindow structure.
2018-04-11 12:43:38 +02:00
omar
84fe711bdf
Settings: Fixed saving an empty .ini file if CreateContext/DestroyContext are called without a single call to NewFrame(). ( #1741 )
2018-04-11 10:08:23 +02:00
omar
296f03374b
NewFrame: Prevent division by zero in frame rate calculation if io.DeltaTime is continuously zero. ( #1740 , #881 )
2018-04-10 23:48:27 +02:00
omar
83bd3595a4
Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. ( #1542 )
2018-04-10 22:58:39 +02:00
omar
32ee0a3947
Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. ( #1542 )
2018-04-10 22:32:08 +02:00
omar
7ddc22b326
Viewports, DPI: Renamed config flags. ( #1542 )
2018-04-10 20:02:43 +02:00
omar
0d5042f0f3
Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. ( #1542 )
2018-04-10 19:15:44 +02:00
omar
0eaddb4dcd
Viewport: shuffled some code in the UpdateSelectWindowViewport() function.
2018-04-10 18:47:23 +02:00
omar
928a4ad315
Begin: moved tooltip position code in an else block. Misc comments
2018-04-10 16:51:16 +02:00
omar
52cac135c9
Internals: Renamed GetFrontMostModalRootWindow() to GetFrontMostPopupModal() and exposed in imgui_internal.h ( #1738 )
2018-04-10 15:04:36 +02:00
omar
74a11e2087
Viewport: Merge fix conflicting flags.
2018-04-09 22:15:46 +02:00
omar
d4dd448511
Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
2018-04-09 22:01:58 +02:00
omar
9117632bf0
Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
2018-04-09 20:42:49 +02:00
omar
56ad2a2d74
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/vulkan_example/main.cpp
# imgui.h
2018-04-09 19:35:14 +02:00
omar
660c157880
Examples: Added missing calls for ::DestroyWindow, glfwDestroyWindow() + fix old comments.
2018-04-09 19:16:47 +02:00
omar
6f1f5cbc20
Version 1.61 WIP
2018-04-09 14:02:32 +02:00
omar
dd079fe6e6
Version 1.60 (missed the string). Will retag.
2018-04-09 13:52:24 +02:00
omar
54fca1d1b8
Fixed erroneous call to io.Fonts->ClearInputData() + ClearTexData() that was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes 6cee2fca94) ( #1733 , ~#1731) + assert
2018-04-09 13:13:06 +02:00
omar
8acda84202
Nav: Fixed comment. ( #1599 )
2018-04-08 12:27:11 +02:00
omar
3a29ddbcfa
Version 1.60
2018-04-08 00:45:02 +02:00
omar
6d0c720451
Internals: Removed unused internal variant of ArrowButton().
2018-04-07 23:06:06 +02:00
omar
82b7a39f31
Fixed a few zealous warnings.
2018-04-07 10:38:01 +02:00
omar
c712f7275d
Fixed unused variable warning.
2018-04-07 10:25:51 +02:00
omar
f421e73b40
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
2018-04-06 23:36:23 +02:00
omar
c2fc978983
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) ( #707 )
2018-04-06 23:25:25 +02:00
omar
0734a12d25
IO: ImGuiConfigFlags_NoMouse disable hovering so it is not destructive. Amend 2464e62a1a
2018-04-06 23:05:53 +02:00
omar
e88fb10d7c
NewFrame: Extract some code into a NewFrameUpdateHoveredWindowAndCaptureFlags() which can be of use with touch-based inputs systems.
2018-04-06 19:36:15 +02:00
omar
c1bdab6d5b
Comments about io.WantCapture flags + todo entries.
2018-04-06 19:36:14 +02:00
omar
ac2027c415
NewFrame: Extract some code into a NewFrameUpdateMouseInputs function. Moved settings saving higher up in the function so it is next to its peers.
2018-04-06 19:36:14 +02:00
omar
2464e62a1a
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
2018-04-06 19:36:13 +02:00
omar
72b7f48870
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. ( #787 , #1495 , #1202 ) + comments
2018-04-06 18:12:21 +02:00
omar
18a243bef0
Columns: Fixed calling Columns() again with the same number of columns. ( #125 )
2018-04-06 17:50:50 +02:00
omar
72899318e6
Viewport, Platform, Examples: Added support for transparent window via PlatformIO Platform_SetWindowAlpha ( #1542 ) + fixes for GLFW 3.3
2018-04-05 17:07:46 +02:00
omar
84c6ea0cee
Viewport: Comments about honoring ImGuiViewportFlags_NoInputs and MouseHoveredViewport. ( #1542 )
2018-04-05 12:27:17 +02:00
omar
c23b5463c7
Viewport: Moving a window accross viewports tries to preserve the dragging pivot (that is assuming that the window will be evenly scaled by DPI, aka Style is scaled). ( #1542 )
2018-04-05 11:40:33 +02:00
omar
9d8bc79025
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. ( #1542 )
2018-04-05 11:06:00 +02:00
omar
5f4001a811
Contribution guidelines
2018-04-04 20:48:49 +02:00
omar
0cad274b87
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
2018-04-04 19:39:42 +02:00
omar
fc30462f18
Hide new windows for one frame until they calculate their size. Also fixes SetNextWindowPos() given a non-zero pivot. ( #1694 )
2018-04-04 19:35:08 +02:00
omar
5aa3f99b4c
Internal: using more consistent comparaison with HiddenFrames to not imply it could be -1. Tweaked comments.
2018-04-04 17:21:36 +02:00
omar
4649967112
Added extra comments and assertions to avoid user combining ImGuiCond flags. ( #1694 )
2018-04-04 15:01:01 +02:00
omar
cd1e6e384f
Tooltip windows uses PopupBorderSize ( #1697 ) + commented out debug stuff.
2018-04-04 12:39:48 +02:00
Francisco Demartino
2fa113c895
README.md: add link to Gallery Part 6
2018-04-04 00:09:35 +02:00
omar
1e116e6c17
Removed need for -Wnocast-qual on modern Clang/Xcode as a token of good behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik.
2018-04-03 23:18:43 +02:00
omar
84fbc49403
BeginChild: named child don't include the full id inside their name ( #1698 )
2018-04-03 22:13:35 +02:00
omar
78610a54d2
Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.
2018-04-03 20:55:30 +02:00
omar
77e234d9df
Comments
2018-04-03 20:22:44 +02:00
omar
c461401b21
Comments, FAQ
2018-04-03 20:05:59 +02:00
omar
664ab85f76
Examples: Tweak comments. ( #1704 , #1708 ).
2018-04-02 17:31:51 +02:00
omar
ca39070ca0
Examples: Win32: Fixes for MingW which doesn't support a 2007 define? I have no idea why people still use MingW ( #1704 , #1463 )
2018-03-28 23:32:02 +02:00
omar
cc96477b1c
Comments ( #1695 )
2018-03-25 14:45:40 +02:00
omar
cd602b8832
Examples: SDL: Note about SDL breaking the IME under Windows (I can't seem a way SDL2 Windows IME implementation can possibly work, the functions are never called/referenced).
2018-03-23 12:03:57 +01:00
omar
ac8931b2e9
Viewport: Moved OverlayDrawList to be a per-viewport instead of being global + fix overlay clipping glitch during viewport creation frame + support for software mouse cursor stradding over multiple viewport. The overlay draw list move is rather important as draw lists are not shared among viewports anymore and we can do a swap of their data without copying it. ( #1542 )
2018-03-22 22:09:42 +01:00
omar
4f112f898e
Viewport: Avoid modifying MousePos in UpdateWindowViewport just for the sake of docking test, sheering MousePos during the frame is problematic + minor renaming. ( #1542 )
2018-03-22 21:14:55 +01:00
omar
b69dc45f6e
Internals: Removed ImGuiDataType_Float2.
2018-03-22 20:14:31 +01:00
omar
c19b27813d
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. ( #1011 ) May transition the other InputXXX function to use format strings as well.
2018-03-22 18:58:40 +01:00
omar
c796960ff9
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011 )
2018-03-22 17:49:53 +01:00
omar
21ac470a8a
Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.
2018-03-22 16:37:21 +01:00
omar
e5ba982be0
Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.
2018-03-21 22:48:23 +01:00
omar
200754b013
Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. ( #1202 ) [@PhilCK]
2018-03-20 22:42:05 +01:00
omar
94116f1143
Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. ( #1202 ) [@PhilCK]
2018-03-20 22:41:05 +01:00
omar
42ad3c1dd3
Examples: OpenGL2: Added multi-viewport support in the OpenGL2 back-end. ( #1542 ) + Metrics: Fix undisplayed flag.
2018-03-20 22:19:41 +01:00
omar
172570acae
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
2018-03-20 22:14:34 +01:00
omar
75c3793db5
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. ( #787 , #1495 , #1202 )
2018-03-20 21:19:23 +01:00
omar
dcf7c3d188
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. ( #787 , #1542 )
2018-03-20 20:39:44 +01:00
omar
170f44e6f0
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming ( #787 )
2018-03-20 20:12:34 +01:00
omar
fe5347ef94
imconfig: Added IMGUI_STB_TRUETYPE_FILENAME, IMGUI_STB_RECT_PACK_FILENAME + documenting IMGUI_DISABLE_STB_XXX flags and hiding IMGUI_STB_NAMESPACE which is misleading.
...
Fixed typos in todo list.
2018-03-20 18:25:37 +01:00
omar
c29971cf72
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
2018-03-20 16:05:31 +01:00
omar
74b7dce394
Examples: Renamed applications to emphasis on use of GLFW as a platform framework + minor local tweaks
2018-03-20 16:00:59 +01:00
omar
70d500502a
ImVector: Fixed insert() helper using the = operator (followup to be consistent with 4186c2c2b1)
2018-03-20 11:35:10 +01:00
omar
ccc9a22db3
Viewport: Changelog + Internals: Renamed viewport mouse fields for consistency (going to add more). ( #1542 )
2018-03-19 22:59:55 +01:00
omar
d1c45db9e8
Fixed enum typo.
2018-03-19 22:47:10 +01:00
omar
c00523dba4
Viewport: Added extra Metrics and debug features.
2018-03-19 18:07:12 +01:00
omar
9d5ec05150
Viewport, Platform: Update the contents of GetPlatformData() in EndFrame() so back-end can access it even if UpdatePlatformWindows hasn't been called. ( #1542 )
2018-03-19 17:33:21 +01:00
Christian Forfang
4485e56e02
Examples: Vulkan: Fix missing subpass dependency
...
Without a dependency between pWaitDstStageMask (COLOR_ATTACHMENT_OUTPUT)
and the render-pass, the UNDEFINED -> COLOR_ATTACHMENT_OPTIMAL transition
might happen before the image is ready to be used.
2018-03-19 16:48:03 +01:00
omar
a73f6d06e0
Examples: Vulkan: Using VK_PRESENT_MODE_MAILBOX_KHR. Disable IMGUI_UNLIMITED_FRAME_RATE by default. Fixed warnings. ( #1042 )
2018-03-19 16:47:28 +01:00
omar
2fecd332fc
Viewport, Platform: Added void* to render/swap buffer functions. Comments. ( #1542 , #1042 )
2018-03-19 15:20:47 +01:00
omar
166411287f
Demo: Added more complete Combo demo. ( #1658 )
2018-03-19 14:44:37 +01:00
omar
62e94717eb
Nav: InputText: Allow editing text input fields with NavActivate (space). Not sure about that, on one hand it feels more consistent but you can't finish the editing with space to double space (activate + input space) could feel inconsistent. ( #787 )
2018-03-19 13:20:25 +01:00
omar
33ad8b2f0c
Nav: Track nav input source more generally (gamepad vs keyboard) ( #787 ) + update todos and demo tweaks
2018-03-19 13:20:18 +01:00
omar
0e09032750
Viewport, Examples: Renamed types used by examples. ( #1542 )
2018-03-18 22:19:02 +01:00
omar
46b61427e1
Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. ( #1542 , #1042 )
2018-03-18 18:44:57 +01:00
omar
bcf4ed28a9
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.h
2018-03-18 12:51:57 +01:00
omar
d8d93f6360
imgui.h: Various comments and tweaks.
2018-03-18 12:24:28 +01:00
omar
6fe22e6297
imgui.h: Moved columns lower in the file. Various spacing changes and minor comments.
2018-03-18 12:23:33 +01:00
omar
6cfc9e6256
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.h
2018-03-17 21:20:01 +01:00
omar
6bda816ffe
ImVector: Added copy/assign operators as helpers to ease cloning of data.
2018-03-17 21:18:14 +01:00
omar
1e296453ef
ImDrawList: Added Clone() helper function.
2018-03-17 21:18:14 +01:00
omar
4186c2c2b1
ImVector: resize() / push_back() use memcpy() as we are not supposed to be constructor/destructor/operator aware at all. (If we do need to rework ImVector). In turn this will allow us to define assign/copy operators.
2018-03-17 20:42:56 +01:00
omar
d68be086b2
ImVector: Using value_type consistently. Spacing.
2018-03-17 18:08:12 +01:00
omar
533c86a7a3
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
2018-03-17 17:29:58 +01:00
omar
1ab236d9df
Viewport, Platform: Internal renaming to use more consistent (OsDesktopPos > PlatformPos). ( #1542 )
2018-03-15 20:07:48 +01:00
omar
2e1ac0f683
Viewport, Platform: SDL: Makes the CreateViewport function restore current GL context so in theory it is free from side-effect. That said, it seems like there is a bug in SDL because our CreateViewport (currently in Render(), not for long) have affect a jerky side-effect if SDL_GL_MakeCurrent() is called before Render(). ( #1542 )
2018-03-15 19:25:23 +01:00
omar
8364d1ca6c
Viewport: Removed back-end renderer code that implied we need to clear with WindowBg color. Added NoRendererClear flag. ( #1542 , #1042 )
2018-03-15 18:17:04 +01:00
omar
09d8943967
Examples Refactor: GLFW: Explicit functions to init GLFW with OpenGL or Vulkan since we cannot read the api hints from glfw.
2018-03-15 16:42:21 +01:00
omar
6e58a95a01
Viewport, Platform, Examples: Changes to resizing flow + restored support for Platform events affecting the ImGui windows (so Decorated windows are functional). ( #1542 , #1042 ) ..
...
SDL: Added platform move/resize/close support.
GLFW: Added platform move/resize support. Moved Close to use callback for consistency.
Win32:
Vulkan: Fixed resize support.
Naming is WIP "PlatforrmRequestXXX" is too ambiguous. Basically we either have a ImGui->Platform flow or a Platform->ImGui flow. Working a bigger refactor now.
2018-03-15 10:57:22 +01:00
omar
207ad45983
Metrics: Displaying all draw lists of a window (if it uses layer 0 and has already been appended to earlier in the frame).
2018-03-14 17:50:11 +01:00
omar
83ef61fa56
Examples: SDL: Fix for versions olders than 2.0.6
2018-03-14 14:14:16 +01:00
omar
d0e0b106f0
Examples: SDL,GLFW,Vulkan: The Platform<>Renderer link is handled by SDL/GLFW platforms, both can compile without Vulkan headers, SDL+Vulkan is now on part with GLFW+Vulkan (aka broken the same way!). ( #1542 )
2018-03-13 23:16:15 +01:00
omar
98b66a5fc9
Examples: Using draw_data->DisplaySize, followup to c50198debe. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. ( #1542 , #1042 )
2018-03-13 23:07:12 +01:00
omar
921bb92eec
Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. ( #1542 )
2018-03-13 16:20:34 +01:00
omar
c50198debe
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize ( #1542 ) wip
2018-03-13 16:20:27 +01:00
omar
6371474031
Viewport: Removed unnecessary function hoop.
2018-03-13 16:20:19 +01:00
omar
8657201257
Merge branch 'master' into viewport
2018-03-13 16:20:02 +01:00
omar
0e3a6ef4f7
Moved IM_NEW, IM_DELETE helpers to imgui.h for convenient use by back-ends and user code.
2018-03-13 16:18:40 +01:00
omar
7b833dabc8
ImVector: Spacing, assert tweaks
2018-03-13 16:18:40 +01:00
omar
26296bb4c1
Misc: Fix 111ea7af77, GetStyleColorName() would assert, removed removed ImGuiCol defines (too much risk/complexity trying to silently ignore it).
2018-03-13 11:53:12 +01:00
omar
f93a22ae6e
Contributing: tweaks, mention screenshots more prominently.
2018-03-13 11:47:57 +01:00
omar
b88492746e
Examples, Viewport: Vulkan: Experiment (broken) multi-viewport support, merging code from ParticlePeter branches. ( #1542 , #1042 )
2018-03-12 18:43:25 +01:00
omar
f6fc28dfd2
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042 )
2018-03-12 17:50:32 +01:00
omar
cdeef65b05
Examples: Vulkan: Passing Queue, QueueFamily to binding. Fixed scissor (fixed in master). ImGui_ImplVulkanH_DestroyWindowData() waits for device to be idle. ( #1042 )
2018-03-12 17:37:28 +01:00
omar
111ea7af77
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
2018-03-12 17:24:15 +01:00
omar
1e81a53e75
Examples: DPI: Minor warning fix. ( #1676 )
2018-03-12 16:22:24 +01:00
omar
37cb177745
Examples: Vulkan: Only resize swap chain and framebuffer once. ( #1042 )
2018-03-12 14:47:41 +01:00
omar
1c18d65313
Examples: Renamed glfw error callback for clarity.
2018-03-12 14:43:37 +01:00
Peter Particle
b2453d7e8f
Fixed resize window validation errors with removing frame prerender once and present last but one frame functionality. Frame rate is still similar.
2018-03-12 14:34:36 +01:00
omar
887712a6f1
Updated templates, added pull request template.
2018-03-12 14:20:39 +01:00
omar
e7670c0bcc
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. ( #707 )
2018-03-12 11:48:04 +01:00
omar
b9ac127b0b
Internals: Columns renaming fields
2018-03-12 11:03:27 +01:00
omar
5e63711084
Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. ( #1542 , #1676 )
2018-03-12 10:31:39 +01:00
omar
a2fbcc9ad4
Examples: DPI: Portable DPI related helpers in the _Win32 examples. Using one in examples's main.cpp, the GetDpiScale functions are not wired anywhere for now. ( #1542 , #1676 )
2018-03-12 10:31:39 +01:00
omar
10030ff3ec
Viewport: Fix dropping back viewport not being moved to the front of the window list. (Now that viewport are more tighly coupled to a single root window) ( #1542 )
2018-03-12 10:31:38 +01:00
omar
648735a4cf
Viewport, DPI: Don't activate current window until a viewport has been selected. At this point we'll have the proper size/scale for the current DPI + fix viewport callback when appending to an existing window more than once a frame. ( #1542 , #1676 )
2018-03-12 10:31:38 +01:00
omar
a4629b0b36
Viewport, DPI: Select viewport before locking style sizes and before handling double-click-on-title-bar to collapse. ( #1542 , #1676 )
2018-03-12 10:31:38 +01:00
omar
1f6ad7a894
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
2018-03-10 10:33:12 +01:00
omar
64cbbed152
Merge branch 'master' into viewport
2018-03-09 10:41:12 +01:00
omar
43f375b2f2
Viewport,Platform: Added GetWindowDpiScale() platform interface, changes of scale are reflected by positioning and resizing windows in their given viewport. ( #1542 )
2018-03-09 10:40:38 +01:00
omar
351b3fa7b0
Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d
2018-03-09 10:29:41 +01:00
omar
5fdde52444
Merge branch '2018-03-font_offset' into master2
2018-03-09 10:29:22 +01:00
omar
1eb89d7e3b
Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.
2018-03-08 20:32:34 +01:00
omar
4d46383100
Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). ( #1542 )
2018-03-08 20:27:01 +01:00
omar
aa3fe81c87
Examples: DPI: Hacked in a quick compile-and-run-everywhere call to SetProcessDpiAwareness(), will need to revisit.
2018-03-08 18:46:30 +01:00
omar
a3d5f92214
Merge branch 'master' into font_offset
2018-03-08 16:49:39 +01:00
omar
1ef1acbd8d
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
2018-03-08 16:47:41 +01:00
omar
3dfac93ebe
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
2018-03-08 15:58:56 +01:00
omar
642c6748ac
Comments, Changelog
2018-03-08 11:15:27 +01:00
omar
a1f3949d71
Drag and Drop: Increased payload data type to 32 characters. ( #143 )
2018-03-08 10:42:51 +01:00
omar
9ea16e344a
Viewport: Disable extra viewports from hosting other windows. ( #1542 )
2018-03-07 16:34:18 +01:00
omar
d8719cf59b
Fixed warnings.
2018-03-07 14:46:53 +01:00
omar
9dcc07422e
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. ( #1542 )
2018-03-07 12:35:26 +01:00
omar
52c78820aa
Examples: SDL: Fix for pre 2.0.4.
2018-03-07 12:19:19 +01:00
omar
19b92751b9
Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.
2018-03-07 12:05:47 +01:00
omar
f318f2d5ea
Examples: Added Makefile for SDL+OpenGL2 example. ( #1668 )
2018-03-07 11:51:41 +01:00
omar
7fd62baa42
Examples: Added Makefile for SDL+OpenGL2 example. ( #1668 )
2018-03-07 11:50:56 +01:00
omar
21ff03978a
Viewport: Modal display their darkneing/whitening layer over all viewports. ( #1542 )
2018-03-07 11:36:37 +01:00
omar
25fd9d6132
Viewport: Various sanity fixes. Popup always inherit viewport from their parent for now. ( #1542 )
2018-03-07 10:50:30 +01:00
omar
6190d794d4
Update README.md
2018-03-07 10:01:20 +01:00
omar
3637193556
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.h
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
2018-03-06 20:02:40 +01:00
omar
a2ed3ee2cf
Examples: OpenGL3: Added a way to override the glsl version number through the Init call. ( #1667 , #1466 )
2018-03-06 19:48:30 +01:00
omar
cea7492bab
Render: Removed the code that disable render if style.Alpha is 0.0f, it is both incorrect (as style Alpha can be modified mid-frame), not really necessary (just tested that full Alpha = 0 will lead to empty draw lists!) and misleading (bulk of the work was already done).
2018-03-05 22:47:53 +01:00
omar
8e3274e137
Viewport: Tracking current viewport we are appending to + added callback in PlatformInterface for DPI purpose (WIP). ( #1542 )
2018-03-05 22:31:12 +01:00
omar
945f4d1ecd
Removed redundant semi colons. ( #1653 )
2018-03-05 16:16:27 +01:00
omar
51afaf7117
Fixed type cast warning.
2018-03-05 13:15:15 +01:00
omar
0ec356eb6e
Comments, FAQ update.
2018-03-05 13:05:47 +01:00
omar
5ed45d0aec
Columns: Fixed destructive small resize. ( #1656 ). The OffsetNorm clamp introduced by #913 was ok as it didn't write back into the storage, which #1499 started doing making it destructive. Right now I don't think the clamp is needed at all. It had uses (eg: hide the issue fixed by bf7481eba0).
2018-03-04 17:55:59 +01:00
omar
bf7481eba0
Columns: Extent stop at the right-most clipped pixel. The right-most column might appear a little wider but it's usable space matches the others. ( #125 ). +9 Internal: Store InnerClipRect.
2018-03-04 17:44:17 +01:00
omar
968a8d2a3f
Columns: Clamping MaxX above MinX. This shouldn't have much of a benefit / affect, but the internal values are more sane this way. ( #125 )
2018-03-04 16:58:24 +01:00
omar
ee770af72c
Columns: Adding per-window display in Metrics. Tidying up, removing old code/comments. ( #125 , #1499 , #1656 )
2018-03-04 16:56:21 +01:00
omar
c4a158656e
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/directx9_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_vulkan.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
2018-03-03 23:13:31 +01:00
omar
e026c8d3b7
Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. ( #1542 )
2018-03-03 22:53:31 +01:00
omar
cab41d954e
Examples: Vulkan: Further refactor.
2018-03-03 22:38:24 +01:00
omar
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
2018-03-03 20:15:10 +01:00
omar
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
2018-03-03 20:08:03 +01:00
omar
1549c5cf5e
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
2018-03-03 19:43:31 +01:00
omar
ad7ff7504e
Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1
2018-03-03 19:34:47 +01:00
omar
839cdd37a3
Combo: Arrow button isn't displayed over frame color, so color is consistent with other button + the button doesn't have inner rounding.
2018-03-03 19:23:48 +01:00
omar
11f13ab24f
Internal: renamed RenderTriangle() to RenderArrow().
2018-03-03 19:08:22 +01:00
omar
e0cbfd74d7
Examples: Vulkan: Moved CreateOrResizeWindowData func to imgui_impl_vulkan.h
2018-03-02 23:59:21 +01:00
omar
426930e028
Examples: Vulkan: Moved main.cpp data structures to imgui_impl_vulkan.h as shared helpers for the benefit of both the example and the platform/viewport renderer interface.
2018-03-02 23:05:23 +01:00
omar
e9fa17e1bf
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). ( #1542 )
2018-03-02 22:44:06 +01:00
omar
b807347e94
Viewport: When enabled we assert against using RenderDrawListFn to make user more aware of rendering order. ( #1542 )
2018-03-02 22:22:14 +01:00
omar
7113fc7dee
Examples: Vulkan: Moved variables into per-window data, refactored/tweaks to that the bug functions main.cpp for both SDL and GLFW examples match (they'll probably be moved to imgui_impl_vulkan as helpers).
2018-03-02 21:37:14 +01:00
omar
e0f283cfcb
Examples: Vulkan: Fix 7b968b098e
2018-03-02 20:09:21 +01:00
omar
7b968b098e
Examples: Vulkan: Reduced duplicate code by skipping present on the first frame. Amend 201d589714 by @ParticlePeter
2018-03-02 20:01:18 +01:00
omar
e927a6ac4a
Examples: Vulkan: Various tweak. Misc refactor into per-frame data. Duplicate buffer creation code moved to CreateOrResizeBuffer().
2018-03-02 19:40:09 +01:00
omar
9da475e4e8
Examples: GLFW, Vulkan: GLFW binding viewport tweaks to supports Vulkan better (do not call SwapBuffer, share context etc.). Added DUMMY (empty) platform/viewport interface in the viewport code.
2018-03-02 19:24:24 +01:00
omar
5b282bdd48
Examples: Renamed glfw error callback so it's more clear what it is.
2018-03-02 19:24:23 +01:00
omar
fc80f2b41a
Merge branch 'examples_refactor' into viewport
...
# Conflicts:
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.h
2018-03-01 23:27:11 +01:00
omar
68e9ef9885
Examples: Vulkan: SDL: Fixed missing resize handler (not properly merged from #1367 ) + tweaks.
2018-03-01 23:22:02 +01:00
omar
296db2ed33
Examples: Vulkan: Moved code into shared helpers: ImGui_ImplVulkan_SelectSurfaceFormat, ImGui_ImplVulkan_SelectPresentMode.
2018-03-01 23:22:02 +01:00
omar
3171d61dfc
Examples: Vulkan: Various tweaks to name variable more consistently like Vulkan + a few comments + a few imgui style code compaction.
2018-03-01 23:22:01 +01:00
omar
00b9e70ba2
Viewport: Always be lenient with invalid mouse position during dragging, since they are provided by back-end and technically acceptable inputs + comments. ( #1542 )
2018-03-01 20:19:36 +01:00
omar
57e9f61852
Examples: Vulkan: Debug report tweak + always enable in Debug build.
2018-03-01 18:59:07 +01:00
omar
cf365ed00b
Examples: Fixed enabling IMGUI_VULKAN_DEBUG_REPORT which was broken during refactor because of duplicate 'extensions' local variable.
2018-03-01 18:41:19 +01:00
omar
df8a9c49eb
Allow user to override ImTextureId. ( #1641 )
2018-03-01 16:29:32 +01:00
omar
b37ef20c5c
Makefile: updated sdl_opengl3_example with all changes from #885 .
2018-03-01 15:54:12 +01:00
Sam Hocevar
124d8522b1
Do not store compiled objects outside the project tree.
2018-03-01 15:50:39 +01:00
Sam Hocevar
b6f251103b
Define SOURCES instead of OBJS in Makefiles.
...
OBJS is still deduced from SOURCES, but this change gives better control
over where the object files get actually written.
2018-03-01 15:46:43 +01:00
Sam Hocevar
d4f63c3844
Use make variables $@ and $^ where appropriate.
2018-03-01 15:45:34 +01:00
Sam Hocevar
551932697d
Ensure make clean is idempotent.
...
Prior to this, `make clean` would fail if the project was not already
fully built, and a second invokation would always fail.
2018-03-01 15:45:23 +01:00
omar
6797ee4b68
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. ( #787 )
2018-03-01 13:03:12 +01:00
omar
c994796e26
Internal: Moved IM_NEWLINE helper to imgui_internal.h
2018-02-28 21:45:02 +01:00
omar
b3594a6407
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
2018-02-28 21:16:47 +01:00
omar
d98a5d54aa
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
2018-02-28 19:03:39 +01:00
omar
8074d56bdd
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
2018-02-28 18:58:34 +01:00
omar
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
2018-02-28 18:51:40 +01:00
omar
fc3c3de70d
Examples: DX10: Multi viewport/platform support (based on DX11 version). ( #1542 )
2018-02-28 18:35:16 +01:00
omar
997d1bd0eb
Examples: NULL pointers for consistency.
2018-02-27 23:34:28 +01:00
omar
baef79415b
Examples: DX12: Empty skeleton toward implementing the multi-viewport api for DirectX12. (WIP/test API) ( #1542 , #301 )
2018-02-27 23:34:28 +01:00
omar
cb601d79e8
Examples: SDL: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
...
ImGui_ImplSDL2_Init() now takes a SDL GL context.
2018-02-27 23:34:27 +01:00
omar
4cee46f909
Examples: GLFW + OpenGL3: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
2018-02-27 23:27:41 +01:00
omar
25349b31d7
Examples: DX11 + Win32: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
2018-02-27 23:26:51 +01:00
omar
735267d27c
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) ( #1542 )
2018-02-27 23:25:39 +01:00
omar
b5ced477f4
Metrics: Added option to show begin order, useful for debugging.
2018-02-27 23:02:50 +01:00
omar
67319a71e5
Internal: Minor renaming.
2018-02-27 22:58:27 +01:00
omar
184a6f1198
Internals: Moving window: test mouse validity while translating window + using SetWindowPos().
2018-02-27 22:56:22 +01:00
omar
b32bb4e6e3
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
2018-02-27 22:55:18 +01:00
omar
0e62b7d68a
Clearing next window data at the end of Begin() more reliably. Misc comments.
2018-02-27 22:47:45 +01:00
omar
a761779b12
Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis.
2018-02-27 22:32:45 +01:00
omar
29510fcb83
Examples: Misc tweaks/fixes.
2018-02-27 10:29:37 +01:00
omar
3f335b0d42
Merge branch 'master' into examples_refactor
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
2018-02-26 18:22:36 +01:00
Hossam Ayman
a869e944b0
README.md typo fix
2018-02-26 17:43:41 +01:00
omar
c7835dd189
ImRect: Removed misleading IsFinite() function used by some Nav code.
2018-02-26 16:35:46 +01:00
omar
5427eca960
Compacted some old Breaking Changes notes (Pre July 2015 stuff)
2018-02-25 19:05:31 +01:00
omar
bd267ad739
Changelog: Added all change infos since 1.53 up to the current version.
2018-02-25 14:15:38 +01:00
omar
133f06d658
Changelog: Added Changelog with info from 1.48 to 1.53. Haven't added 1.53..current yet.
2018-02-25 14:15:37 +01:00
omar
27667fc035
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. ( #1079 )
2018-02-25 14:15:37 +01:00
omar
403b2d7d59
ImDrawList: Better looking non-AA rectangle (lower-right corner and rounding). ( #1646 )
2018-02-25 14:15:37 +01:00
omar
d7f97922b8
Examples: Fix d749d49903 missing the deletion code. ( #1217 )
2018-02-23 22:46:14 +01:00
omar
d749d49903
Examples: OpenGL3: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context. ( #1217 )
2018-02-23 12:37:49 +01:00
omar
6662fe7b18
stb_truetype: Fixed unused variable warnings for configuration where asserts are disabled. ( #1642 )
2018-02-23 11:07:51 +01:00
omar
ffda84cfae
Examples: DirectX12: Merged to new example format, imgui_impl_dx12.cpp contains the DX12 stuff, couple with imgui_impl_win32.cpp
2018-02-23 10:56:06 +01:00
omar
e6bc840f6f
Merge branch 'master' into examples_refactor
2018-02-23 10:47:32 +01:00
omar
79969931e6
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
2018-02-23 00:01:34 +01:00
omar
288351a801
Examples: DirectX12: Tweaked assertion to more accurately represent what it wants to say. ( #301 )
2018-02-23 00:00:43 +01:00
omar
a1a36e762e
Merge branch 'podgorskiy-master'
2018-02-22 23:24:44 +01:00
omar
8040cf1425
Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master
2018-02-22 23:22:16 +01:00
omar
63be3e7c82
Update README.txt
2018-02-22 23:20:37 +01:00
omar
7e24ce0956
Examples: DirectX12: Fixed shutdown issue. ( #301 )
2018-02-22 23:04:28 +01:00
omar
9be7d048c8
Examples: DirectX12: Merge, various styling tweaks, update for 1.60 wip, synchronized Win32 features with other examples. ( #301 )
2018-02-22 23:03:47 +01:00
omar
913f3692a2
Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon).
2018-02-22 22:38:22 +01:00
omar
0d063585e8
Merge branch 'jdm3_master'
2018-02-22 17:04:15 +01:00
Podgorskiy
94466745bb
A tiny optimization to ImLineClosestPoint. Removed unnecessary sqrtf call.
...
ab_lenSqr -> ab_len_sqr
Moved line where ab_len_sqr is computed after the first return
2018-02-22 10:57:20 -05:00
omar
b28995b667
Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h ( #1640 )
2018-02-22 15:39:49 +01:00
omar
f43068c543
Examples: DirectX10, DirectX11: Simplified main example code.
2018-02-22 13:15:16 +01:00
omar
0b26387a2b
Simplified .gitignore list
2018-02-21 23:14:55 +01:00
omar
493ec0bc98
Simplified .gitignore list
2018-02-21 23:13:53 +01:00
omar
f7ef10e547
Examples: Titles/comments in headers
2018-02-21 23:05:17 +01:00
omar
91cadc1130
Merge branch 'master' into examples_refactor
2018-02-21 22:47:03 +01:00
omar
9b9d9321cf
Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard.
2018-02-21 22:46:49 +01:00
omar
47d1360124
Examples: Using SDL2_DIR instead of SDL_DIR (more standard).
2018-02-21 22:41:46 +01:00
omar
f67699456c
Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367 )
2018-02-21 22:41:04 +01:00
omar
387f724d33
Examples: Vulkan: Formatting and tweaks (to match SDL's main).
2018-02-21 22:39:49 +01:00
omar
2c3c5125b3
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. ( #143 , #1637 )
2018-02-21 21:33:58 +01:00
omar
16ff9faf51
Update issue_template.md
2018-02-21 13:12:13 +01:00
omar
bcdfd5d61c
Merge branch 'master' into examples_refactor
2018-02-20 16:18:02 +01:00
omar
9c20a40b36
Examples: OpenGL: Cast call to glPolygonMode(). ( #1628 ).
2018-02-20 15:49:17 +01:00
omar
201408a119
Update .travis.yml
2018-02-20 15:12:17 +01:00
omar
32bbd8be96
Update .travis.yml
2018-02-20 15:07:34 +01:00
omar
3186acdf8c
Trying to download and build GLFW since APT repository are unreliable
2018-02-20 14:56:43 +01:00
omar
98c2ca557c
Update .travis.yml PPA source for glfw in the end of getting a newer version of GLFW
2018-02-20 14:40:12 +01:00
omar
daddd09cd5
Examples: Mouse cursor handling comments/tweaks to homogenize. ( #1495 )
2018-02-20 14:23:22 +01:00
omar
d534207622
Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
2018-02-20 14:18:02 +01:00
omar
11b12488e8
Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name.
2018-02-20 14:09:46 +01:00
omar
7e2e0535dd
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
2018-02-20 13:55:09 +01:00
omar
7cbcccd96b
Update Breaking Change section with moved misc/fonts/ ( #1631 )
2018-02-20 12:08:37 +01:00
omar
7ee2bc8f5e
FAQ about backslashes in string literal since the one in main.cpp isn't being noticed enough. ( #1397 )
2018-02-20 10:24:31 +01:00
omar
e660d92fa5
Examples: GLFW: Added mouse cursors support ( #1495 )
2018-02-19 22:29:52 +01:00
omar
b33f0e215f
Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization.
2018-02-18 23:28:56 +01:00
omar
9fdf72e42b
Examples: WIn32: Prefixing every Win32 function calls with :: to denote global namespace in a consistent manner.
2018-02-18 21:23:11 +01:00
omar
df9051ded2
Examples: Vulkan: Added support for io.DisplayPos.
2018-02-18 21:15:51 +01:00
omar
230c5ca735
Examples: Vulkan: Fixed GLFW calls.
2018-02-18 21:15:41 +01:00
omar
3bd3693fb7
Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos.
2018-02-18 21:09:28 +01:00
omar
45cbebad64
Added dummy io.DisplayPos field.
2018-02-18 21:04:17 +01:00
omar
6d0f9244b8
Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_
2018-02-18 20:26:20 +01:00
omar
80a8aea7e3
Examples: Added SDL, Vulkan examples to .sln file.
2018-02-18 20:26:20 +01:00
omar
4f0db01f7c
Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9
2018-02-18 20:26:20 +01:00
omar
6cd4e30b58
Examples: DirectX10: Reusing imgui_impl_win32, removed that code from imgui_impl_dx10
2018-02-18 20:26:20 +01:00
omar
19540479d4
Examples: DirectX11: Extracted imgui_impl_dx11.* instead imgui_impl_dx11 and imgui_impl_win32
2018-02-18 20:26:20 +01:00
omar
90dffb5a06
Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files.
2018-02-18 20:26:20 +01:00
omar
ef521d1e0b
Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files.
2018-02-18 20:26:20 +01:00
omar
42c32bf00c
Examples: OpenGL2, OpenGL3: Added glPixelStorei() calls borrowed from SDL examples.
2018-02-18 20:26:20 +01:00
omar
c8a9969511
Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw
2018-02-18 20:26:20 +01:00
omar
b0a8734c92
Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip)
2018-02-18 20:26:19 +01:00
omar
8d0723c2c3
ImFontAtlas: Added IsBuilt() helper.
2018-02-18 20:26:19 +01:00
omar
1399c9c8a9
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
2018-02-18 20:21:21 +01:00
omar
bdb27366e7
Nav: Tweak windowing highlighting for full viewport windows.
2018-02-17 00:19:04 +01:00
omar
f5f3730b16
Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples.
2018-02-16 23:19:38 +01:00
omar
9e713b115f
Examples: Renamed .sln file.
2018-02-16 22:38:19 +01:00
omar
243fd67b1c
Examples: Vulkan: Fix for empty draw data (init time) + fixed warning.
2018-02-16 22:37:46 +01:00
omar
10752423ec
Examples: Vulkan: Added .vcproj files.
2018-02-16 22:37:41 +01:00
omar
31158e575f
Examples: SDL: Fixed minor warning.
2018-02-16 22:37:29 +01:00
omar
00b24f27c2
Examples: SDL: Added .vcproj files.
2018-02-16 22:37:24 +01:00
omar
03a44acf6f
Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. ( #1626 )
2018-02-16 19:55:16 +01:00
omar
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
2018-02-16 19:49:33 +01:00
Oliver Faircliff
ffb6e89f30
Use SDL system cursors in SDL examples. ( #1626 )
...
(Squashed 4 commits)
2018-02-16 19:41:27 +01:00
omar
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
2018-02-16 19:18:16 +01:00
omar
0cefd40888
Examples: Added Changelog to make updates easier.
2018-02-16 17:20:18 +01:00
omar
20c14f9589
Fixed GCC zealous warnings ( #1623 )
2018-02-16 15:43:28 +01:00
omar
1cbfe0700c
Plot: plot a flat line if scale_min==scale_max ( #1621 )
2018-02-16 14:34:49 +01:00
omar
ff5f56dd21
Updated to stb_truetype 1.19 (include minor fix for #1622 )
2018-02-16 11:59:23 +01:00
omar
41ecebff5a
Examples: SDL: Added Changelog at the top of the imgui_impl files. ( #1618 )
2018-02-15 11:11:31 +01:00
omar
c433bbcd8e
ImFont: stb_truetype now rounding Ascent/Descent the same way as freetype does, they seem to vertically align better this way.
2018-02-15 10:47:20 +01:00
omar
30c469f7c5
ImFont: DisplayOffset.y defaults to 0 instead of +1.
2018-02-15 10:46:28 +01:00
omar
6668e80bed
Update README.md
2018-02-15 10:33:22 +01:00
omar
024e23c4d7
Comments, moved ImFontAtlas::Flags to "public" area.
2018-02-14 12:04:21 +01:00
omar
fed0a884f7
ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. ( #1613 )
2018-02-14 11:58:52 +01:00
omar
42bf6a4d03
Update .travis.yml
2018-02-14 11:33:46 +01:00
omar
c0af35098a
Update .travis.yml
2018-02-14 11:29:49 +01:00
omar
06e823e116
Update .travis.yml
2018-02-14 11:26:08 +01:00
omar
26d4d32d67
Travis: testing without adding external apt repositories (which frequently fails), may be unnecessary today
2018-02-14 11:20:22 +01:00
omar
0a0142adab
Update README.md
2018-02-14 11:15:14 +01:00
omar
6bc3e7b043
ImFontAtlas: if stbtt_PackBegin() because of failing allocation we return a little more nicely. (keeps Coverity static analyzer happy!)
2018-02-13 21:57:15 +01:00
omar
df32b60b37
Update README.md
2018-02-13 21:52:27 +01:00
omar
1a381dcaf6
Update README.md
2018-02-13 21:13:23 +01:00
omar
4ec931853e
Demo: Fonts; Added Font Offset.
2018-02-13 21:03:30 +01:00
omar
9263bd68db
Fixed legacy forward function IsRootWindowOrAnyChildHovered() broken by a63fbbca8b
2018-02-13 21:03:30 +01:00
omar
faa3c66154
Update README.md
2018-02-13 20:49:36 +01:00
omar
f33440bbc2
Update README.md
2018-02-13 20:42:01 +01:00
omar
e2aba3cf5f
Update README.md
2018-02-13 20:17:34 +01:00
omar
f44a7115ca
Update README.md
2018-02-13 19:22:34 +01:00
omar
1adeaed000
Update README.md
2018-02-13 19:09:19 +01:00
omar
f0a3dfa0dd
Added sample gif, removed section about performances (unnecessary)
2018-02-13 18:57:42 +01:00
omar
7e603ea469
Update README.md
2018-02-13 18:14:17 +01:00
Branimir Karadžić
fee6022f0c
Fixed warning: variable ‘L1’ set but not used [-Wunused-but-set-variable]
2018-02-13 11:17:55 +01:00
omar
24b1c30644
Update issue_template.md
2018-02-12 22:07:05 +01:00
omar
a265837876
Update issue_template.md
2018-02-12 21:44:22 +01:00
omar
9b4e674688
Update issue_template.md
2018-02-12 17:19:24 +01:00
omar
4a8871f4f9
Create issue_template.md
2018-02-12 17:17:29 +01:00
omar
ace22168e0
Contributing guidelines for issues
2018-02-12 17:11:14 +01:00
omar
242bf9d9e2
Create issue_template.md
2018-02-12 17:06:04 +01:00
omar
eb1d481915
Comments ( #1230 , #1611 )
2018-02-12 15:38:04 +01:00
omar
d8d1da27fd
Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master
2018-02-12 15:35:16 +01:00
omar
ed9d4a2d85
stb_rect_pack: update to 0.11 (minor changes)
2018-02-12 15:30:37 +01:00
Randy Gaul
2c4a761982
__cdecl markup for non-standard calling conventions via MSVC
2018-02-12 00:50:40 -08:00
omar
64e0666803
Internals: Moved some of NewFrame() into UpdateMovingWindow().
2018-02-11 22:48:30 +01:00
omar
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
2018-02-10 16:50:19 +01:00
omar
febde0eb21
Update README.md
2018-02-10 15:44:46 +01:00
omar
5641115568
Update README.md
2018-02-09 12:08:53 +01:00
omar
f38979b266
Update README.md
2018-02-09 11:57:23 +01:00
omar
3b163ac35b
Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.)
2018-02-08 23:11:51 +01:00
omar
88dcbeb7ff
Styles: Comments and re-ordered.
2018-02-08 21:14:57 +01:00
omar
8099f8c270
Comments
2018-02-06 23:19:53 +01:00
omar
35804b4438
Update README.md
2018-02-06 21:05:49 +01:00
omar
1d5a5ca12e
README update, updated binaries, sponsors
2018-02-06 21:04:12 +01:00
omar
2493f609ef
Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that)
2018-02-06 20:57:33 +01:00
omar
d17d21da1b
Warning fix. ( #1565 )
2018-02-06 20:21:29 +01:00
omar
7c16d52f72
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch ( #1565 , #787 )
2018-02-06 20:20:34 +01:00
omar
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
2018-02-06 20:16:03 +01:00
omar
07ee539017
Merge branch 'navigation'
2018-02-06 20:13:55 +01:00
omar
4e5b7612ae
Nav: Documentation tweaks. ( #787 )
2018-02-06 20:10:05 +01:00
omar
ae30efc0fd
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. ( #787 )
2018-02-06 19:58:23 +01:00
omar
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
2018-02-06 19:54:30 +01:00
omar
9e3a807813
Removed comments
2018-02-06 19:34:09 +01:00
omar
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
2018-02-06 19:29:31 +01:00
omar
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
2018-02-06 19:23:12 +01:00
omar
ed4bbc4fd4
Nav: Comments, guides.
2018-02-06 18:48:31 +01:00
omar
cea8017e0b
Merge branch 'master' into context
2018-02-06 18:04:44 +01:00
omar
3b7bd4563a
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
2018-02-06 16:35:32 +01:00
omar
ad09396672
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
2018-02-06 16:32:51 +01:00
omar
db071184a0
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-02-06 13:51:09 +01:00
omar
b50dce54ea
Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. ( #1597 , #143 )
2018-02-06 13:46:14 +01:00
omar
c6ba7c8231
Internals: TreeNode: Renaming local to be more consistent with other widgets.
2018-02-06 13:41:46 +01:00
omar
e6926d9f7c
Internals: Refactored bool LastItemRectHovered into flags. ( #1597 )
2018-02-06 13:34:41 +01:00
omar
ce2b8d3255
Nav: Comments, removed extraneous parameter.
2018-02-06 13:16:44 +01:00
omar
0c0d811859
Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. ( #787 )
2018-02-05 23:53:40 +01:00
omar
4b49f03a40
Examples: SDL+GL3: Added Navigation keyboard mapping. ( #787 )
2018-02-05 23:16:40 +01:00
omar
7e1496e994
Merge branch 'master' into navigation
2018-02-05 23:14:42 +01:00
omar
fcf1c9d151
Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. ( #996 )
2018-02-05 23:13:53 +01:00
omar
60fb7d31fd
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
2018-02-05 22:35:29 +01:00
omar
73d493c780
Examples: Organized header files to make available features more visible.
2018-02-05 20:34:11 +01:00
omar
fb9fecea5e
Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. ( #787 )
2018-02-05 20:16:38 +01:00
omar
4932303e62
Nav: DragBehavior: Tweaks (to take the noise out of the next commit).
2018-02-05 20:15:31 +01:00
omar
e5e3cc617e
Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.
2018-02-05 19:37:29 +01:00
omar
fb7cf4a475
Nav: Removed old unnecessary ifdefs.
2018-02-05 18:25:03 +01:00
omar
f35734c925
Nav: Debugging code. ( #787 )
2018-02-05 17:02:30 +01:00
omar
92ee6b1185
Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. ( #787 )
2018-02-05 16:07:54 +01:00
omar
348c46d21e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-05 15:50:28 +01:00
omar
5c83b55d04
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. ( #787 )
2018-02-05 15:49:35 +01:00
omar
11d0fc8220
Tooltip: BeginTooltip() sets NoInputs flag.
2018-02-05 15:10:07 +01:00
omar
1dedbf8091
Style: Fixed missing style.MouseCursorScale initialization ( #939 ), messed up original commit badly.
2018-02-05 15:07:25 +01:00
omar
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-05 14:55:57 +01:00
omar
8ad88f725c
Nav: Minor tidying up. ( #787 )
2018-02-05 14:53:22 +01:00
omar
3f297e74e4
Merging the minor/shallow changes from Navigation branch.
2018-02-05 14:52:28 +01:00
omar
bed55a41e1
Internals: ImRect: Added IsInverted() helper.
2018-02-05 14:51:28 +01:00
omar
2081fc15b5
Added assert in BeginChild(ImGuiId id).
2018-02-05 13:42:34 +01:00
omar
223be68d77
Nav: Debugging stuff.
2018-02-05 13:42:33 +01:00
omar
cf6b39600b
imgui_freetype: comments about correct blending and sRGB ( #618 , #578 )
2018-02-05 11:22:09 +01:00
omar
a33b86dac7
Removed root .gitignore. ( #1594 )
2018-02-05 09:14:33 +01:00
omar
b76cf9cc87
Merge pull request #1594 from gerryhernandez/fix-apple-example
...
Examples: Apple: Fix iOS code; fixes entire XCode build for Apple example
2018-02-05 09:12:51 +01:00
Gerry Hernandez
4786321754
Fix iOS code; fixes entire XCode build for Apple example
2018-02-04 21:47:08 -05:00
omar
66ff820eaa
Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. ( #787 )
2018-02-04 18:30:46 +01:00
omar
e2654a097b
ImRect: added IsInverted() helper.
2018-02-04 18:30:37 +01:00
omar
0bd15b52a6
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-04 13:16:13 +01:00
omar
7b005bd7de
imgui_freetype: Documentation, tweaks. ( #618 )
2018-02-04 13:13:06 +01:00
omar
e9a617b22a
Moved imgui_freetype from imgui_club ( #618 )
2018-02-04 12:35:17 +01:00
omar
147ec8d1e2
Style Added style.MouseCursorScale, may remove ( #939 ).
2018-02-04 12:17:35 +01:00
omar
648de2fc00
Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. ( #787 , #1079 )
2018-02-02 18:38:18 +01:00
omar
ce9d7baaba
Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. ( #787 , #1079 )
2018-02-02 17:47:05 +01:00
omar
9120938200
Nav: Revert 5c9ea4d53a with comments. ( #787 )
2018-02-01 23:53:00 +01:00
omar
6a83a9152f
Natvis: Showing some flags for ImGuiWindow.
2018-02-01 23:39:23 +01:00
omar
96ddfbc973
Nav: Modal windows can't be closed with Nav PadCancel. ( #787 )
2018-02-01 23:36:22 +01:00
omar
efbd8cebe7
Nav: Comments ( #787 )
2018-02-01 22:53:08 +01:00
omar
c4fc879508
CloseButton: Fixed cross positioning.
2018-02-01 22:33:48 +01:00
omar
942c140710
CloseButton: Fixed cross positioning.
2018-02-01 22:32:52 +01:00
omar
68d3e139a7
Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. ( #787 )
2018-02-01 22:28:58 +01:00
omar
950f260a32
Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. ( #787 )
2018-02-01 22:25:25 +01:00
omar
c7b7b181b5
Nav: CloseButton reacts when clipped. ( #787 )
2018-02-01 22:13:25 +01:00
omar
5c9ea4d53a
Nav: Fixed press Left on sub-menu when parent wasn't a menu - we were just checking at the wrong level. ( #787 )
2018-02-01 21:33:23 +01:00
omar
eb737e0a42
Nav: Child window is restored on focus follow up. Fix bdd868704f. ( #787 , ~#727) One visible issue was pressing Left to leave a child menu.
2018-02-01 21:27:46 +01:00
omar
95f9c74b9a
Metrics: Displaying some of the important internal window flags.
2018-02-01 21:27:45 +01:00
omar
79ff3c2d49
Merge branch 'master' into navigation
2018-02-01 18:33:40 +01:00
omar
07163804df
Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h
2018-02-01 18:31:41 +01:00
omar
5812d0b751
Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. ( #787 )
2018-02-01 18:29:30 +01:00
omar
fd6d8863f7
Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). ( #787 )
2018-02-01 18:19:36 +01:00
omar
ef2c3bcdee
Nav: Fixed InitRequest leaking when changing window (repro was to navigate inside File->Options->[Child] then press Left and notice how we would land on parent window on the fist item after the current one). ( #787 )
2018-02-01 18:02:55 +01:00
omar
8cc2dbc3bd
Internals: Nav: Extracted code into IsWindowNavFocusable(). ( #787 )
2018-02-01 14:56:56 +01:00
omar
bdd868704f
Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. ( #787 , vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows.
2018-02-01 00:50:42 +01:00
omar
7b22a91578
Nav / Slider: Fixed reaching edge of integer slider with navigation input, bug introduced on January 25 in Nav branch 10a4a77b27. ( #787 )
2018-02-01 00:08:13 +01:00
omar
eaa6f490a2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2018-01-31 23:38:05 +01:00
omar
9bc5c089b6
Internal: Avoid needlessly bringing parent of front-most child back to front. This is mostly to reduce flicker/confusion in Metrics when traversing windows. We could aim at separating the child windows from non-child windows at some point.
2018-01-31 23:37:05 +01:00
omar
dbdbf01b9f
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
2018-01-31 23:35:54 +01:00
omar
76d8af4036
Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. ( #787 )
2018-01-31 21:25:52 +01:00
omar
aa2dda7610
Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue.
2018-01-31 21:06:47 +01:00
omar
38d45ee73f
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
2018-01-31 19:13:20 +01:00
omar
e6c0b212e8
Nav: Fixed initial movement (which sends an InitRequest) from clearing NavDisableHighlight and fully enabling Nav feedbacks. ( #787 )
...
NB: Setting g.NavInitResultExplicit = false on InitRequest match was added in initial commit c2cb2a6928
2018-01-31 18:53:15 +01:00
omar
9c8fb804ed
Log: Comments and extraneous assets to clarify intent. ( #1584 )
2018-01-31 17:41:26 +01:00
omar
27980d9688
Merge branch 'master' into context
2018-01-31 16:02:26 +01:00
omar
47e81a6194
Merge branch 'master' into navigation
2018-01-31 16:00:25 +01:00
omar
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
2018-01-31 16:00:07 +01:00
omar
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-31 15:43:19 +01:00
omar
dd41a1650a
Comments
2018-01-31 15:41:48 +01:00
omar
6c38aa2dc7
Examples: Apple: Tweak code and sync with other examples better (untested).
2018-01-31 00:16:44 +01:00
omar
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
2018-01-31 00:15:47 +01:00
omar
596b6d6de2
Style: Enable window border by default. ( #707 )
2018-01-31 00:03:11 +01:00
omar
955d86199f
Examples: Tweaks formatting.
2018-01-30 23:55:23 +01:00
omar
bebe03db05
Metrics: Minor formatting tweaks
2018-01-30 21:17:27 +01:00
omar
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
2018-01-30 20:07:12 +01:00
omar
22f7de0fbd
Nav: Updated TODO list.
2018-01-30 19:20:20 +01:00
omar
9fc6f5907b
Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. ( #787 )
2018-01-30 18:34:32 +01:00
omar
1ed7bce3ed
Nav: Removed old unused code. ( #787 )
2018-01-30 18:34:17 +01:00
omar
a8763d14c5
Internals: Renaming.
2018-01-30 15:08:53 +01:00
omar
38197a236d
Internals: Renaming.
2018-01-30 15:07:20 +01:00
omar
a7ad5134e5
Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. ( #787 )
2018-01-30 15:05:46 +01:00
omar
acf21ee429
Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. ( #787 )
2018-01-30 15:05:32 +01:00
omar
bed6ef03f5
Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. ( #787 )
2018-01-29 23:59:47 +01:00
omar
c851b33352
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ( #787 )
2018-01-29 23:59:46 +01:00
omar
b40dc5c4f2
Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. ( #787 )
2018-01-29 23:59:43 +01:00
omar
020b153d35
Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. ( #787 )
2018-01-29 23:59:43 +01:00
omar
c8d8dc7f0a
Nav: Internals: Renamed RootNavWindow to NavRootWindow ( #787 )
2018-01-29 23:59:43 +01:00
omar
72485a5d04
Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. ( #787 ) (+1 squashed commits)
...
+ store window inside result.
2018-01-29 23:59:42 +01:00
omar
1cf38d0334
Internals: Nav: Renamed ImGuiNavForward enum ( #787 )
2018-01-29 18:12:32 +01:00
omar
2933e6765c
Merge branch 'master' into navigation
2018-01-29 17:42:39 +01:00
omar
4654040bcb
Nav: Comments, added enum to clarify NavForward code. ( #787 )
2018-01-29 17:35:36 +01:00
omar
c8b9b2c6bd
Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. ( #787 )
2018-01-29 15:46:41 +01:00
omar
21771adb94
Nav: Debug overlay uses default font. ( #787 )
2018-01-29 15:35:51 +01:00
omar
6a25a8720a
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
2018-01-29 14:38:46 +01:00
omar
91d77be36e
Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)
2018-01-29 00:55:16 +01:00
Omar Cornut
3cdd2096ec
Examples: Use Clang in old Makefile.
2018-01-29 00:48:21 +01:00
omar
ddff378daf
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
2018-01-29 00:38:00 +01:00
Omar Cornut
858d75ab59
Examples: Apple: Fixed filenames in OSX xcode project.
2018-01-28 23:24:57 +01:00
omar
66d5712a8a
Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long)
2018-01-28 20:03:41 +01:00
omar
94090eb08f
Added IMGUI_USER_CONFIG to define a custom configuration filename. ( #255 , #1573 , #1144 , #41 )
2018-01-28 17:47:28 +01:00
omar
3571ab8b88
imconfig.h comments
2018-01-28 17:40:48 +01:00
omar
578016d08b
ImVector comment ( #1577 )
2018-01-27 17:26:59 +01:00
omar
3ded262776
Merge branch 'master' into navigation
2018-01-26 16:07:43 +01:00
omar
2d9d7a10ca
Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. ( #1574 ) Looks like a bug introduced in c36e586cce.
2018-01-26 11:43:43 +01:00
omar
1f3b66b10a
Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 ( #246 ) tho at the time it is possible that SizeContents wasn't calculated as evenly.
...
Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();
2018-01-26 11:43:31 +01:00
omar
10a4a77b27
Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. ( #787 )
2018-01-25 20:39:34 +01:00
omar
04d5783ffd
Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. ( #787 )
2018-01-25 19:36:38 +01:00
omar
d088bd86ad
Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. ( #787 )
2018-01-25 19:25:30 +01:00
omar
486f0a8ba0
Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency)
2018-01-25 19:07:35 +01:00
omar
f2d5300408
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ( #787 )
2018-01-25 19:03:47 +01:00
omar
ed088b00be
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). ( #787 , #707 )
2018-01-25 18:50:30 +01:00
omar
827f4b17d3
Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). ( #787 )
2018-01-25 16:18:57 +01:00
omar
e9070e768e
Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. ( #787 )
2018-01-25 16:17:36 +01:00
omar
3967ff58b2
Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). ( #787 )
2018-01-25 16:02:33 +01:00
omar
5d31e1696f
Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. ( #1363 )
2018-01-25 15:37:24 +01:00
omar
8bf0c89c0d
Internals: ImRect::Contains(ImRect&) include boundaries (whereas Contains(ImVec2) should not).
2018-01-25 14:24:57 +01:00
omar
194850db31
Merge pull request #1572 from rainbru/build-examples-fix
...
Fix building instruction in a couple of README
2018-01-25 13:58:27 +01:00
Jérôme Pasquier
94ed44b5cb
Fix allegro5_example build instructions
2018-01-25 13:33:35 +01:00
Jérôme Pasquier
c226e02ca0
Fix sdl_opengl2_example filename in README.md's build instructions
2018-01-25 13:27:57 +01:00
omar
2c7324da56
TODO list, added uSynergy README
2018-01-25 12:38:15 +01:00
omar
5f7f27c8de
Nav: Comments. ( #787 )
2018-01-24 20:07:35 +01:00
omar
d404b93b6b
Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. ( #787 ) + comments
2018-01-24 19:57:39 +01:00
omar
89b0ca1f8f
Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. ( #787 )
2018-01-24 19:55:56 +01:00
omar
c8def61f5c
Merge branch 'master' into navigation
2018-01-24 19:36:48 +01:00
omar
f3776055d6
Merge branch 'master' into context
2018-01-24 19:31:11 +01:00
omar
8c57d8cc1e
Natvis: Fix ImRect expanded height display being broken and dumb. ( #1569 )
2018-01-24 19:10:09 +01:00
omar
6f27d6b5b8
Natvis: Made ImGuiWindow display shorter.
2018-01-24 18:52:26 +01:00
omar
c2e92ab61b
Added imgui.natvis helper for visual studio users. Added to examples projects.
2018-01-24 18:40:54 +01:00
omar
277f6e7842
Examples: Comments
2018-01-24 18:40:23 +01:00
omar
6f366fff6b
Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. ( #787 )
2018-01-24 17:41:47 +01:00
omar
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
2018-01-24 17:41:47 +01:00
omar
28671aa821
Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. ( #787 )
2018-01-24 17:41:47 +01:00
omar
8227176c17
Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). ( #787 )
2018-01-24 17:41:47 +01:00
omar
c09016b12a
Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. ( #787 )
2018-01-24 17:41:47 +01:00
omar
bd278e958e
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. ( #787 )
2018-01-24 17:41:47 +01:00
ocornut
680162eb32
Merge branch 'master' into navigation
2018-01-24 17:41:14 +01:00
omar
5148937d4d
Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. ( #1567 , #1568 )
2018-01-24 17:39:21 +01:00
omar
37ee99983f
Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd ( #1567 )
2018-01-24 15:09:02 +01:00
omar
823e1f0b94
Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments ( #787 )
2018-01-24 10:43:57 +01:00
omar
64b786c2aa
Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) ( #787 )
...
Note that this bit include badly hardcoded sizes, expecting an improvement later.
2018-01-24 10:31:54 +01:00
omar
cea78cc576
Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. ( #787 )
2018-01-24 10:24:41 +01:00
omar
eb7ec781dc
Nav: Tweak GetNavInputAmount(). Split debug defines.
2018-01-23 21:56:15 +01:00
omar
f6ee8d30fb
Comments ( #1567 )
2018-01-23 19:21:17 +01:00
omar
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2018-01-23 19:16:43 +01:00
omar
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
2018-01-23 19:13:49 +01:00
omar
2645ab5f7f
Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084
2018-01-23 17:25:59 +01:00
omar
13c407591e
Nav: Comments, tweaks
2018-01-23 16:45:46 +01:00
omar
db2ba13154
Internals: Exposed SetCurrentFont() in imgui_internal.h
2018-01-23 16:33:06 +01:00
omar
9076366c17
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ( #1181 )
2018-01-23 09:57:49 +01:00
omar
1acb155419
Internals: Moved unnecessary MovingWindowMoveId field.
2018-01-22 14:31:20 +01:00
omar
5097368bd5
Tweaked FAQ.
2018-01-22 12:01:24 +01:00
omar
2026e792cd
Context: NewFrame() asserts ( #1565 )
2018-01-21 21:12:52 +01:00
omar
dd89c9ea59
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. ( #1565 )
2018-01-21 20:58:50 +01:00
omar
9edf211c0e
Merge branch 'master' into navigation
2018-01-21 20:46:50 +01:00
omar
3ed2ddbfbe
Metrics: Removed context size display.
2018-01-21 20:32:05 +01:00
omar
d3e826c247
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:55 +01:00
omar
5e2aa6185c
Reorganized context handling to be more explicit,
...
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
7e4d28a49d
Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
e45d7a7060
Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
5a301c29dc
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
ac5b7a1bdf
Comments
2018-01-21 20:10:23 +01:00
omar
8b64d50cc4
Merge pull request #1564 from PanosK92/master
...
Simplified return of ImGui::IsKeyReleased().
2018-01-21 17:20:44 +01:00
Panos Karabelas
7c8a19978d
Simplified return of ImGui::IsKeyReleased()
2018-01-21 16:02:09 +00:00
omar
5eb293c879
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
2018-01-20 20:32:23 +01:00
omar
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ( #939 )
2018-01-20 20:25:12 +01:00
omar
7e7c017b75
Examples: Simplified mouse wheel handling. ( #1463 )
2018-01-20 12:45:31 +01:00
omar
7dea158175
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. ( #1463 )
2018-01-20 12:36:59 +01:00
omar
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
2018-01-20 12:36:16 +01:00
omar
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
2018-01-20 12:06:06 +01:00
omar
d4bf9b4686
Renaming for consistency.
2018-01-19 15:47:10 +01:00
omar
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-19 15:42:28 +01:00
omar
e5a6e85f6d
Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. ( #1345 )
2018-01-19 15:37:25 +01:00
omar
42a612d7c9
Begin: Removed asserts that got in the way of some flags combination. ( #1345 )
2018-01-19 15:33:35 +01:00
omar
0978f00911
MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now.
2018-01-19 15:14:53 +01:00
omar
f3e510a9bf
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. ( #1559 )
...
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
2018-01-19 10:46:54 +01:00
omar
00351ee2ab
Examples: SDL: Minor renaming.
2018-01-19 09:55:49 +01:00
omar
ba99900023
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
2018-01-19 09:50:58 +01:00
omar
79dca9d5e6
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
2018-01-19 09:50:58 +01:00
omar
15fd5b6c4c
Examples: SDL: Minor renaming.
2018-01-19 09:43:28 +01:00
omar
ce17e0f274
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. ( #1559 )
2018-01-19 09:25:31 +01:00
omar
74dc70c543
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. ( #1559 )
2018-01-19 09:16:26 +01:00
omar
c2ffce3e5a
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. ( #143 )
2018-01-18 17:39:40 +01:00
omar
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.( #143 )
2018-01-18 17:32:34 +01:00
omar
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. ( #1555 ) + comments.
2018-01-18 10:06:58 +01:00
omar
60d5dc7902
Examples: SDL: Fixed mapping of Insert key ( #1555 , fix bug introduced in #1541 )
2018-01-18 10:01:36 +01:00
omar
d1f726cd9d
Comments about Begin/End pair and handling of return value.
2018-01-17 12:46:07 +01:00
omar
cc15512bfc
InputText: Minor tweak.
2018-01-17 12:15:24 +01:00
omar
7ccbb765e2
InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. ( #1418 , #1554 )
2018-01-17 12:15:00 +01:00
omar
2f15cc0855
Nav: Fixed popup wrap-around logic for windows with scrolling. ( #787 )
2018-01-15 21:55:32 +01:00
omar
05885b2e6d
Merge fix.
2018-01-15 20:18:01 +01:00
omar
a221d253f3
Nav: Comment.
2018-01-15 20:13:49 +01:00
omar
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-15 20:13:42 +01:00
omar
28a76af185
Internal: DrawData: Tidying, renaming.
2018-01-15 20:12:48 +01:00
omar
a77913054f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-01-15 18:02:58 +01:00
omar
1182174d81
Internals: DrawData: We don't need an intermediate layer for popups.
2018-01-15 18:00:13 +01:00
omar
0c06b43e6b
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
2018-01-15 17:55:38 +01:00
omar
038453258e
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
2018-01-15 17:48:32 +01:00
omar
061d8df033
MIssing IMGUI_API for a type with non-inline methods.
2018-01-15 17:48:32 +01:00
omar
06eef2ce6f
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
2018-01-15 17:48:32 +01:00
omar
6eff21ee5e
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )"
...
This reverts commit 03f5cd6ca1 .
2018-01-15 16:19:01 +01:00
omar
514d30d8cd
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345 .
2018-01-14 14:13:54 +01:00
omar
8b432cf590
Merge pull request #1551 from Crunkle/master
...
Fix incorrect header name on Linux MinGW systems.
2018-01-14 11:26:03 +01:00
Crunkle
daa38f2ad0
Fix cross compilers
2018-01-14 03:31:22 +00:00
omar
db63e71f13
Internals: Exposed SetCurrentFont() in imgui_internal.h
2018-01-12 20:07:01 +01:00
omar
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
2018-01-12 19:53:27 +01:00
omar
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ( #787 )
2018-01-12 19:28:37 +01:00
omar
c9be7d7254
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-01-12 19:21:12 +01:00
omar
0a98202714
Nav: Standardized FIXME-NAV marker.
2018-01-12 19:13:15 +01:00
omar
16285603f2
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
2018-01-12 19:11:11 +01:00
omar
cc173d7619
Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). ( #822 , #1542 )
2018-01-11 23:21:24 +01:00
omar
5e9ae92ae9
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). ( #822 , #1542 )
2018-01-11 23:17:34 +01:00
omar
f7b10fc954
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-11 18:18:44 +01:00
omar
6a1011cf53
MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381 , #1337 )
2018-01-11 18:16:16 +01:00
omar
b74f24c3e5
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381 , #1337 )"
...
This reverts commit 651538e13b .
2018-01-11 18:08:14 +01:00
omar
1c95dea88c
Merge branch 'master' into navigation
2018-01-11 17:37:02 +01:00
omar
7d2a068dea
Begin: Shuffling bits of code around.
2018-01-11 17:33:37 +01:00
omar
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-11 16:49:59 +01:00
omar
651538e13b
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381 , #1337 )
2018-01-11 16:43:03 +01:00
omar
a8bbb0b7dd
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
2018-01-11 15:47:07 +01:00
omar
12aa3cb09e
Demo: Tweaks format.
2018-01-11 15:22:33 +01:00
omar
398a4e1865
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. ( #1382 )
2018-01-11 13:58:25 +01:00
omar
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ( #1382 )
2018-01-11 13:51:18 +01:00
omar
67671c0ab5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-10 23:11:26 +01:00
omar
1eee10778b
Internals: Begin: Refactor some code into an UpdateManualResize() function.
2018-01-10 23:06:51 +01:00
omar
483f9b0d07
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
2018-01-10 22:55:29 +01:00
omar
03f5cd6ca1
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )
2018-01-10 18:58:55 +01:00
omar
919fc548ad
Merge branch 'master' into navigation
2018-01-10 18:58:26 +01:00
omar
6c583315e6
Begin: Moving some code around for the benefits of the wip viewport branch.
2018-01-10 18:56:51 +01:00
omar
f610e25682
Internals: Using ImFloor().when appropriate.
2018-01-10 18:33:29 +01:00
omar
0cabd81071
Internals: Rect: Added ClipWillFull helper + comments on variations.
2018-01-10 14:43:08 +01:00
omar
92d75c44bc
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
2018-01-10 14:43:02 +01:00
omar
fe919995da
Merge branch 'master' into navigation
2018-01-08 16:35:12 +01:00
omar
933ee6cd5d
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). ( #1541 )
2018-01-08 16:01:30 +01:00
omar
fd4d63a0c5
InputText: Moved code for checking clipboard shortcut so we can expand on it. ( #1541 )
2018-01-08 15:56:01 +01:00
omar
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
2018-01-08 15:30:39 +01:00
omar
39cb56c39e
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 ( #1466 )
2018-01-07 19:09:34 +01:00
omar
7484c63449
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 ( #1466 , #1504 )
2018-01-07 19:09:33 +01:00
omar
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
2018-01-07 18:17:47 +01:00
omar
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
2018-01-07 18:13:01 +01:00
omar
3f4eccf154
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-07 16:22:09 +01:00
omar
3fc7cf190d
OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). ( #1497 , #1533 )
2018-01-07 16:20:02 +01:00
omar
deab2ab015
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). ( #1497 )
2018-01-07 16:15:54 +01:00
omar
69ff65f054
Internals: Popup: Renaming fields.
2018-01-07 16:11:25 +01:00
omar
3678307cd9
Popup, Menus: Tweaks and comments.
2018-01-07 15:56:14 +01:00
omar
369189b675
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
2018-01-07 15:40:46 +01:00
omar
e09852fc49
Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
2018-01-07 15:34:15 +01:00
omar
63e4677b81
Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
2018-01-07 15:23:57 +01:00
omar
c337cdcfd3
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
2018-01-07 15:02:09 +01:00
omar
7ad169fa09
Merge branch 'master' into navigation + fix previous merge
...
# Conflicts:
# imgui.cpp
2018-01-07 14:33:44 +01:00
omar
d730a763f6
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
2018-01-07 14:32:42 +01:00
omar
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-07 14:25:05 +01:00
omar
a34490239c
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
2018-01-07 14:03:56 +01:00
omar
5fd19f037f
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
2018-01-07 12:48:11 +01:00
omar
2874aabb93
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
2018-01-07 12:48:11 +01:00
omar
3d24a9eb40
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. ( #1538 )
2018-01-05 22:32:27 +01:00
omar
65dd55cb2b
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch
...
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538 , #754 )
2018-01-05 22:27:40 +01:00
omar
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
2018-01-05 22:05:02 +01:00
Nick Dandoulakis
bfc25bc8a3
CS_DBLCLKS support for DirectX 11
2018-01-05 22:28:27 +02:00
Nick Dandoulakis
583e97b297
CS_DBLCLKS support for DirectX 10
2018-01-05 22:25:30 +02:00
Nick Dandoulakis
20ae6439ea
CS_DBLCLKS support for Directx9
2018-01-05 22:16:35 +02:00
omar
95b773370f
Revert "Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )" Will come up with a better design later.
...
This reverts commit 007f4034c9 .
2018-01-05 17:40:51 +01:00
omar
007f4034c9
Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )
2018-01-05 15:33:24 +01:00
omar
4c90529c62
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
2018-01-04 11:42:05 +01:00
omar
ecbfdd3143
Added extraneous initialization to NULL. ( #1527 ).
2018-01-04 11:06:12 +01:00
omar
29c194b2a4
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-03 20:47:42 +01:00
omar
4fc9f44073
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
2018-01-03 20:46:54 +01:00
omar
4b1240b2e1
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
2018-01-03 20:45:24 +01:00
omar
b2ec0741f1
Internals: Settings api tweaks
2018-01-03 20:45:17 +01:00
omar
2b8224692e
Merge branch 'master' into navigation
2018-01-03 20:26:24 +01:00
omar
0a0b252bb6
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
2018-01-03 17:02:51 +01:00
omar
a7deb3a394
Demo: Minor tweaks.
2018-01-03 15:36:51 +01:00
omar
9fbecac87e
Demo: Improved Selectable() examples. ( #1528 )
2018-01-03 15:11:14 +01:00
omar
33f7769d85
Columns: Clear offsets data when columns count changed. ( #1525 )
2018-01-03 14:38:01 +01:00
omar
f9b2058d5a
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
2018-01-03 14:35:11 +01:00
omar
79d38e5ade
Updated copyright date for 2018
2018-01-03 14:32:16 +01:00
omar
05ec0b0736
Casing tweaks + clarify license copyright (simpler/safer?) ( #1346 )
2018-01-03 14:32:16 +01:00
omar
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2018-01-03 12:33:27 +01:00
omar
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
2018-01-03 12:31:56 +01:00
omar
7fcbd45500
Internals: NextWindow: Renamed, moved functions to member.
2018-01-03 12:28:16 +01:00
omar
e339949de1
Internals: NextWindow: Using ImGuiCond for consistency.
2018-01-03 12:22:02 +01:00
omar
04b44398eb
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
2018-01-03 12:12:41 +01:00
Branimir Karadžić
856ee17ed8
Fixed Android clang warning.
2018-01-03 10:29:37 +01:00
omar
7e03ee8d85
Merge branch 'master' into navigation
2018-01-02 17:21:49 +01:00
omar
bfc9c5216a
Merge pull request #1529 from unprompted/master
...
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
2018-01-02 17:21:17 +01:00
Cory McWilliams
561e9f286e
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
2018-01-02 10:46:20 -05:00
omar
170bcb2d7c
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
2018-01-02 12:48:38 +01:00
omar
4af84ac781
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. ( #1527 )
2017-12-30 23:10:11 +01:00
omar
7a15fc8de5
Merge branch 'master' into navigation
2017-12-29 18:28:23 +01:00
omar
6ec00a366a
Internals: ImRect: Minor formatting tweaks.
2017-12-29 18:28:04 +01:00
omar
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
2017-12-29 18:16:19 +01:00
omar
eef9120e07
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
2017-12-29 18:14:36 +01:00
omar
2dd2ca0096
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
...
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e .
2017-12-29 17:59:13 +01:00
omar
9f8632b131
Examples: Comments about invalid mouse pos.
2017-12-29 15:03:36 +01:00
omar
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-29 13:39:07 +01:00
omar
4fbdb50dca
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
2017-12-28 23:53:36 +01:00
omar
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
2017-12-28 23:53:27 +01:00
omar
90ff4ae5d1
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
2017-12-28 23:52:47 +01:00
omar
e985baa35d
Combo: When peeking into the popup window for alignment we check if the window was active, which is more correct. (no known issue in current codebase, but we'll need that change for later)
2017-12-28 23:52:42 +01:00
omar
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
2017-12-28 23:52:37 +01:00
omar
563d04fdb1
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. ( #143 , #581 )
2017-12-28 23:52:31 +01:00
omar
49eed6e2d1
Version 1.54 WIP
2017-12-28 15:17:35 +01:00
omar
6e30c33642
Demo dinaries update
2017-12-26 21:04:17 +01:00
omar
7fd805497a
Update README.md
2017-12-26 20:30:22 +01:00
omar
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-26 15:37:31 +01:00
omar
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
2017-12-26 15:36:55 +01:00
Branimir Karadžić
149523a101
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
2017-12-25 22:27:32 +01:00
omar
9511f22e8b
Demo: Console: More friendly to text color changes.
2017-12-25 18:47:44 +01:00
omar
e916310b2e
Version 1.53
2017-12-25 17:41:41 +01:00
omar
3d48f5b8c2
Demo: BeginCombo() demo code
2017-12-25 17:41:02 +01:00
omar
ed2105d4a2
Merge branch 'master' into navigation
2017-12-25 16:45:27 +01:00
omar
3849bb4470
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
2017-12-25 16:03:58 +01:00
omar
78f48bb795
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
2017-12-25 14:54:54 +01:00
omar
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-24 18:59:40 +01:00
omar
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
2017-12-24 18:59:14 +01:00
omar
3a4a2bb27c
Examples: Vulkan: Tweak
2017-12-24 18:49:19 +01:00
omar
ce13426a1a
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
2017-12-24 18:45:11 +01:00
omar
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
2017-12-24 18:16:22 +01:00
omar
cead207535
Comments
2017-12-24 17:58:41 +01:00
omar
67191badc2
Merge branch 'master' into navigation
2017-12-23 23:10:41 +01:00
omar
bb8dfe4a34
Fixed incorrect IM_DELETE macro ( 9cda86d55a) ( #1517 , #484 , #504 )
2017-12-23 23:10:26 +01:00
omar
b1930c5672
Merge branch 'master' into navigation
2017-12-23 20:37:53 +01:00
omar
e9ceef4762
ImVector: Revert 6172e93272 actually problematic with our current use (because we don't construct the instances).
2017-12-23 20:37:36 +01:00
omar
6c63c7a8b1
Various zealous warning fixes (thanks Clang). (Navigation branch)
2017-12-23 16:40:12 +01:00
omar
ffb4f6ca8c
Merge branch 'master' into navigation
2017-12-23 16:27:48 +01:00
omar
d976e4ea23
Internals: Missing IM_DELETE usage ( #1517 )
2017-12-23 16:27:16 +01:00
omar
9cda86d55a
Internals: Added IM_NEW, IM_DELETE helper macros ( #1517 , #484 , #504 )
2017-12-23 16:24:33 +01:00
omar
a5739a0aa3
Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type ( #1184 )
2017-12-23 15:28:49 +01:00
omar
983d8f5f8e
Various zealous warning fixes (Clang).
2017-12-23 15:28:49 +01:00
omar
53b24ff79a
Removed reliance on ImU64 type for the ImDrawList assert. ( #1184 )
2017-12-23 15:02:36 +01:00
omar
69879dd4f3
ImVector: Spacing.
2017-12-23 14:55:22 +01:00
omar
8e8b5498f7
ImVector: insert() uses grow_capacity() - had inconsistent resize policy
2017-12-23 14:51:28 +01:00
omar
6172e93272
ImVector: Added assignments and = operators + comments.
2017-12-23 14:49:23 +01:00
omar
b263bc5689
Examples: DirectX: Using IM_ARRAYSIZE()
2017-12-23 14:07:27 +01:00
omar
1f26652944
Various zealous warning fixes (thanks Clang).
2017-12-23 14:07:03 +01:00
omar
cf9b893841
Examples: Added null_example/ which is helpful for quick testing on multiple compilers/settings without relyong on graphics library.
2017-12-23 13:40:01 +01:00
omar
1c1e490316
Merge branch 'master' into navigation
2017-12-22 20:21:54 +01:00
omar
46dcd9aa50
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() ( #125 )
2017-12-22 20:21:35 +01:00
omar
471bcf8b5e
Columns: Fixed dragging when using a same of columns multiple times in the frame. ( #125 )
2017-12-22 20:21:02 +01:00
omar
e1a103b251
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. ( #143 )
2017-12-22 20:20:52 +01:00
omar
8d21ee56d2
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 ( #1519 )
2017-12-22 20:19:48 +01:00
omar
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-21 19:55:21 +01:00
omar
c8c872c753
Internals: String functions uses size_t in their signature
2017-12-21 19:49:54 +01:00
omar
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
2017-12-21 19:49:54 +01:00
omar
d139bd088d
Begin: Moved modal darkening draw block
2017-12-21 19:49:54 +01:00
omar
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
2017-12-21 19:01:53 +01:00
omar
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
2017-12-21 18:52:34 +01:00
omar
230f826ef5
ImDrawList: Comments
2017-12-21 18:48:09 +01:00
omar
4c2514dc29
Merge branch 'master' into navigation
2017-12-21 11:18:42 +01:00
omar
6193f46af2
Active Modal window always set the WantCaptureKeyboard flag ( #744 )
2017-12-21 11:18:30 +01:00
omar
b366dd9322
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
2017-12-20 17:40:58 +01:00
omar
7fed4eb82d
Merge branch 'ibachar-master'
2017-12-20 16:25:21 +01:00
omar
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
2017-12-20 16:25:03 +01:00
ibachar
abaf347deb
Added a flag for text input to disable undo / redo
2017-12-17 15:27:56 +02:00
omar
b1d90b565d
Columns: Fixed previous commit (wrong chunk commited) ( #125 )
2017-12-15 17:09:41 +01:00
omar
b9391d1692
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. ( #125 )
2017-12-15 17:06:47 +01:00
omar
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-15 11:59:50 +01:00
omar
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
2017-12-15 11:17:21 +01:00
omar
6effcf21d6
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. ( #143 )
2017-12-15 11:17:21 +01:00
omar
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
2017-12-15 10:15:51 +01:00
omar
eefea0588a
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. ( #1380 , #1502 )
2017-12-14 18:42:41 +01:00
Branimir Karadžić
ac8e708c3e
Fixed unused variable warning.
2017-12-14 18:14:43 +01:00
omar
07ed9f8451
TODO list update
2017-12-14 11:08:16 +01:00
omar
fa68cb5364
Demo: Console: Tweak.
2017-12-13 23:07:07 +01:00
omar
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
2017-12-13 22:30:16 +01:00
omar
5f39758202
Minor tweaks, comments, spacing fixes
2017-12-13 22:21:49 +01:00
omar
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-12-13 22:09:08 +01:00
omar
f265e16b84
Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
...
This reverts commit 7ac1583411 .
2017-12-13 22:07:18 +01:00
omar
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
2017-12-13 21:59:16 +01:00
omar
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. ( #1499 , #125 )
2017-12-13 21:51:23 +01:00
omar
ba71e1c0e4
Columns: Minor stylistic fixes. ( #125 )
2017-12-13 21:48:56 +01:00
omar
f7c5f420e7
BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. ( #1500 )
2017-12-13 19:45:03 +01:00
omar
e8e84a6ad6
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. ( #125 )
2017-12-13 19:26:04 +01:00
omar
4ae5c7e227
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. ( #125 , #1499 )
2017-12-13 19:21:21 +01:00
omar
b016215c80
Columns: Refactor: Not using statestorage lookup anymore. ( #125 , #1499 )
2017-12-13 19:07:09 +01:00
omar
3a31a75e3b
Columns: Refactor: Renamed all members. ( #125 , #1499 )
2017-12-13 18:42:06 +01:00
omar
78320aa633
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. ( #125 , #1499 )
2017-12-13 18:41:51 +01:00
omar
027ffd91ea
IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
2017-12-12 23:49:04 +01:00
omar
16fb58984f
Merge branch 'master' into navigation
2017-12-12 23:41:48 +01:00
omar
90d0b8b58b
Navigation: minor sync to reduce drifts between changes
2017-12-12 23:41:20 +01:00
omar
8b59ed0708
Drag and Drop: Exposed some internals.
2017-12-12 23:37:27 +01:00
omar
90788a1242
ImVector: Added ImVector::contains() helper
2017-12-12 23:36:42 +01:00
omar
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
2017-12-12 23:36:25 +01:00
omar
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
2017-12-12 23:35:04 +01:00
omar
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
2017-12-12 20:44:12 +01:00
omar
d0a1be0de0
Merge branch 'drag_and_drop'
2017-12-12 20:39:52 +01:00
omar
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-12-12 20:34:16 +01:00
omar
7faa5b16bb
Tweak
2017-12-12 19:15:00 +01:00
omar
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-12-12 18:47:23 +01:00
omar
02e0a078f4
Begin: Tidying up code to make it more readable.
2017-12-12 18:46:42 +01:00
omar
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
2017-12-12 18:45:57 +01:00
omar
d561a43a4d
Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. ( #143 )
2017-12-12 18:17:37 +01:00
Branimir Karadžić
ef1a683ebe
Removed use of obsolete ImGui API.
2017-12-12 17:59:09 +01:00
omar
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
2017-12-12 15:44:22 +01:00
omar
7ec934f439
Drag and Drop: Comments
2017-12-12 15:33:26 +01:00
omar
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-12-12 15:02:05 +01:00
omar
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2017-12-12 14:58:53 +01:00
omar
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
2017-12-12 14:14:58 +01:00
omar
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
2017-12-12 14:12:49 +01:00
omar
ee7f1921e8
Internals: Added GetSmallSquareSize()
2017-12-12 14:08:58 +01:00
omar
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
2017-12-12 14:07:12 +01:00
omar
8d8f4934fb
Demo: mouse dragging demo tweaks
2017-12-12 13:11:40 +01:00
omar
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
2017-12-12 12:52:24 +01:00
omar
de4a851f95
Font documentation update ( #1498 )
2017-12-12 12:50:43 +01:00
omar
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
2017-12-12 12:50:43 +01:00
omar
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
2017-12-12 12:50:42 +01:00
omar
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
2017-12-12 12:50:42 +01:00
omar
185c1eaaf3
Alignment + removed comments
2017-12-11 22:55:28 +01:00
omar
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
2017-12-11 22:42:12 +01:00
omar
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
2017-12-11 22:39:10 +01:00
omar
6b168b43ff
Comments ( #822 )
2017-12-11 19:47:23 +01:00
omar
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:39:27 +01:00
omar
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:28:47 +01:00
omar
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
2017-12-11 16:22:52 +01:00
omar
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
2017-12-11 16:19:37 +01:00
omar
6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
2017-12-11 10:25:44 +01:00
Branimir Karadžić
e67f3809ed
Replaced obsolete function with new one.
2017-12-11 09:57:05 +01:00
omar
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-12-10 19:01:59 +01:00
omar
71296910a0
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
2017-12-10 18:49:47 +01:00
omar
4b8857d536
Demo: About box tweaks.
2017-12-10 18:45:05 +01:00
omar
1096e14356
ImFont: Added GetDebugName() helper.
2017-12-10 18:34:32 +01:00
omar
e3e0326ea9
Exposed BeginCombo() publicly.
2017-12-10 18:08:59 +01:00
omar
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
2017-12-10 17:57:27 +01:00
omar
eab6333a0b
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ( #1490 )
2017-12-10 17:36:30 +01:00
omar
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
2017-12-10 17:27:37 +01:00
omar
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
2017-12-10 17:24:10 +01:00
omar
20ba79aa56
Demo: Added "No close" option.
2017-12-10 17:02:41 +01:00
omar
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
2017-12-10 16:48:18 +01:00
omar
0872020c5c
Comments
2017-12-10 16:11:29 +01:00
omar
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
2017-12-10 16:05:47 +01:00
Branimir Karadžić
e23083a080
Fixed warning: logical ‘and’ of equal expressions
2017-12-10 12:15:29 +01:00
omar
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
2017-12-09 21:25:20 +01:00
omar
a8c7b1a2a2
ColorEdit4: Made IsItemActive() return true when picker popup is active. ( #1489 )
2017-12-09 21:17:27 +01:00
omar
871a5cecc1
Merge branch 'master' into navigation
2017-12-08 18:32:46 +01:00
omar
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
2017-12-08 18:32:12 +01:00
omar
457011660e
Mouse wheel scrolling doesn't change speed inside Combo box (uses to slow down from 5 to 3) but instead slow down on window that are smaller than the scroll speed.
2017-12-08 18:28:17 +01:00
omar
a263dce2f2
Combo: Cleanup. Removed unrequired uses of the _ComboBox flag (the test in EndChild() is from commit no 1!). We could remove ImGuiWindowFlags_ComboBox soonish.
2017-12-08 17:21:45 +01:00
omar
9ce51ad9f6
Fix bad merge
2017-12-08 15:11:35 +01:00
omar
a6f37287d8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-08 15:06:37 +01:00
omar
7ac5f11b29
Standardizing the casing/format of internal window names + Misc comments.
2017-12-08 15:04:06 +01:00
omar
befc58771c
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
2017-12-08 15:03:37 +01:00
omar
e998c7d3e3
Combo: Moved functions (untouched).
2017-12-08 15:03:32 +01:00
omar
a5e9392140
Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
2017-12-08 15:03:26 +01:00
omar
d9d231dc6b
Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
2017-12-08 15:02:17 +01:00
omar
74f42baf3e
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
2017-12-08 15:00:56 +01:00
omar
541dfd7901
Combo: Comments + fixed missing lower window padding.
2017-12-08 15:00:02 +01:00
omar
9872297a84
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
2017-12-08 14:59:49 +01:00
omar
a4863e8084
Demo: Picker with palette demo supports drag and drop. ( #143 , #346 )
2017-12-08 12:49:35 +01:00
omar
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
2017-12-08 12:48:53 +01:00
omar
b6b940c8ee
Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
...
# Conflicts:
# imgui.cpp
2017-12-08 09:35:23 +01:00
omar
e118239f69
IsItemHovered() comments ( #1382 )
2017-12-08 09:34:05 +01:00
omar
553b0fcf8f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-07 21:20:16 +01:00
omar
ca0bb000ad
Begin: Factored out a bit of code to CalcSizeContents()
2017-12-07 21:14:54 +01:00
omar
f658edc72a
Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
2017-12-07 21:14:49 +01:00
omar
45466a8cf9
Internals: BeginCombo() added dummy ImGuiComboFlags.
2017-12-07 21:14:41 +01:00
omar
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
2017-12-07 21:14:25 +01:00
omar
7f2b9ea4c0
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
2017-12-07 21:14:13 +01:00
omar
8dcc1a8a20
Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
2017-12-07 21:14:00 +01:00
omar
e045eddd77
Minor tweaks. Using ImGuiAxis defines.
2017-12-07 21:13:23 +01:00
omar
92f7bd3605
Fixed 64-bit warnings.
2017-12-07 21:06:15 +01:00
omar
cc2c023880
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
2017-12-07 17:04:53 +01:00
omar
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
2017-12-07 16:42:52 +01:00
omar
3c9f9a455e
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
2017-12-07 16:36:07 +01:00
omar
8959c64b33
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
2017-12-07 13:29:14 +01:00
omar
abe5ad3c7a
Demo: Added display for IsMouseDragging() function.
2017-12-07 13:27:55 +01:00
omar
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
2017-12-07 13:27:49 +01:00
omar
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
2017-12-07 12:49:52 +01:00
omar
6deb865f78
Nav: Merge fix.
2017-12-06 17:48:28 +01:00
omar
2fc6a82665
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-06 17:44:40 +01:00
omar
8f41508c52
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
2017-12-06 17:42:28 +01:00
omar
2fc9a2e6e7
Fixed nav branch merge issue.
2017-12-06 15:20:36 +01:00
omar
beda5fc5a0
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
2017-12-06 15:13:45 +01:00
omar
ecacaf7f2d
Lower-right resize grip only appears when hovered. ( #822 )
2017-12-06 15:13:45 +01:00
omar
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-06 15:13:45 +01:00
omar
531e559e49
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. ( #822 ) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
2017-12-06 15:13:45 +01:00
omar
e103fe8c1f
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-06 15:13:45 +01:00
omar
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
2017-12-06 15:13:45 +01:00
omar
fe2cf231a8
Update README.md
2017-12-06 11:18:17 +01:00
omar
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-05 22:56:35 +01:00
omar
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-05 22:53:58 +01:00
omar
5686c72bbd
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. ( #822 ) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
2017-12-05 22:47:20 +01:00
omar
b9dc0caee3
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-05 22:44:52 +01:00
omar
2ca4f9e862
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
2017-12-05 22:42:57 +01:00
omar
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-05 16:15:05 +01:00
omar
77d1a4b636
Fixed a one frame glitch, when window claiming focus themselves on appear, the title bar wouldn't use the focused color on that frame.
2017-12-05 16:12:45 +01:00
omar
16d9fa30b2
Merge branch 'master' into drag_and_drop
2017-12-05 09:21:07 +01:00
omar
5f7cd7fb1c
Internals: Splitter Behavior doesn't show a border. ( #319 )
2017-12-01 17:39:50 +01:00
omar
be6384eb2a
Style: Tweaked default WindowRounding value from 9 to 7 ( #707 )
2017-12-01 17:39:31 +01:00
omar
c860a0a85c
Internals: ImRect: Added IsFinite() helper.
2017-12-01 17:39:13 +01:00
omar
aea3fe41b9
Style: Tweaks Dark and Light styles. ( #707 )
2017-11-30 23:15:55 +01:00
omar
6ea744d8f4
Drag and Drop: Added DragSource from color square. Added DragTarget on ColorEdit4 widget. ( #143 )
2017-11-30 16:54:39 +01:00
omar
81cbaef806
Merge branch 'master' into navigation
2017-11-29 23:49:17 +01:00
omar
0d53c8d480
Demo: Console: Fixed incorrect positioning which was hidden by a minor scroll issue (this would affect people who copied the console code as is)
2017-11-29 23:48:32 +01:00
omar
b513fdce48
Scrolling: SetScrollFromPosY() tweak to match change in a0d53fee81084a547bf21f46e736ea89f79fffb5 with similar desirable jump/discontinuity at each limit to skip the (ItemSpacing>WindowPadding) difference (followup to 0e5b64ecd2, #150 )
2017-11-29 23:48:32 +01:00
omar
c36e586cce
Style, Scrolling: Fixed padding and scrolling asymetry where lower/right sides of a window wouldn't use WindowPadding properly + causing minor scrolling glitches.
2017-11-29 23:48:32 +01:00
omar
a20fe279c5
Demo: Layout: Removed unnecessary BeginChild/EndChild calls
2017-11-29 23:48:32 +01:00
omar
25c159fac8
Internals: Removed unnecessary duplicate scrolling code + added extra infos to Metrics window.
2017-11-29 21:10:59 +01:00
omar
52e475230f
Settings: Internals: Renaming.
2017-11-28 23:16:09 +01:00
omar
2e1013a0c6
Settings: Internals: Simplifying code a bit. Creating Settings structure during first save. Windows where ImGuiWindowFlags_NoSavedSettings was late toggled will save settings correctly. ( #1000 )
2017-11-28 21:04:38 +01:00
omar
7ae71e4984
Settings: Internals: Added FindSettingsHandler()
2017-11-28 21:04:38 +01:00
omar
35eb5c5c99
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
2017-11-28 21:04:38 +01:00
omar
963259d128
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
2017-11-28 21:04:38 +01:00
omar
63712d5f5c
Merge branch 'master' into drag_and_drop
2017-11-28 17:28:45 +01:00
omar
9191b17218
Merge branch 'master' into navigation
2017-11-28 17:28:08 +01:00
omar
4a43632163
Build fix
2017-11-28 17:27:54 +01:00
omar
1a8a7c9d17
Settings: Import old style .ini file
2017-11-28 16:23:46 +01:00
omar
c8b5b569da
Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
2017-11-28 11:26:14 +01:00
omar
e5ebe42207
Settings: Make ImGuiWindow settings always first in the list.
2017-11-28 10:49:43 +01:00
omar
4c4f1b0224
ImVector: Added ImVector::push_front helper.
2017-11-28 10:49:43 +01:00
omar
f3ec608c19
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
2017-11-28 10:49:43 +01:00
omar
e000ee0116
Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). ( #1464 )
2017-11-28 10:48:01 +01:00
omar
7e2d0d734c
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
2017-11-27 23:57:11 +01:00
omar
d552cabd15
Settings: Internal renaming of structure and fields names.
2017-11-27 23:57:10 +01:00
Emmanuel Benoît
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
2017-11-27 20:59:05 +01:00
omar
ade09b9e3c
Settings: Basic internal refactor to have functions for saving from/to memory (not exposed)
2017-11-27 19:02:40 +01:00
omar
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
2017-11-27 19:02:00 +01:00
omar
0f955b818d
Fixed DroidSans font link ( #1460 )
2017-11-26 11:44:52 +01:00
omar
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
2017-11-24 16:56:17 +01:00
omar
46e994de4e
Nav: Do not clear last navigation id stored in a hidden child window. ( #787 )
2017-11-24 16:55:57 +01:00
omar
4e3c7f1557
Nav: Exposed NavInitWindow() in imgui_internal ( #787 )
2017-11-24 16:55:49 +01:00
omar
f5c47faee8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-24 16:55:31 +01:00
omar
ef5dd30625
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
2017-11-24 09:27:45 +01:00
omar
6bd3b45b34
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
2017-11-24 09:23:17 +01:00
stfx
6d3cfba834
Add Slider hover color just like Drag
...
I feel like there should be hover color options for each different control instead of the grouped frame color to make it usable for everyone. This also would not reduce performance as all controls already check for hover state as required by the ImGUI::IsHoveredItem() API.
2017-11-23 12:37:11 +01:00
omar
7763ab3fcc
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
2017-11-22 15:58:20 +01:00
omar
06a32a2b00
Merge pull request #1455 from elect86/patch-3
...
Update imgui_draw.cpp, fixed light colors order
2017-11-22 13:21:33 +01:00
Giuseppe Barbieri
1b2ec35b8d
Update imgui_draw.cpp
2017-11-22 12:58:11 +01:00
omar
b618629d99
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-22 12:34:59 +01:00
omar
7d09a0ae99
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
2017-11-22 12:33:59 +01:00
omar
aafa6cece5
Tweak expression to be less weird (how did that ever happen?)
2017-11-22 11:26:16 +01:00
omar
3141df1459
Merge pull request #1454 from elect86/patch-2
...
Tweak
2017-11-22 11:24:20 +01:00
Giuseppe Barbieri
21b456e567
Update imgui.cpp
2017-11-22 11:19:52 +01:00
omar
68b26b4867
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-22 11:04:00 +01:00
omar
176d8fbe74
Fixed unreferenced variable warnings.
2017-11-22 11:02:42 +01:00
omar
302757447a
Internals: Added SplitterBehavior(). ( #319 )
2017-11-20 19:41:17 +01:00
omar
195abc3d17
Begin: Fix border size latch when rounding uses Child or Popup value. ( #707 )
2017-11-20 15:19:54 +01:00
omar
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-11-20 13:54:06 +01:00
omar
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
2017-11-20 13:53:16 +01:00
omar
31683cfe34
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )
2017-11-20 13:31:40 +01:00
omar
3c5e64db78
Demo: Tweaked Image() code.
2017-11-20 13:30:25 +01:00
omar
7f447c8270
Color picker: Tweak vertex shading code, since we aren't shading between PrimReserve and PrimVert the code can be expressed more naturally. ( #346 )
2017-11-20 13:16:57 +01:00
omar
ba095f81a5
Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
2017-11-20 13:07:14 +01:00
omar
8c0f2e4946
Added comment to help people dealing with 58345b11e1 breakage ( #707 )
2017-11-20 13:05:50 +01:00
omar
e996286c38
Todo list update
2017-11-20 12:40:38 +01:00
thedmd
79f07f6ff0
Add AddImageRounded() to ImDrawList
2017-11-19 21:56:46 +01:00
thedmd
8b2d449b16
Add ShadeVertsLinearUV()
2017-11-19 21:56:36 +01:00
omar
dc2768503f
Fix for drag and drop branch.
2017-11-19 16:24:17 +01:00
omar
92212b17aa
Merge branch 'master' into drag_and_drop
2017-11-19 16:23:37 +01:00
omar
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-11-19 16:21:21 +01:00
omar
28a31997b7
Style Editor: Simplified settings also show PopupBorderSize as a checkbox. ( #707 , #1019 )
2017-11-19 16:03:42 +01:00
omar
abbf836fd0
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 , fix #819 , #1031 , ref #1019 , ref #447 )
2017-11-19 15:56:51 +01:00
omar
c433bc971f
Reorder fields for consistency.
2017-11-19 14:58:10 +01:00
omar
f7fe824805
Style: Tweaked border settings to homogenize a little how they look over different backgrounds. ( #707 )
2017-11-19 13:55:38 +01:00
omar
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
2017-11-19 13:52:40 +01:00
Jason Wilkins
022f8c2342
fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph
2017-11-19 12:44:23 +01:00
omar
9886b09a0a
Minor tweak, removed extraneous empty destructor.
2017-11-19 12:42:17 +01:00
Jason Wilkins
e605f21797
TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
2017-11-19 12:36:14 +01:00
omar
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
2017-11-19 12:06:45 +01:00
omar
538a704143
NewFrame(): using literal strings in the most-frequently firing IM_ASSERT expression to increase the odd of programmers seeing them (especially those who don't use a debugger).
2017-11-19 12:00:07 +01:00
omar
9289e8055c
Merge pull request #1445 from franciscod/uninitialized_o3_werror
...
ImFontAtlas: Fix maybe-uninitialized warning.
2017-11-19 00:53:35 +01:00
omar
4cdd998be8
Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. ( #1450 , #1451 )
2017-11-19 00:49:23 +01:00
omar
d323e8cca2
Fixed Style merge for nav branch ( #707 , #787 )
2017-11-19 00:47:00 +01:00
omar
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
2017-11-19 00:39:37 +01:00
omar
4022ada843
Merge branch 'master' into drag_and_drop
2017-11-19 00:36:32 +01:00
omar
4daf377c9b
Added comment about TextUnformatted(). ( #1450 )
2017-11-19 00:32:47 +01:00
omar
8a7f03cbf9
Combo: Offset popup position by border size so that a double border isn't so visible. ( #707 )
2017-11-19 00:29:59 +01:00
omar
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
2017-11-19 00:29:29 +01:00
omar
067605052d
Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. ( #823 )
2017-11-19 00:29:29 +01:00
omar
6f7b1bf2e1
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
2017-11-19 00:29:29 +01:00
omar
0e4f1df1a4
Style: Made changes to Classic style (!!!). Tweaked Dark style. ( #707 )
2017-11-19 00:29:29 +01:00
omar
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
2017-11-19 00:29:29 +01:00
omar
e7e81b265d
Demo: Tweaks.
2017-11-18 23:44:16 +01:00
omar
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
2017-11-18 23:44:16 +01:00
omar
1c41603b31
Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. ( fix #1211 )
2017-11-18 23:44:16 +01:00
omar
c1b5eab868
Style Editor: Sneakily adding a combo box to change colors ( #707 )
2017-11-18 23:18:18 +01:00
omar
331eac511e
Style: Dark: Tweaks + setting BorderShadow correctly.
2017-11-18 19:08:52 +01:00
omar
29e0078b66
Internals: Window minor internal renaming + added WindowRounding latch.
2017-11-18 19:06:11 +01:00
omar
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
2017-11-18 18:28:21 +01:00
omar
4e62118b61
Merge pull request #1448 from codecat/minor-fixes
...
Examples: DirectX: fix wrong comment in dx implementation headers
2017-11-18 14:22:53 +01:00
Codecat
979fe30a6f
Fix wrong comment in dx implementation headers
2017-11-18 13:56:59 +01:00
omar
da2be7bbdc
Style: ScaleAllSizes() helper rounds down every values so they are aligned on integers.
2017-11-17 21:29:37 +01:00
Francisco Demartino
f5871c0b92
fix uninitialized atlas packing context
2017-11-16 21:45:21 -03:00
omar
834fa52c8e
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. ( #1444 , #125 )
2017-11-16 17:34:34 +01:00
omar
7746dd104c
Merge branch 'master' into drag_and_drop
2017-11-16 13:28:22 +01:00
omar
44c590393c
Merge branch 'master' into navigation
2017-11-16 13:28:10 +01:00
omar
29d962069d
Internals: Updating condition/allow flags with a function.
2017-11-16 13:28:01 +01:00
omar
4ad414c8d4
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
2017-11-16 13:23:50 +01:00
omar
7c4be0a000
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
2017-11-16 13:11:49 +01:00
omar
6817f3a3d9
Merge branch 'master' into navigation
2017-11-15 23:44:50 +01:00
omar
e9a7e73bba
Windows with MenuBar have a larger minimum height to avoid artefacts (I fixed most of the vertical/horizontal artefacts, but the ones in rounded corners were too hard to fix).
2017-11-15 23:42:18 +01:00
omar
f36037b384
Menu: Fixed minor rendering issues on the right size with rounded window when resizing a window small.
2017-11-15 23:38:17 +01:00
omar
9b82d9fbef
Scrollbar: Minor graphical fix for when scrollbar don't have enough visible space to display the full grab.
2017-11-15 23:14:23 +01:00
omar
f5bdf443c9
Minor comments, tweaks
2017-11-15 22:37:43 +01:00
omar
5ea6e80da1
Make it possible to use SetNextWindowPos() on a child window. Useful internally.
2017-11-15 22:23:33 +01:00
omar
5027311e7f
Drag and drop: Standardizing payload types as defines. ( #143 )
2017-11-15 22:23:21 +01:00
omar
44b761b308
Merge branch 'master' into drag_and_drop
2017-11-15 14:41:27 +01:00
omar
27fd1b913b
Made it guaranteed by API that after calling Begin() the last Item represent the title bar. ( #823 )
2017-11-15 14:35:45 +01:00
omar
ae060b1d67
Merge branch 'master' into drag_and_drop
2017-11-15 10:24:54 +01:00
omar
64031852de
Merge branch 'master' into navigation
2017-11-14 23:17:58 +01:00
omar
64e79035d5
Scrollbar flicker fix for menus/popups (fixes 4d00dd8326 and 2df8fa95df). Hopefully right this time.
2017-11-14 23:17:28 +01:00
omar
6001d9c7a4
Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). ( #125 )
...
Demo: Columns: Adding a billion of extra lines and using clipper.
2017-11-14 22:41:54 +01:00
omar
0858c3d7cb
Demo: Custom Rendering: Fixed clipping rectangle extruding out of parent window.
2017-11-14 22:21:38 +01:00
omar
ffad688fc8
Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )
2017-11-14 22:11:43 +01:00
omar
852ece3a0e
Fixed build ( 3e06450d27 not meant for master branch, but ok)
2017-11-13 16:04:03 +01:00
omar
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-13 15:19:43 +01:00
omar
3e06450d27
Internals: Added ArrowButton() helper.
2017-11-13 15:18:31 +01:00
omar
7908cce25f
Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. ( #143 )
2017-11-13 15:17:41 +01:00
omar
4d00dd8326
Fixed scrollbar flickering on/off when uncollapsing a window (fixes 2df8fa95df)
2017-11-13 15:15:48 +01:00
omar
30bf40195b
io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )
2017-11-12 16:06:44 +01:00
omar
669498ff26
Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 , #650 )
2017-11-12 16:03:09 +01:00
omar
a1c736fa6a
Update README.md
2017-11-11 18:22:00 +01:00
omar
631bd8a9f8
Added bindings
2017-11-11 18:12:33 +01:00
omar
161670418b
Update documentation for extra fonts
2017-11-11 16:20:34 +01:00
Branimir Karadžić
9daac64ff8
Clean g.WindowsById storage on shutdown.
2017-11-11 10:01:50 +01:00
omar
06075f20ba
Merge branch 'master' into navigation
2017-11-10 11:42:08 +01:00
omar
ba09de3a39
Begin: Fixed appending into a child window with a second Begin() from a different window stack querying the wrong window for the window->Collapsed test.
2017-11-10 11:38:01 +01:00
omar
8451855a30
ButtonBehavior: Fixed ImGuiButtonFlags_AllowOverlapMode to avoid temporarily activating widgets on click before they have been correctly double-hovered. ( #319 , #600 )
2017-11-09 20:20:02 +01:00
omar
4b94738c7e
Drag and Drop: Drop target rectangle goes out of clipping range ( #143 )
2017-11-09 20:18:17 +01:00
omar
b1653cd361
Drag and Drop: Allow NULL payload (since type only can be useful). ( #143 )
2017-11-09 20:18:05 +01:00
omar
a297cbafdb
Merge branch 'master' into navigation
2017-11-08 23:17:14 +01:00
omar
2df8fa95df
Fixed vertical scrollbar flickering/appearing, typically when manually resizing and using a pattern of filling available height (e.g. full sized BeginChild). THIS IS A GREAT FIX, this glitch was nasty and annoying (and yet somehow nobody reported it?). Hopefully haven't broken anything else...
2017-11-08 23:17:08 +01:00
omar
a4cc3d4637
Minor tweaks/comments. Note that the reordering the one subtraction caused subtle havoc before the patch in 9ac8820ee2.
2017-11-08 22:36:31 +01:00
omar
9ac8820ee2
Fixed non-pixel aligned bounding box of window resize grip, / which triumphally led to any re-arrangement of operations inside the resize grip code outputting non-exact size_target values which led to unstable window position because clamping code uses size in a subtraction, etc etc. Lovely how a whole system can be made to act weird with a single bad input.
2017-11-08 22:32:22 +01:00
omar
b6504b8eee
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
2017-11-08 15:47:52 +01:00
omar
2ab27be3de
Child window with MenuBar use regular WindowPadding.y so layout look consistent in child or in a regular window.
2017-11-07 22:23:20 +01:00
omar
41862b8c0e
ButtonBehavior: Fixed ImGuiButtonFlags_NoHoldingActiveID from incorrectly setting ActiveIdClickOffset, which probably have no known effect, but it is more correct this way. ( #1418 )
2017-11-07 16:41:58 +01:00
omar
aae52522c3
Internals: Remove requirement to define IMGUI_DEFINE_PLACEMENT_NEW ( #1103 )
2017-11-07 14:06:02 +01:00
omar
1870738880
LowerBound() minor tweaks
2017-11-07 14:05:48 +01:00
omar
571b08f315
Internal: FindWindowByName() faster and doesn't touch every windows
2017-11-07 13:59:55 +01:00
omar
8e6adc78af
Examples: Constrained Resize: Added more test cases (for #1417 )
2017-11-07 11:38:39 +01:00
omar
2c7ba21417
Fixed auto-resize allocating too much space for scrollbar when SizeContents is bigger than maximum window size (fixes c0547d358d) ( #1417 )
2017-11-07 11:37:38 +01:00
omar
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2017-11-06 23:58:28 +01:00
omar
f0b4097c54
Begin: Simplified code and fixed a bug where appending into a window a second time (from a remote window) would incorrectly overwrite RootWindow with the current window in the stack. Our docking code uses this pattern.
2017-11-06 23:55:40 +01:00
omar
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
2017-11-06 20:04:10 +01:00
omar
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets ( #143 )
2017-11-06 19:39:23 +01:00
omar
16a5da9521
RenderTriangle() minor tweak to align Left/Right and Up/Down arrow extents visually
2017-11-03 20:20:25 +01:00
omar
553bdeedf7
Drag and Drop: Made it legal to not call SetDragDropPayload() between BeginDragDropSource() and EndDragDropSource(). ( #143 )
2017-11-02 18:30:46 +01:00
omar
3461a2f296
Merge branch 'master' into drag_and_drop
2017-11-02 18:06:04 +01:00
omar
982ce50b37
IsWindowHovered() returns true when moving window ( #1382 , #1404 )
2017-11-02 16:44:32 +01:00
omar
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
2017-11-02 16:44:24 +01:00
omar
803ac3a5c6
IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() ( #1382 , #1404 )
2017-11-02 16:23:03 +01:00
omar
1e7cc23867
Merge branch 'elect86-patch-1'
2017-11-02 10:41:31 +01:00
omar
2a3a25e792
Reordered fields in other Style functions ( #1409 )
2017-11-02 10:41:21 +01:00
omar
c547b97e4e
Merge branch 'patch-1' of https://github.com/elect86/imgui into elect86-patch-1
2017-11-02 10:40:01 +01:00
omar
78f9511f4d
Merge pull request #1410 from elect86/master
...
Fixed a comment
2017-11-01 17:58:42 +01:00
Giuseppe Barbieri
6fb43f2011
Update imgui.h
2017-11-01 17:56:03 +01:00
omar
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
2017-11-01 17:25:42 +01:00
Giuseppe Barbieri
db190c16f6
Update imgui_draw.cpp
2017-11-01 16:48:56 +01:00
omar
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-11-01 15:09:23 +01:00
omar
fba704bf5d
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard ( #1262 , #1237 , #1219 , #635 , #1058 , #1051 , #912 , #533 , #703 , #446 , #459 , #364 , #213 , #52 , and more)
2017-11-01 14:24:09 +01:00
omar
59323b54da
Demo: Comments ( #1408 )
2017-11-01 12:57:12 +01:00
omar
6ab20ff9bf
Minor tweaks to the user guide.
2017-11-01 12:33:58 +01:00
omar
e55caf0b95
Merge pull request #1402 from elect86/patch-1
...
Minor fix typo
2017-10-30 09:51:49 +01:00
omar
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
2017-10-30 09:50:54 +01:00
Giuseppe Barbieri
9e3f9fc2dd
Update imgui.cpp
2017-10-30 09:35:42 +01:00
omar
5956fff7e2
Drag and Drop: ImGuiButtonFlags_PressedOnDragDropHold focuses the target window.
2017-10-30 00:10:05 +01:00
omar
a810619555
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
2017-10-30 00:03:04 +01:00
omar
1d7d8f8574
Merge branch 'master' into drag_and_drop
2017-10-29 23:49:24 +01:00
omar
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
2017-10-29 23:49:01 +01:00
omar
d46772b429
Comments
2017-10-29 23:14:17 +01:00
omar
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
2017-10-29 23:10:44 +01:00
omar
acf78da742
Drag and drop: moved to imgui.h
2017-10-29 21:37:14 +01:00
omar
b5f714e9f9
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
2017-10-29 21:31:49 +01:00
omar
c5536e49ef
Drag and drop API experiment
2017-10-29 21:15:02 +01:00
omar
fd88bc270a
Merge branch 'nProtect-master'
2017-10-29 11:29:21 +01:00
omar
53f9e28c77
GetGlyphRangesThai(): removed extraneous codepoints ( #1396 )
2017-10-29 11:28:29 +01:00
omar
ae3dc66214
Merge branch 'master' of https://github.com/nProtect/imgui into nProtect-master
2017-10-29 11:24:25 +01:00
omar
f793562b4e
TODO
2017-10-29 11:23:38 +01:00
omar
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
2017-10-28 19:28:22 +02:00
omar
cb38caeda4
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397 , #1366 , #1341 , #1222 , #1193 , #1115 , #951 , etc.)
2017-10-28 18:21:44 +02:00
Adisorn Aeksatean
3185a3a697
Add missing thai punctuations
2017-10-28 16:59:39 +07:00
omar
17dd8e7c30
Merge branch 'master' into navigation
2017-10-27 23:01:54 +02:00
omar
b9ebb34a04
Nav: ColorButton: Fixed a case of not using local 'hovered' flag directly, messes with some of my drag and drop work, and I can't find/understand the reason why this was left as is (there _was_ a reason at the time but it appears to be obsolete now?)
2017-10-27 20:54:48 +02:00
omar
f962ca0b01
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline ( 0260fdd1c6)
2017-10-27 20:36:51 +02:00
omar
d55b69ad6e
Styles: Nav tweaks.
2017-10-27 20:06:45 +02:00
omar
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-10-27 20:04:51 +02:00
omar
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
2017-10-27 20:01:30 +02:00
omar
77df1ba9e0
Version 1.53 WIP
2017-10-27 19:54:56 +02:00
omar
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
2017-10-27 18:21:30 +02:00
omar
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-10-27 17:27:53 +02:00
omar
9f200d10d5
Version 1.52
2017-10-27 17:10:41 +02:00
omar
cc78e9a213
Merge branch 'master' into navigation
2017-10-27 16:46:03 +02:00
omar
267ea506de
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
2017-10-27 16:45:56 +02:00
omar
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-27 16:42:06 +02:00
omar
8dd7648db2
Comments
2017-10-27 16:41:22 +02:00
omar
ccdb58b17e
Internal: Added ImVec4 operators
2017-10-27 16:40:04 +02:00
omar
3b83cd24f5
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
2017-10-27 16:39:55 +02:00
omar
3656f2c769
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
2017-10-27 16:39:23 +02:00
omar
a6edd10ee6
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
2017-10-27 16:38:14 +02:00
omar
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
2017-10-27 16:21:12 +02:00
omar
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-10-27 15:53:59 +02:00
omar
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
2017-10-27 15:52:45 +02:00
omar
c432fcf2bb
Minor renaming.
2017-10-27 12:01:52 +02:00
omar
a6ff14d66e
Exposed IM_ARRAYSIZE() in imgui.h
2017-10-26 16:12:53 +02:00
omar
c5027d4fa1
Examples: Extra clarification for the 100th person who insist on using the OpenGL2 code in spite of existing documentation leaning against it. ( #1394 )
2017-10-25 20:55:15 +02:00
omar
549f9e3f03
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-25 16:37:10 +02:00
omar
daef33e268
Comments about mouse setup and clearing HoveredWindow when mouse down isn't owned by imgui (will affect some future hovered test and drag'n drop patterns) ( #143 , #1382 , #1392 )
2017-10-25 11:01:41 +02:00
omar
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported ( #211 , #1012 )
2017-10-25 09:28:54 +02:00
omar
fc25881207
Merge branch 'master' into navigation
2017-10-24 21:13:24 +02:00
omar
efcd53a0c3
Removed direct dependency on sprintf() in imgui.cpp ( #1038 )
...
(NB: imgui_demo stills uses it)
2017-10-24 20:57:41 +02:00
omar
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ( #1038 )
2017-10-24 20:48:29 +02:00
omar
8fd5620277
Renamed IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS to IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS for consistency. (ref #238 , #520 , #738 )
2017-10-24 20:23:42 +02:00
omar
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h ( #1038 )
2017-10-24 20:19:32 +02:00
Patrick Doane
70cb427469
Add missing CloseClipboard call
2017-10-24 20:12:42 +02:00
omar
bc447bc0a4
ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. ( #1391 )
2017-10-24 16:08:05 +02:00
omar
d513546325
Merge branch 'master' into navigation
2017-10-24 15:49:01 +02:00
omar
5b062c4c29
Fixed typos
2017-10-24 15:26:04 +02:00
omar
d2c65aa3e8
Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
2017-10-24 14:48:00 +02:00
omar
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
2017-10-24 14:38:32 +02:00
omar
e9ff7162bc
ColorButton: Fixed rendering color button with a checkerboard if the transparency comes from the global style.Alpha and not from the actual source color.
2017-10-24 10:43:41 +02:00
omar
de72e9cc87
Internals: ImLerp() helper for ImVec4
2017-10-23 17:22:00 +02:00
omar
f6ff373b22
Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui
2017-10-23 14:54:23 +02:00
omar
97bf2131e2
Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
2017-10-23 14:37:47 +02:00
omar
20983773f1
Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ( #787 )
...
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
2017-10-23 12:38:39 +02:00
omar
025d4f0c97
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-10-23 12:34:46 +02:00
omar
e7922b3fa0
Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
2017-10-23 12:34:15 +02:00
omar
2ef2c104a1
Begin: Minor tweaks
2017-10-23 11:36:43 +02:00
omar
be12f8c55d
Nav: Fixed handling of ImGuiNavInput_KeyMenu so it doesn't set g.NavWindowingTarget at all, reducing size effects + handling menu layer toggle on Alt Release ( #787 )
2017-10-23 11:26:52 +02:00
omar
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
2017-10-23 11:26:30 +02:00
omar
d769e2515a
Merge branch 'master' into navigation
2017-10-23 10:05:36 +02:00
omar
50f5be9266
Examples: GLFW+GL2/GL3: Minor tweaks, comments.
2017-10-23 10:04:38 +02:00
omar
d6a9956781
Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read.
2017-10-23 10:01:18 +02:00
omar
c14a66970b
Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct.
2017-10-23 09:57:59 +02:00
omar
cb10da02f9
Merge branch 'Gargaj-patch-1'
2017-10-23 09:47:49 +02:00
omar
a96f095deb
Examples: DirectX10, DirectX11: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
2017-10-23 09:46:49 +02:00
omar
3e0765ee22
Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
2017-10-23 09:43:30 +02:00
omar
e03198bb0f
Fixed compilation for #1375 + coding style fixes.
2017-10-23 09:43:30 +02:00
omar
c36e7fae93
Merge branch 'patch-1' of https://github.com/Gargaj/imgui into Gargaj-patch-1
2017-10-23 09:07:01 +02:00
omar
1bc1751670
MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. ( #1387 )
2017-10-22 10:56:37 +02:00
omar
b177f2432d
MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. ( #1387 )
2017-10-22 10:36:22 +02:00
omar
b52e207758
Merge branch 'inolen-atlas_build_clear_font'
2017-10-22 10:25:08 +02:00
omar
7f880674e5
Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ( #1349 )
2017-10-22 10:24:56 +02:00
omar
fce41d0b55
Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes.
2017-10-22 10:21:49 +02:00
omar
08e411c310
Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font
2017-10-22 10:17:28 +02:00
omar
5fa81f2a26
Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
...
Remove the move/resize behavior that appears than holding the button for a while. (#787 )
2017-10-20 22:12:10 +02:00
omar
1c5b3fb1d2
Merge branch 'master' into navigation
2017-10-20 21:17:57 +02:00
omar
f7259e60ee
Comments
2017-10-20 21:17:51 +02:00
omar
23b9060468
Nav: Honoring ImGuiItemFlags_NoNav which is used by color picker ( #787 )
2017-10-20 20:35:39 +02:00
omar
e4bb9102f9
Merge branch 'master' into navigation
2017-10-20 20:32:17 +02:00
omar
6ab737a4bb
Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)
2017-10-20 20:31:01 +02:00
omar
aca23fd3f0
Popups: similarly to previous commit, we fix reopening a popup within a popup stack from truncating the whole stack. This is done by properly refocusing the lower level popup. (~#439)
2017-10-20 19:25:34 +02:00
omar
59a89774d7
Popups: fixed CloseInactivePopups() so that right-clicking to close one level of popups in a popups stack won't close the whole stack. This is done by properly refocusing the lower level popup. Fixes 87ae40843c (~#439)
2017-10-20 19:24:12 +02:00
omar
43df7eb5ea
Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
...
Made the color popups uses this standard function so they handle reopening a context menu.
2017-10-20 18:56:31 +02:00
omar
0ea66dc260
Fixed bad merge from Master
2017-10-20 18:16:53 +02:00
omar
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2017-10-20 18:10:07 +02:00
omar
3cc10d25a9
BeginPopupContextItem(), BeginPopupContextWindow(): Using newly introduced IsItemHovered() flags to allow reopening another context menu (over same or not same item) with right-click. ( #439 ) (+1 squashed commits)
2017-10-20 18:02:52 +02:00
omar
695ea45fca
IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: #143 )
2017-10-20 17:59:48 +02:00
omar
564ff2dfd3
IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013 , #143 , #925 )
...
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
2017-10-20 17:52:22 +02:00
omar
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
2017-10-20 17:29:52 +02:00
omar
e6f06627e9
Made the ImGuiWindowFlags_NoMove flag inherited from parent to child, so in a setup with RootWindow (no flag) -> Child (NoMove flag) -> SubChild (no flag) user won't be able to move the root window by clicking on SubChild. ( #1381 )
2017-10-20 16:13:13 +02:00
omar
3b485cda51
Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. ( #1381 )
...
broken by e56eba44fe (#1337 )
2017-10-20 16:09:24 +02:00
omar
87ae40843c
Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439)
2017-10-20 13:26:39 +02:00
omar
853018dd4d
Popups: Fixed a bug introduced in 1a35766356 which made the BeginPopupContextXXX functions create popups without border. (nb: all that border mess is going away in styling clean up)
2017-10-20 13:21:42 +02:00
omar
5f7299e15a
Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op.
2017-10-20 13:07:57 +02:00
omar
2a32a2e662
Demos: Tweaks of popups/context/menus section.
2017-10-20 12:38:48 +02:00
omar
e384078d7a
IO: reordering some supposedly private fields.
2017-10-19 22:49:36 +02:00
omar
51eed2f257
Merge branch 'master' into navigation
2017-10-19 19:42:27 +02:00
omar
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
2017-10-19 19:42:19 +02:00
omar
22977ffedb
Documentation: Extra comments + tweaks to make usage of long-line more bearable.
2017-10-19 19:30:46 +02:00
omar
d3c2e904d8
Internals: Added ImLinearSweep() helper.
2017-10-19 19:29:59 +02:00
omar
938f1b720f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-10-19 00:04:53 +02:00
omar
370a48c10b
Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir
2017-10-18 23:46:16 +02:00
omar
073dd60b4b
Merge branch 'master' into navigation
2017-10-18 19:55:34 +02:00
omar
a03093b2d4
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
2017-10-18 19:55:08 +02:00
omar
29a652adee
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
2017-10-18 19:51:32 +02:00
omar
a126c702d9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-18 13:09:28 +02:00
omar
ef3f87eec5
Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.
2017-10-18 13:08:25 +02:00
omar
1c4af303bf
Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy().
2017-10-18 13:08:14 +02:00
omar
bf778ebb7e
Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.
2017-10-18 13:06:49 +02:00
omar
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-10-17 16:20:35 +02:00
omar
03b76bf05b
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
2017-10-17 16:19:21 +02:00
omar
78a85ba3fe
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
2017-10-17 16:15:46 +02:00
omar
2739b6ebcd
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
2017-10-17 16:14:20 +02:00
omar
4aa9d2089d
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
2017-10-17 15:51:20 +02:00
omar
55d873875e
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
2017-10-17 15:47:55 +02:00
Gargaj
839067fda9
Capture/release window in DX9 implementation
...
This helps a lot when the user drags a slider but carries the cursor offscreen before releasing the button - without the capturing, the slider will "stick" to the mouse cursor even after the button has been released. (This should generally be added to all Windows implementations - I won't mind doing it if you think it's a good idea.)
2017-10-17 12:37:21 +02:00
omar
1a35766356
BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
2017-10-16 23:37:12 +02:00
omar
c76f014292
Fix IsItemHovered() issue on child by temporarily reverting 344d48be31. This is not the ideal solution. ( Fix #1370 )
2017-10-16 16:41:09 +02:00
omar
af565ea828
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
2017-10-16 02:41:28 +02:00
omar
7ea52ac1e4
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
2017-10-16 02:30:59 +02:00
omar
82a27fd3aa
Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled ( #787 )
2017-10-16 02:06:42 +02:00
omar
b70c2fa887
Nav: Internals: Moved some internal code to namespace, comments
2017-10-16 00:46:23 +02:00
omar
ae1866c424
Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. ( #787 ).
2017-10-16 00:38:42 +02:00
omar
97851f7376
Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). ( #787 )
2017-10-16 00:36:31 +02:00
omar
7d14262202
Nav: SetFocusID() update NavWindow and NavRectRel just as we get them. Needed by upcoming commit, committing separately as I'm curious if it has any side-effect. ( #787 )
2017-10-16 00:33:30 +02:00
omar
633f60cdb2
Update README.md
2017-10-15 21:30:06 +02:00
omar
83416fa5da
Merge branch 'master' into navigation
2017-10-15 21:28:17 +02:00
omar
e32569dd5a
ImDrawList: Fixed a bug in ChannelsMerge() leading to an extraneous draw call being created, which unexpectly led to more dramatic condition but to faulty draw command merging code. ( #1172 , #1368 )
2017-10-15 21:07:22 +02:00
omar
bebc49bc2a
Merge pull request #1368 from ripieces/rendering-issue-1172
...
ImDrawList: Merging issue fix.
2017-10-15 21:07:05 +02:00
Dominik Tugend
7a8eb5bdc9
Rendering issue fix
...
Fixes ocornut/imgui#1172
2017-10-15 19:27:53 +02:00
omar
d761825cfb
Nav: Renaming a field + Comments.
2017-10-15 17:57:15 +02:00
omar
ce7b04e8b9
Removed apparently unncessary code in InputFloatN() and InputInt().
2017-10-13 23:59:17 +02:00
omar
251bc6c22c
Update README.md
2017-10-13 21:29:31 +02:00
omar
b498856c9d
Update README.md
2017-10-13 20:05:50 +02:00
omar
dbab9b248a
Update README.md
2017-10-13 20:03:56 +02:00
omar
db5f1b79cd
Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker ( #787 )
2017-10-13 19:18:59 +02:00
omar
c42baf392a
Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.
2017-10-13 16:48:14 +02:00
omar
53780a4fcc
Nav: Shallow tweaks.
2017-10-13 16:23:44 +02:00
omar
f852b9a52a
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
2017-10-13 13:31:34 +02:00
omar
b667d5a9e7
Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )
2017-10-13 13:31:34 +02:00
omar
0371219222
Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. ( #787 )
...
May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().
2017-10-13 13:31:34 +02:00
omar
8b095e483b
Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h
2017-10-13 13:31:34 +02:00
omar
4be967823f
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
2017-10-13 13:30:28 +02:00
omar
48498b337d
Internals: SetActiveID window cannot be NULL
2017-10-13 13:07:07 +02:00
omar
4548bcb5c9
Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.
2017-10-12 02:09:13 +02:00
omar
17519c313a
Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() ( #787 )
2017-10-11 20:47:41 +02:00
omar
b05b31e690
Nav: Made NavWindow always refresh from NavId so we can lazily retrieve the window for user functions that don't have it. This is not required by current commit but I'd rather test it earlier. Idea: eventually if we switch to 64-bit identifiers we could reserve e.g. 20 bits to store a simplified window identifier so we can always retrieve a window from an id. ( #787 )
2017-10-11 20:37:45 +02:00
omar
f0d437dd9c
Nav: SetActiveId() uses SetActiveIDNoNav() to avoid duplicating logic. ( #787 )
2017-10-11 20:29:53 +02:00
omar
2047c58efb
Nav: Extract part of NavUpdate() into a saner NavScrollToBringItemIntoView() ( #787 )
2017-10-11 20:28:16 +02:00
omar
7a14d7dfdc
Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. ( #787 )
2017-10-11 19:05:36 +02:00
omar
3833f1f7a2
Merge branch 'master' into navigation
2017-10-11 15:38:33 +02:00
omar
43b4a81b3e
Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
2017-10-11 15:36:57 +02:00
omar
578a588c1d
Links
2017-10-11 15:26:35 +02:00
omar
4cfec4813e
Links
2017-10-11 15:24:54 +02:00
omar
c6e370a77a
TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
2017-10-11 15:16:11 +02:00
omar
69dd895358
Nav: Renaming NavInitDefaultRequest -> NavInitRequest
2017-10-06 15:54:29 -07:00
omar
4d83078885
Nav: Moving code next to its peers
2017-10-06 15:50:32 -07:00
omar
d2975115cd
Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)
2017-10-06 15:14:28 -07:00
omar
d91b093be6
Nav: Minor tweaks in NavProcessItem() used by ItemAdd()
2017-10-06 14:56:25 -07:00
omar
c3105919ba
Nav: Minor tweaks also toward removing processing from ItemAdd()
2017-10-06 14:51:15 -07:00
omar
d16309ca77
Internal: ItemAdd() minor shallow tweaks
2017-10-06 14:40:53 -07:00
omar
64ce83b9ed
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-10-06 14:27:29 -07:00
omar
042153d254
Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter
2017-10-06 14:23:18 -07:00
omar
acb6f12d2c
Removed extraneous calls to GetCurrentWindowRead() when we already have a ImGuiContext. Internal RenderXXX functions also don't need to write into the Accessed field at all.
2017-10-06 11:48:07 -07:00
omar
6e1199c603
Merge branch 'master' into navigation
2017-10-06 11:24:58 -07:00
omar
335c8dd159
Comments (clarifying whether types are to be considered as flags or regular, non combinable enums)
2017-10-06 11:23:08 -07:00
omar
f451785c9e
Nav: Shuffled code in ItemAdd() so that NavProcessItem() may have access to LastItemId (will be required by tabbing)
2017-10-06 10:17:01 -07:00
omar
e12cfa9dfd
Nav: Minor midying up and comments,
2017-10-06 09:44:50 -07:00
omar
40df7a5155
Nav: Removed possibly redundant test prior to calling NavProcessItem() from ItemAdd()
2017-10-06 09:40:13 -07:00
omar
a77dd02e8a
Nav: Moving code next to its peers
2017-10-05 22:06:46 -07:00
omar
f5bd4663dd
Nav: Moving the big chunk of code from ItemAdd() to NavProcessItem()
2017-10-05 22:02:13 -07:00
omar
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
2017-10-05 21:34:01 -07:00
omar
80c4e2fe7b
Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons.
2017-10-05 21:27:08 -07:00
omar
2f27b733be
Nav: Fixed uninitialized context variables for sanity.
2017-10-05 18:33:40 -07:00
omar
518f02f4de
Demo: better demo for SetKeyboardFocusHere()
2017-10-05 18:10:59 -07:00
omar
d851775c80
ColorButton: Reduced bordering artefact that would be particularly visible with opaque Col_FrameBg and FrameRounding enabled.
2017-10-05 17:55:27 -07:00
omar
f2c9bd8d4f
Nav: Fixed uninitialized context variables for sanity.
2017-10-05 16:39:59 -07:00
omar
726dcf0dd2
TextUnformatted(): minor tweak
2017-10-05 11:03:38 -07:00
omar
a0d724b450
Made AlignFirstTextHeightToWidgets() saner and faster (still disliking its name very much!)
2017-10-05 11:02:23 -07:00
omar
a3d0755181
Merge branch 'master' into navigation
2017-10-05 10:31:37 -07:00
omar
f326fac64a
Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). ( #787 )
2017-10-05 10:29:17 -07:00
omar
a8788e51a7
SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)
2017-10-05 09:53:07 -07:00
omar
63cd2bf9b1
Removed obsolete comment.
2017-10-05 09:40:06 -07:00
omar
b3099d650c
Examples: Adding Roboto to the commented-out font list, and removing the unnecessary ProggyClean from there.
2017-10-04 19:28:04 -07:00
omar
3ddcdcf6e7
Merge branch 'master' into navigation
2017-10-04 18:46:09 -07:00
omar
67ac7da30f
Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.
2017-10-04 18:13:57 -07:00
omar
89ab4b5e07
TODO update
2017-10-04 15:42:03 -07:00
omar
ae1a6dc075
Merge pull request #1352 from matiTechno/master
...
Comments: Fixed typo
2017-10-04 20:39:14 +02:00
omar
42ee537be3
Comments
2017-10-04 10:45:35 -07:00
omar
a56b71e866
Nav: Added code to render thin highlight type. ( #787 )
2017-10-04 10:44:27 -07:00
matiTechno
b36a043bbf
typo
2017-10-04 11:09:21 +02:00
omar
6ea90af6b7
Nav: Highlight clipped within host window then extruded out. ( #787 )
2017-10-03 13:53:17 -07:00
omar
cb4e6c8212
Nav: Selectable(): activating selectable also sets NavId + removed the MouseDelta test (added in 43ee5d73e9, #323 ) as I don't think it is needed. ( #787 )
2017-10-03 13:44:48 -07:00
omar
64a51327d3
Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) ( #787 )
2017-10-03 13:25:40 -07:00
omar
2ca1884a39
Merge pull request #1350 from benvanik/patch-2
...
Fix binary_to_compressed_c tool to return 0 when successful.
2017-10-03 20:52:30 +02:00
Ben Vanik
6ec50d6bf5
Fix binary_to_compressed_c tool to return 0 when successful
...
Returning 1 is seen as an error by many tools, making it tricky to integrate this into build systems as-is.
2017-10-03 11:45:25 -07:00
omar
74da533c93
Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) ( #787 )
2017-10-03 11:22:38 -07:00
omar
7f58bb03c1
Changed the internal name formatting of child windows to use slashes as separator, more readable.
2017-10-02 16:07:34 -07:00
omar
cbc9730798
Metrics: Draw window bounding boxes when hovering Pos/Size. List all draw layers, trimming empty commands like Render() does.
2017-10-02 16:07:33 -07:00
Anthony Pesch
c38526d14b
Completely clear font when rebuilding atlas.
...
Previously, IndexLookup was not cleared on each font, causing FindGlyph to return old glyphs when using MergeMode.
2017-10-01 23:40:29 -04:00
omar
491edfd8d8
Nav: Fixed a crash introduced yesterday.
2017-09-30 23:46:23 +02:00
omar
0046c618b0
Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight ( #787 , #1079 )
2017-09-30 00:47:07 +02:00
omar
ecd72cc0c7
Nav: Disabled the final axial check when considering candidates in most situations except menubars.
...
It's definitively undesirable inside Menu as we want to catch nav request failures reliably.
I think it may be considered as an option if we find this desirable i some circumstances. Right now ideally I'd remove it totally but with current scoring setup, without it we can't easily reach the Window Close button. (#787 )
2017-09-30 00:26:55 +02:00
omar
88a354585a
Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. ( #787 , #126 )
...
Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)
2017-09-29 23:39:34 +02:00
omar
587e637db0
Nav: Taking note that we should aim to remove MenuBarAppending later.
2017-09-29 23:37:14 +02:00
omar
1eaa9d0621
Nav: Fixed uninitialized variable (that had no side-effects due to the code/data flow involved)
2017-09-29 23:37:14 +02:00
omar
f4e4c38705
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
2017-09-29 23:37:14 +02:00
omar
9912f7eef8
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
2017-09-29 22:19:53 +02:00
omar
cf3b21179b
Nav: Comments
2017-09-29 20:03:02 +02:00
omar
5a9ebeca9e
Nav: Fix typo from 9712a81f85
2017-09-29 19:49:20 +02:00
omar
bfaa426f7f
Nav: Minor tidying up (adding local variables to be a little more sane).
2017-09-29 19:48:16 +02:00
omar
8a5a29f0be
Nav: Renamed internal field.
2017-09-29 19:28:19 +02:00
omar
9712a81f85
Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data.
2017-09-29 19:26:03 +02:00
omar
54eb4c485e
Nav: Marked misleading/broken code that will never execute.
2017-09-29 19:15:24 +02:00
omar
e3c89aeb10
Nav: Fixed menuitems/selectable on menu layer (layer 1) from storing themselves in wrong layer of LastNavIds when hovered.causing inconsistencies and bugs when hovering menu with mouse then pressing ALT to return to layer 0).
...
NB: this is not a new bug introduced by the previous commit (which is related to nav layers), bug has been there for a while. (#787 )
2017-09-29 18:24:43 +02:00
omar
9737efb2f1
Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. ( #787 )
2017-09-29 17:58:25 +02:00
omar
8a814487fe
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-29 16:30:43 +02:00
omar
fba9353c60
BeginMenu: Shuffling braces around to clarify flow
2017-09-29 16:29:00 +02:00
omar
cf308f4039
Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer ( #787 )
2017-09-29 00:20:51 +02:00
omar
f4398226cc
Nav: Support for fallback horizontal scrolling with PadLeft/PadRight (nb: fallback scrolling is only used to navigate windows that have no interactive items). ( #787 )
2017-09-29 00:01:26 +02:00
omar
30b1d85962
Nav: Commiting some better organized Debug helper because this going to stay for a bit.
2017-09-28 23:48:30 +02:00
omar
3b85a8b6a0
Demo: Added an extra test related to baseline and fixed an id collision.
2017-09-28 22:01:08 +02:00
omar
164f22d5b7
Comments
2017-09-28 22:00:49 +02:00
omar
1f7f54e196
Removed extraneous test.
2017-09-28 22:00:17 +02:00
omar
c0cf123e0b
Update README.md
2017-09-28 20:39:36 +02:00
omar
df366b230e
ColorPicker4: Use nav flag to provide a slighly better experience when using navigation ( #787 , #346 )
2017-09-28 20:22:30 +02:00
omar
7c2926de17
Demo: Added an extra test related to baseline and fixed an id collision.
2017-09-28 20:15:32 +02:00
omar
2d859dee4e
Nav: Added ImGuiItemFlags_NoNav item flag
2017-09-28 19:58:01 +02:00
omar
878fa96896
Nav: Re-arranged ItemAdd() to maximize early out ( #787 )
2017-09-28 19:57:24 +02:00
omar
dd0855de5c
ButtonBehavior: Tidying up.
2017-09-28 19:47:45 +02:00
omar
4b4e455c40
Nav: Internal nenaming
2017-09-28 19:41:30 +02:00
omar
50ba543743
Comments
2017-09-28 19:35:10 +02:00
omar
e0a2a832cd
Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent ( #787 )
2017-09-28 19:18:41 +02:00
omar
af38749ea1
Nav: Fixed ButtonBehavior mistakenly setting active id when the Activate button is held and we have a new NavId, which affected browsing some popups ( #787 )
2017-09-28 19:07:52 +02:00
omar
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-28 17:40:25 +02:00
omar
e8f7c83138
Begin: Shallow tweak to minimize diff with nav branch
2017-09-28 17:37:55 +02:00
omar
926c1cf9a4
Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag
2017-09-28 17:02:28 +02:00
omar
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
2017-09-28 16:41:01 +02:00
omar
9142002121
Separator(): Tweak Logging so that the separator text is aligned according to tree padding.
2017-09-28 16:40:28 +02:00
omar
d394c7ad0b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-28 15:45:35 +02:00
omar
0106dcbd02
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
2017-09-28 15:43:26 +02:00
omar
2a8eb618dc
Nav: Fixed NavDown to open menu from a menu bar ( #787 )
2017-09-28 00:36:58 +02:00
omar
35f65e05ed
Merge branch 'master' into navigation
2017-09-28 00:33:29 +02:00
omar
fafe65a8fc
Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.
2017-09-28 00:21:47 +02:00
omar
2159629e9e
Removed another msileading difference between the hovered functions (IsWindowContentHoverable() uses the root window already). Sorry for the commit spam! (making small commit to easily be able to Bisect those in case I make a mistake)
2017-09-28 00:05:35 +02:00
omar
eca74d55c7
IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces.
2017-09-28 00:05:18 +02:00
omar
2b7d4c713e
Internals: Moved IsWindowContentHoverable() in the file
2017-09-27 23:31:03 +02:00
omar
c5a79deb38
IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces.
2017-09-27 23:10:46 +02:00
omar
7bcb1d3816
Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this
2017-09-27 22:59:40 +02:00
omar
79ef64430c
Nav: Fixed merge cc26db8ec7
2017-09-27 17:27:21 +02:00
omar
cc26db8ec7
Merge branch 'master' into navigation
2017-09-27 17:25:50 +02:00
omar
0adcddac39
IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing.
2017-09-27 17:21:50 +02:00
omar
19e22baa06
ItemAdd(): more re-ordering of tests to match IsHovered() + comments
2017-09-27 17:06:07 +02:00
omar
344d48be31
IsItemHovered(), ItemAdd(): Fixed seemingly unnecessary comparaison of root windows, makes IsItemHovered() more consistent with internal IsHovered().
...
Original test was added in 6e99688fa7 should not have been using RootWindow in the first place.
The difference between public-facing and internal versions would only be noticeable with overlapped child windows, which doesn't really happen anyway
2017-09-27 16:49:25 +02:00
omar
c075786d8b
ItemAdd(): re-ordering the tests, submission should now be faster.
2017-09-27 16:29:46 +02:00
omar
99c7622a1b
ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().
2017-09-27 16:20:53 +02:00
omar
e87ad328e4
Moved implementation of Hovered-related functions next to each others + comments, before I attempt to work on them. No functional change here.
2017-09-27 16:07:47 +02:00
omar
842e88a8e3
Examples: Avoid using ImColor() to not tempt newcomers into looking at it
2017-09-27 15:47:08 +02:00
omar
869732c456
Nav: Removed unnecessary combo code (that kept the combo arrow highlighted after reverting to mouse controls). ( #787 )
2017-09-27 12:34:18 +02:00
omar
a2b2e56e8e
Merge branch 'master' into navigation
2017-09-27 12:31:12 +02:00
omar
e56eba44fe
Fixed not being able to move a window by clicking on one of its child window ( #1337 , #635 ), broken by 313d388bba
2017-09-27 12:25:40 +02:00
omar
8374a454da
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
2017-09-27 11:39:13 +02:00
omar
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
2017-09-27 11:21:42 +02:00
omar
bbd6d5d5b5
Combo: Cleaned up, removed unnecessary code (looks like this part went untouched for a long time!).
2017-09-27 00:20:09 +02:00
omar
8fd4beddb8
Merge branch 'master' into navigation
2017-09-26 20:28:40 +02:00
omar
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
2017-09-26 20:24:27 +02:00
omar
501e73feed
Minor comments
2017-09-26 20:18:14 +02:00
omar
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
2017-09-26 20:05:16 +02:00
omar
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
2017-09-26 19:54:30 +02:00
omar
072d6d8cb5
ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited)
2017-09-26 19:26:16 +02:00
omar
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
2017-09-26 19:10:29 +02:00
omar
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
2017-09-26 18:41:21 +02:00
omar
f1a20ec66d
Merge branch 'master' into navigation
2017-09-26 16:54:37 +02:00
omar
be03882a15
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
2017-09-26 15:43:48 +02:00
omar
c7a606ab7e
Horizontal layout does the minimum job to be usable internally - not exposed ( #97 )
2017-09-26 15:42:55 +02:00
omar
728deff56c
Comments, debug code (commented), todo list
2017-09-26 15:33:57 +02:00
omar
99b9f1c93c
Fix static misusage error with decent compilers. Error introduced in 4b82759598
2017-09-26 11:23:06 +02:00
omar
82748df71a
WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. ( #621 )
2017-09-26 01:12:09 +02:00
omar
69d0d33451
Exposed PushMultiItemsWidths() to imgui_internal.h
2017-09-25 22:45:10 +02:00
omar
9577ebf008
Merge branch 'master' into navigation
2017-09-25 22:14:37 +02:00
omar
24f21bd4d4
Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem
...
MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated)
2017-09-25 22:13:38 +02:00
omar
7e8069dd23
Merge branch 'master' into navigation
2017-09-25 22:08:38 +02:00
omar
c0547d358d
Begin: Fixed auto-fit calculation code that predict the presence of ascrollbar so it works in the case size constraints are used. I actually don't need this fix now, but earlier experiment with BeginCombo() required this fix.
2017-09-25 22:04:39 +02:00
omar
4b2781fe87
Begin: Moving some code into a CalcSizeAutoFit() function.
2017-09-25 21:57:42 +02:00
omar
0d56140b4a
BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
...
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
2017-09-25 21:45:34 +02:00
omar
a34edb810e
Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes)
2017-09-25 21:12:07 +02:00
omar
4b82759598
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
...
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
2017-09-25 18:25:43 +02:00
omar
0a55573288
Begin(): Minor tidying up of flow
2017-09-25 15:48:52 +02:00
omar
9f34925b2a
Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect
2017-09-25 13:23:25 +02:00
omar
0a5fb24f10
Popups: Exposing a little more of popups internals in imgui_internals.h
2017-09-25 12:52:06 +02:00
Jefferson Montgomery
3fd5790814
Pass render target format in ImGui_ImplDX12_Init() instead of hard-coded.
2017-09-24 14:57:46 -07:00
Jefferson Montgomery
f6b6dace9e
Pass command list in using ImGui_ImplDX12_NewFrame() instead of ImGui_ImplDX12_Init()
2017-09-24 14:43:46 -07:00
Jefferson Montgomery
f72b95d73f
Merge 'ocornut/master' into 'jdmo3/master'
2017-09-24 14:43:11 -07:00
omar
3dd3d0b248
Examples: DirectX11: allow creating device with feature level 10 sinec we don't really need much for that example. ( #1333 )
2017-09-24 12:54:49 +02:00
omar
b9c185402e
Nav: minor tidying up NavUpdate() to use a local variables, easier to test replacing g.NavWindow with g NavMoveResultWindow for navigation accross flattened child windows.
2017-09-20 23:58:56 +02:00
omar
113b2467cd
Minor bits. Reduce usage of GImGui multiple times in same function.
2017-09-20 23:02:06 +02:00
omar
229921541b
TODO list
2017-09-20 18:54:36 +02:00
omar
9b2672a99f
Update README.md
2017-09-19 18:33:04 +02:00
omar
2fc07c1b7d
Update README.md
2017-09-19 18:32:09 +02:00
omar
ba12d37719
Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
...
FIxes zealous Clang warning.
2017-09-19 18:18:53 +02:00
omar
479e532f18
ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)
2017-09-18 21:41:49 +02:00
omar
92e55a8a79
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-09-18 16:06:48 +02:00
ocornut
d5d825debb
Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ( #323 )
...
Missing support Vulkan (#549 ), Apple (#575 , #247 ), SDL (#58 , #356 ),
Allegro, Marmalade (#368 , #375 )
2017-09-18 16:04:44 +02:00
omar
1ff27d7db8
Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. ( #787 )
2017-09-18 16:04:28 +02:00
omar
f24b5f71ca
Merge branch 'master' into navigation
2017-09-18 15:35:47 +02:00
omar
79ce9b74d5
BeginTooltipEx() internal tweaks
2017-09-18 15:35:00 +02:00
omar
44e8d94aba
Merge branch 'master' into navigation
2017-09-18 15:32:31 +02:00
omar
105f3b14e4
Merge branch 'master' into styles
2017-09-18 15:11:51 +02:00
omar
564c97b87e
Comments
2017-09-18 15:11:22 +02:00
omar
f0f86213db
ImVector: added resize() variant with initialization value
2017-09-18 15:11:05 +02:00
omar
b409d399c8
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
2017-09-18 15:09:11 +02:00
omar
9693fd5351
PushStyleVar/PopStyleVar: internal tweaks
2017-09-18 15:07:22 +02:00
omar
7c9e38f60a
Style: Moving code in a function to make incoming diff easier to parse.
2017-09-18 15:06:54 +02:00
omar
709653c330
Merge branch 'master' into styles
2017-09-18 15:03:25 +02:00
omar
6c91a1ef7f
Minor comments
2017-09-17 23:35:39 +02:00
omar
2aa9a538c0
Merge pull request #1323 from waywardmonkeys/remove-commas-at-end-of-list
...
Remove commas after last item in enumeration to stay compatible with older compilers.
2017-09-15 11:52:14 +02:00
omar
c4c042bcec
Typo
2017-09-15 01:32:29 +02:00
omar
052999a6ab
More consistently uses "Dear ImGui"
2017-09-15 01:31:41 +02:00
omar
83645aa593
More consistently uses "Dear ImGui"
2017-09-15 01:28:30 +02:00
Bruce Mitchener
2fcdeb7f12
Remove commas after last item in enumeration.
...
This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions.
2017-09-14 10:35:30 +07:00
Bruce Mitchener
4c794be41d
Improve warning configuration for clang.
...
Clang 4.0 introduced -Wdouble-promotion, so check for and disable
that on clang as we do on gcc.
The old style casts warning is already disabled globally in this file
for clang, so it doesn't need to be re-disabled within this scope.
2017-09-14 10:28:18 +07:00
omar
54d30d758f
Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags
2017-09-12 13:16:27 +02:00
omar
65632d2682
Fixed alloca include for SunOS ( #1319 )
2017-09-12 11:55:13 +02:00
omar
3420080a35
Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut
...
Simplify alloca.h include condition (fix for NetBSD)
2017-09-11 11:00:23 +02:00
Daniel Loffgren
cf6ba9dd2d
Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h
2017-09-11 00:15:43 -07:00
omar
66a9d4856c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-09-06 20:37:29 +02:00
omar
cb2775ae54
Internals: ImGuiItemFlags comments
2017-09-06 20:36:36 +02:00
omar
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 20:33:39 +02:00
omar
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
2017-09-06 20:28:36 +02:00
omar
51fcef0c21
BeginCombo() tweaks, merged from Navigation branch.
2017-09-06 19:31:50 +02:00
omar
38ed66f55e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-09-06 19:25:07 +02:00
omar
9e2f202f05
Demo: Not using the undesirable Begin() overload.
2017-09-06 19:24:08 +02:00
omar
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 19:17:51 +02:00
omar
2169bf6895
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )
2017-09-06 17:25:36 +02:00
omar
790605e359
Minor comments + renaming internal fields
2017-09-06 17:20:54 +02:00
omar
8971d70149
Merge pull request #1313 from thevaber/master
...
Improved ColorPicker hue wheel color interpolation
2017-09-05 18:35:08 +02:00
Václav Patejdl
e1a7aa41cb
Improved ColorPicker hue wheel color interpolation
2017-09-05 16:31:54 +02:00
omar
2600b28f5d
Begin(): fixed calling Begin() more than once per frame setting window_just_activated_by_user which in turn would set Appearing to true for that frame.
2017-09-04 13:29:57 +02:00
omar
6400f2900a
Begin(): renamed locals.
2017-09-04 13:26:46 +02:00
omar
a9c6a0f6ec
Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)
2017-09-04 13:24:45 +02:00
omar
89cae37b49
Begin(): Tidying up some code, should be a no-op.
2017-09-04 13:05:20 +02:00
omar
8fbe8709f9
TODO, minor tweak
2017-09-04 13:03:04 +02:00
omar
e8dbf1c795
Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
2017-09-01 22:10:13 +02:00
omar
5658675e9d
Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)
2017-09-01 21:58:58 +02:00
omar
804ee78731
Added IsWindowAppearing().
2017-09-01 21:55:59 +02:00
omar
fd684ba974
Removed 2 obsolete redirection functions (obsoleted 26+ months ago).
2017-09-01 17:43:56 +02:00
omar
b8ade0b94f
Examples: Main: Removed call to SetNextWindowSize()
2017-09-01 17:07:19 +02:00
omar
4abce8af58
Examples: GL2: Renaming, comments.
2017-09-01 17:07:19 +02:00
omar
5665f1d3e3
Merge branch 'nlguillemot-master'
2017-09-01 16:55:36 +02:00
omar
d9016964ad
Examples: GL3: Comments, tweaks ( #1145 )
2017-09-01 16:55:04 +02:00
omar
c47e5fc76a
Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
2017-09-01 16:49:36 +02:00
omar
7d1f2c0dc5
Examples: GL2: rename functions to include GL2 in name
2017-09-01 16:45:31 +02:00
omar
d165817880
Merge pull request #1307 from JJscott/dev
...
Examples: OpenGL: Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
2017-09-01 22:30:14 +08:00
unknown
cf48e28932
Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
2017-09-01 20:39:12 +12:00
Branimir Karadžić
670d40642f
Fixed C4267 conversion from size_t to int.
2017-09-01 14:42:49 +08:00
omar
6a1ba317c7
Demo: Minor coding style tweaks so bgfx copy needs less patching.
2017-08-29 19:05:56 +08:00
omar
1a62d46db5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-29 18:47:23 +08:00
omar
97a40e74fb
Nav: Fixed bad merge of 6def01be5d so the bug fixed in #840 wasn't fully fixed in Nav branch.
2017-08-29 18:45:58 +08:00
omar
96d2942373
InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle).
2017-08-29 18:40:14 +08:00
omar
9a0171b803
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-29 18:29:44 +08:00
omar
35e4fa7b85
Merged from Navigation branch (DragBehavior)
2017-08-29 18:21:36 +08:00
omar
6cca4025ee
Merge from Navigation branch: 6aa8019763
2017-08-29 17:56:53 +08:00
omar
ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
2017-08-29 17:27:19 +08:00
omar
550dc09998
Merged from Navigation branch (misc)
2017-08-29 17:12:18 +08:00
omar
aef041f948
Merged from Navigation branch
2017-08-29 17:09:56 +08:00
omar
c9298c2657
Merged from Navigation branch:
...
f71cdd13b7 Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code.
c816e6c742 Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). (#323 , #246 )
2017-08-29 17:09:44 +08:00
omar
287a4b6b38
Merged from Navigation branch: 5cac4926c8 fix title bar color of window under a modal window.
2017-08-29 16:52:37 +08:00
omar
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-08-29 16:21:46 +08:00
omar
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
2017-08-29 16:13:17 +08:00
omar
1f1e63f705
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. ( #787 )
2017-08-29 16:06:52 +08:00
omar
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
2017-08-29 16:05:12 +08:00
omar
6752cba4bc
Removed duplicate comments
2017-08-29 15:39:11 +08:00
omar
2ee1b70652
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-08-29 15:36:36 +08:00
omar
0ba3cadb88
RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ( #1296 )
2017-08-29 15:25:05 +08:00
omar
f8eef49575
ProgressBar() fixed rendering when straddling rounded area. ( #1296 )
2017-08-29 15:23:07 +08:00
omar
01d4bf299a
Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. ( #1296 , #76 )
2017-08-29 15:22:30 +08:00
omar
f0fa17b5e0
ImDrawList: Minor renaming
2017-08-29 15:10:03 +08:00
omar
7a9ea281be
ImSwap() helper.
2017-08-28 19:27:12 +08:00
omar
808d631e35
imDrawList: PathArcTo() returns when passed zero radius.
2017-08-28 16:02:25 +08:00
omar
e1d81f4dc5
ImDrawList: Minor tidying up.
2017-08-28 14:12:55 +08:00
omar
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
2017-08-28 14:11:11 +08:00
omar
7a7327adde
ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.
2017-08-28 13:19:36 +08:00
omar
0d4b08a851
Added Go binding link
2017-08-28 12:14:29 +08:00
omar
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-26 18:43:10 +08:00
omar
b295e185ff
Updated copyright date for 2017, updated Gallery link
2017-08-26 16:42:40 +08:00
omar
419b22a487
Internals: Split some code out of NewFrame() into an Initialize() function.
2017-08-26 16:35:39 +08:00
omar
5938f1ba61
Added IsMousePosValid() helper.
2017-08-26 15:18:06 +08:00
omar
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
2017-08-26 14:11:56 +08:00
omar
304de0ee1b
ImFontConfig: Comments, const.
2017-08-26 14:11:41 +08:00
omar
a02210a455
Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
2017-08-26 00:31:44 +08:00
omar
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
2017-08-25 16:43:25 +08:00
omar
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
2017-08-25 16:10:14 +08:00
omar
40f608ce9b
Version 1.52 WIP
2017-08-25 15:12:12 +08:00
omar
55a6209931
Version 1.51
2017-08-25 00:29:59 +08:00
omar
e6ed2f9939
Nav: Tooltip do not appear in navigation focus list. ( #1294 , #787 )
2017-08-25 00:06:57 +08:00
omar
82c3116b4f
Demo: Displaying version number in test window.
2017-08-24 17:32:03 +08:00
omar
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4) ( #707 )
2017-08-24 17:30:10 +08:00
omar
b0fc30bd19
Merge branch 'master' into navigation
2017-08-22 20:49:02 +08:00
omar
7c5556c921
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-22 20:48:36 +08:00
omar
92efa00bc9
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
2017-08-22 20:44:39 +08:00
omar
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-08-22 20:27:39 +08:00
omar
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
2017-08-22 20:25:27 +08:00
omar
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
2017-08-22 20:23:46 +08:00
omar
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
2017-08-22 20:10:02 +08:00
omar
2e35957a81
Undo reordering of ImGuiKey in Nav branch
2017-08-22 20:02:52 +08:00
omar
8581050002
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-08-22 19:55:59 +08:00
omar
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
2017-08-22 19:51:12 +08:00
omar
8e89809078
Merge branch 'master' into navigation
2017-08-22 19:48:01 +08:00
ocornut
2ad2190d47
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
2017-08-22 19:47:52 +08:00
omar
f3ab5e6252
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) ( #787 ). Thanks @Grouflon
2017-08-22 19:43:49 +08:00
omar
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )
2017-08-22 19:26:21 +08:00
omar
ce7f3d4831
Merge branch 'master' into navigation
2017-08-22 18:27:29 +08:00
omar
444792f75f
Merge fixes from ,master branch
2017-08-22 18:27:23 +08:00
ocornut
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
2017-08-22 18:26:27 +08:00
omar
7de68fbe3d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-08-22 18:22:41 +08:00
omar
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
2017-08-22 18:13:10 +08:00
omar
9670fe9ca7
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-08-22 17:51:20 +08:00
omar
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
2017-08-22 17:46:50 +08:00
omar
6c82af2b96
Navigation branch fix (we changed Clip)
2017-08-22 17:44:49 +08:00
omar
543dc2817f
Fixed an assert when calling CloseCurrentPopup() twice in a row.
2017-08-21 22:54:20 +08:00
omar
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-08-21 00:04:45 +08:00
omar
530baee1a7
Removed tabs that slipped through the cracks
2017-08-21 00:03:37 +08:00
omar
9b484d24cd
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
2017-08-20 23:45:02 +08:00
omar
067127f113
Columns: Caching columns clipping rectangles ( #125 )
2017-08-20 23:17:59 +08:00
omar
adeaf1cd72
Columns: Moved PushColumnClipRect() to imgui_internal.h
2017-08-20 23:09:43 +08:00
omar
54bdd00df7
Columns: Fix for explicit content width and scrollbar. ( #519 , #125 )
2017-08-20 21:32:18 +08:00
omar
ea493fd8da
Merge branch 'ggtucker-master'
2017-08-20 21:09:22 +08:00
omar
83e8d10fab
Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. ( #125 , #913 , #893 , #1138 )
2017-08-20 21:08:07 +08:00
omar
1ebd7ec049
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. ( #519 , #125 , #913 )
2017-08-20 20:58:24 +08:00
omar
7ff1c149b5
Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. ( #913 , #125 )
2017-08-20 20:58:24 +08:00
omar
1c83b073c6
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. ( #519 , #125 , #913 )
2017-08-20 20:58:23 +08:00
omar
7f0063f858
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). ( #913 , #125 )
2017-08-20 19:32:50 +08:00
omar
e70d49ba1f
Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). ( #913 , #125 )
2017-08-20 19:32:50 +08:00
omar
9307631c90
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. ( #913 , #125 ). End() calls EndColumns() directly.
2017-08-20 19:32:50 +08:00
omar
a511b00226
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. ( #913 , #125 )
2017-08-20 19:32:50 +08:00
omar
3bf2af23e6
Columns: Fixed EndColumns() not repositioning the cursor. ( #913 )
2017-08-20 18:44:54 +08:00
omar
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
2017-08-20 18:44:48 +08:00
omar
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-08-20 18:22:34 +08:00
omar
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
2017-08-20 17:53:09 +08:00
omar
af2db53780
Added GetStyleColorVec4()
2017-08-20 17:50:25 +08:00
omar
cf84650ee8
GCC warnings fixes
2017-08-20 16:39:43 +08:00
omar
fd394e1e95
Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
2017-08-20 16:39:11 +08:00
omar
1065a7b95b
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
2017-08-20 15:38:05 +08:00
omar
91d841dd5f
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
2017-08-20 15:28:12 +08:00
omar
3b11e73333
Examples: gitignore added patterns for modern MSVC versions
2017-08-20 15:17:37 +08:00
omar
bf0d9c123e
Merge branch 'master' into navigation
2017-08-18 00:25:12 +08:00
omar
8be7a60f20
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
2017-08-17 21:19:54 +08:00
omar
1086c87767
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
2017-08-17 21:13:14 +08:00
omar
4075cc58e9
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ( #618 )
2017-08-17 20:44:44 +08:00
omar
d970957e2d
ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)
2017-08-17 19:36:48 +08:00
omar
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
2017-08-17 17:24:33 +08:00
omar
4a7e1ff4d4
ImFontAtlas: Some shallow renaming + added an assert for clarification
2017-08-17 15:35:59 +08:00
omar
52f1a4124c
Demo: Tweaked Fonts section.
2017-08-17 13:56:16 +08:00
omar
c569676a7b
ImVector: Added a const
2017-08-17 11:46:25 +08:00
omar
0be4f66d89
ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618 )
2017-08-17 11:46:25 +08:00
omar
34d09f2dc8
Merge pull request #1283 from onqtam/imgui_api
...
Added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
2017-08-16 23:29:52 +08:00
Viktor Kirilov
fd9460a087
added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
2017-08-16 17:52:11 +03:00
omar
68bf5ecbc1
Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME
2017-08-16 17:51:44 +08:00
omar
a85a14370b
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
2017-08-16 15:47:10 +08:00
omar
a9915681eb
PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) ( #747 )
2017-08-16 14:37:54 +08:00
omar
5ea1865fdb
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
2017-08-16 14:24:41 +08:00
omar
638d77c682
Comments ( #402 )
2017-08-16 14:19:48 +08:00
omar
e8dd435ccd
Merge branch 'mkeeter-is-popup-open'
2017-08-16 13:43:02 +08:00
omar
d2259f65e5
Undo part of 32dbe836d0 to keep the same name for both overloads ( #891 , #799 )
2017-08-16 13:42:41 +08:00
omar
f98376d02b
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
...
# Conflicts:
# imgui.cpp
2017-08-16 13:19:15 +08:00
omar
a83f7083ed
BeginPopupEx() uses ImGuiID internally
2017-08-16 13:06:14 +08:00
omar
e682362f35
TODO list update, comments
2017-08-16 12:54:51 +08:00
omar
f827c8448a
Merge pull request #1282 from jadwallis/master
...
ImFontAtlas: Make font atlas padding between packed glyphs configurable
2017-08-16 10:45:07 +08:00
James Wallis
9239e91dc9
Whitespace fix to previous
2017-08-15 14:12:32 +01:00
James Wallis
718f00d651
Make font atlas packing padding configurable
2017-08-15 14:11:04 +01:00
omar
1e162dfc74
PushStyleVar/PopStyleVar: internal tweaks
2017-08-15 19:19:00 +08:00
omar
18f217e631
Style: Moved position of ImGuiCol_TitleBgCollapsed
2017-08-15 19:06:02 +08:00
omar
5429bd892e
ColorEdit4: Added "Copy as..." option in context menu ( #346 )
2017-08-15 18:30:52 +08:00
omar
668a4bf1bc
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
2017-08-15 17:48:41 +08:00
omar
0f935248e3
Combo, Inputint, InputFloat, ColorEdit4 all use the small size for little square
2017-08-15 17:46:11 +08:00
omar
18b50f8eba
Comments
2017-08-15 11:41:36 +08:00
omar
f8f382221c
ImVector: added resize() variant with initialization value
2017-08-15 11:41:00 +08:00
omar
032c222d57
Merge branch 'master' into styles
2017-08-15 10:52:38 +08:00
omar
9bf5028fd3
Merge branch 'master' into navigation
2017-08-15 00:50:59 +08:00
omar
01b99bbe09
TODO list update
2017-08-15 00:36:15 +08:00
omar
cd17af0d33
Renamed
2017-08-15 00:09:03 +08:00
omar
03aae93f3e
TODO list update (merging a first batch of things I had laying around, +60 entries)
2017-08-14 21:14:42 +08:00
omar
7b7845d764
ImFont::CalcWordWrapPositionA: minor optimization
2017-08-14 21:00:44 +08:00
omar
a6d69f04c0
PlotHistogram: bars are drawn based on the position of zero ( #828 )
2017-08-14 17:20:05 +08:00
omar
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
2017-08-14 16:53:38 +08:00
omar
3d6e037c23
Comments ( #1034 )
2017-08-14 16:51:14 +08:00
omar
bd3dfc0eba
Moved TODO list to TODO.txt
2017-08-14 16:51:14 +08:00
omar
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
2017-08-14 16:50:20 +08:00
omar
c26b29b254
Style: Moving code in a function to make incoming diff easier to parse.
2017-08-14 15:14:46 +08:00
omar
2b7fe73a08
Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set ( #1048 , #1056 )
2017-08-14 13:27:19 +08:00
omar
c1e1e015c4
Style: Tweaked default border (which is off by default) to be less noticeable ( #707 , #1019 )
2017-08-14 13:07:55 +08:00
omar
97fccbdb73
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
2017-08-14 13:05:03 +08:00
omar
648f75b245
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. ( #707 , #1019 )
2017-08-14 13:04:32 +08:00
omar
6a4064e5f2
PathArcToFast: Minor renaming for clarification. Comments.
2017-08-14 12:25:35 +08:00
omar
8c61a4eb4c
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
2017-08-14 11:29:54 +08:00
omar
41076188ca
Merge pull request #1277 from luk1337/master
...
ColorPicker: Fix broken ImGuiColorEditFlags_NoAlpha flag check - not restoring Alpha when clicking on reference color.
2017-08-12 12:53:13 +08:00
LuK1337
8352d43a0c
Fix broken ImGuiColorEditFlags_NoAlpha flag check
...
* Fixes warning:
imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
2017-08-11 22:52:40 +02:00
omar
908b025c3c
Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation ( #1000 ) + minor FAQ tweaks
2017-08-12 01:23:39 +08:00
omar
0f126a5b07
Update README.md (small wording bits, inspired by #1093 )
2017-08-12 01:05:24 +08:00
omar
b4fe5d36a4
Examples: OpenGL3+SDL: Fix types to uses GlEnum ( #1147 )
2017-08-12 00:46:58 +08:00
omar
048322f3fd
Merge pull request #1147 from TinyTinni/master
...
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147 )
2017-08-12 00:43:34 +08:00
omar
5eef7dd82f
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
2017-08-12 00:43:55 +08:00
omar
08265bfbd9
RenderArrow(): fix warning. re-orderer lines to match enum order.
2017-08-11 14:44:53 +08:00
omar
e3fae56089
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-08-11 14:30:17 +08:00
omar
d7cad903aa
Documentation tweaks
2017-08-11 14:29:27 +08:00
omar
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-08-11 13:44:25 +08:00
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
53d1b1e929
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. ( #346 )
2017-08-10 10:25:50 +08:00
omar
fed18d3203
Removed old ValueColor() helpers. ( #346 )
2017-08-09 23:04:26 +08:00
omar
fc5ab0cb8d
RenderCheckMark() tidying up
2017-08-09 22:56:01 +08:00
omar
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
2017-08-09 22:42:03 +08:00
omar
43e2abbee3
Comments, FAQ entry ( #586 , #1105 )
2017-08-09 20:27:59 +08:00
omar
55b99d753c
Minor string typo
2017-08-08 23:12:23 +08:00
omar
059e838b2c
Merge branch 'master' into navigation
2017-08-08 18:04:38 +08:00
omar
be9628494a
Demo: Rearranged everything under Widgets in a more consistent way.
2017-08-08 18:04:31 +08:00
omar
453ad17a09
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-08-08 17:50:08 +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
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-08-08 17:30:32 +08:00
omar
a78ef7a369
Comments
2017-08-08 16:07:17 +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
a4012fd5b2
Merge branch 'master' into 2016-02-colorpicker
2017-08-08 11:30:10 +08:00
omar
23fae61109
Merge branch 'master' into 2016-07-navigation
...
# Conflicts:
# imgui.cpp
2017-08-08 11:29:54 +08:00
omar
b5ad88627d
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
2017-08-08 11:27:48 +08:00
omar
a1bcc8392e
Fixed GetScrollMaxX() debug left-over from 7096fd8500 ( #1271 )
2017-08-08 11:15:34 +08:00
omar
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2017-08-07 22:51:18 +08:00
omar
1c991b525a
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2017-08-07 22:34:30 +08:00
omar
0ab722c3c5
Columns: First first column appearing wider than others ( #1266 )
2017-08-07 22:28:09 +08:00
omar
d43c25d8f4
SetScrollHere() tweak to make the code a little less confusing
2017-08-07 21:54:41 +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
7096fd8500
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. ( #1271 , #246 )
2017-08-07 19:41:22 +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
6d60e0fc58
Fonts readme tweaks, links
2017-08-07 15:21:21 +08:00
omar
f4c0134f9f
Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment ( #346 )
2017-08-06 18:08:58 +08:00
omar
cdea8ca94f
Demo: Comment about 'static' and some tweaks ( #1267 )
2017-08-06 11:07:52 +08:00
omar
46c73cccff
Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) ( #1252 )
2017-08-05 19:47:52 +08:00
omar
d762f1dbfb
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). ( #1262 )
2017-08-05 19:15:03 +08:00
omar
95f2706d1c
Clipboard: [windows] Fixed not closing win32 clipboard on early return. ( #1264 )
2017-08-05 16:05:48 +08:00
omar
40ac84d701
DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. ( #671 )
2017-08-03 16:41:29 +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
fb54dce71c
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
2017-07-31 21:11:41 +08:00
omar
1a26d0bc98
Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
2017-07-31 18:56:51 +08:00
omar
72da4081f8
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
2017-07-31 17:54:40 +08:00
omar
2f508c7073
ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). ( #346 )
2017-07-31 17:32:07 +08:00
omar
10ef5a63f0
ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. ( #346 )
2017-07-31 16:50:28 +08:00
omar
cc3cce7567
Comments, minor tidying up.
2017-07-31 16:48:45 +08:00
omar
e63ebd997f
Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
2017-07-31 12:25:27 +08:00
omar
70ee41b8b3
ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. ( #346 )
2017-07-31 12:08:20 +08:00
omar
4b2f157fb1
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ( #346 )
2017-07-31 11:50:14 +08:00
omar
efbb1ae04e
ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. ( #346 )
2017-07-30 23:22:48 +08:00
omar
3ee969c3e3
ColorPicker: Alpha bar using a checkerboard. ( #346 )
2017-07-30 23:11:59 +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
f6a89779c8
ColorEdit4: Hex input clamps integer components to 0..255 range during printout ( #346 )
2017-07-30 23:06:07 +08:00
omar
91a4f5df25
Demo: Tweaks
2017-07-30 18:28:59 +08:00
omar
e1a00c3d26
ColorButton: Added frame border when style border are off. ( #346 ) @jdumas
2017-07-30 18:09:34 +08:00
omar
65a27732d8
ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. ( #346 )
2017-07-30 17:57:38 +08:00
omar
90fcd4a829
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview ( #346 )
2017-07-30 17:55:42 +08:00
omar
3fe7739b5d
ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. ( #346 )
2017-07-30 17:53:37 +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
3ffcc72f98
ColorPicker: Better cursor/color preview over the color matrix. ( #346 )
2017-07-30 16:57:44 +08:00
omar
390188dfa9
Comments about parts of imgui_internal.h that will self-destruct.
2017-07-30 16:16:06 +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
db436b183b
Merge branch 'master' into 2016-02-colorpicker
2017-07-29 17:24:06 +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
e84224bcd5
ColorEdit4: Can open context menu from inputs/drags as well ( #346 )
2017-07-29 17:00:56 +08:00
omar
6c82572a35
ColorEdit4: Fixed not returning true when clicking on the Original/Ref color in Picker spawned from ColorEdit4 + shallow tidying up ( #346 )
2017-07-29 16:11:20 +08:00
omar
7537dff806
ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code ( #346 )
2017-07-29 15:54:45 +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
b1cbd87a94
ColorEdit4: Minor tidying up. ( #346 )
2017-07-27 16:49:57 +08:00
omar
bfec9c657e
ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. ( #346 )
2017-07-27 16:26:32 +08:00
omar
a9df6bfe86
ColorButton: Fixed rounding corners artefact when there is a single cell.
2017-07-27 14:04:58 +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
c1c2b2400a
ColorButton: Undo ce203f99f5
2017-07-27 11:04:39 +08:00
omar
2e37db9002
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 ( #346 )
2017-07-27 10:49:01 +08:00
omar
27e5b09af1
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview ( #346 )
2017-07-26 23:07:35 +08:00
omar
69dd1ed583
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). ( #346 )
2017-07-26 22:20:43 +08:00
omar
76bae2f015
ColorEdit, ColorPicker: Fixed broken build due to commiting an undesirable change in 78a8f798c5 ( #346 )
2017-07-26 17:46:48 +08:00
omar
19c6a9c0e0
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( ( #346 ) + comments
2017-07-26 17:38:33 +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
c84acf3f56
Comments
2017-07-26 15:59:57 +08:00
omar
ce203f99f5
ColorButton: Push a text baseline offset if higher than g.FontSize. ( #346 )
2017-07-26 15:52:17 +08:00
omar
78a8f798c5
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) ( #346 )
2017-07-26 15:24:09 +08:00
omar
df56879883
imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.
2017-07-26 14:53:15 +08:00
omar
9d0e5beaa7
GetColorU32(ImGuiCol): avoid using GImGui twice since some implementation make it a TLS-ish variable with non-trivial accessors.
2017-07-26 14:35:50 +08:00
omar
95fe11b5bf
Added GetColorU32(u32) variant that does the style alpha multiply without a floating point round trip. Not 100% sure about that before the signature may seem ambiguous? But also make using imgui+drawlist more consistent in end-user extensions.
2017-07-26 14:34:59 +08:00
omar
6e04cedd5f
Updated link to binaries
2017-07-25 20:06:18 +08:00
omar
f39cd61bf0
Reorder ImGuiColorEditFlags_ ( #346 )
2017-07-23 19:08:58 +08:00
omar
4f1f251bd2
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. ( #346 )
2017-07-23 19:02:26 +08:00
omar
8d32e8dae6
ColorPicker: Handle out of 0..1 range colors when displaying the cross hair. ( #346 )
2017-07-23 18:48:45 +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
645875a240
Examples: Enable vsync by default in example applications ( #1213 , #1151 )
2017-07-23 16:13:17 +08:00
omar
166e8f6261
Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility ( #1116 )
2017-07-23 15:57:39 +08:00
omar
c8794c246e
Examples: Vulkan: Batch file builds both debug and release
2017-07-23 15:22:21 +08:00
omar
a8b202782f
ColorPicker,ColorButton: Honor Border/Shadow style settings ( #346 )
2017-07-22 19:37:13 +08:00
omar
790d0eb5be
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option ( #346 )
2017-07-22 19:24:39 +08:00
omar
4355b2e422
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments ( #346 )
2017-07-22 19:04:10 +08:00
omar
91bf8fd689
ColorPicker,ColorEdit: Demo code ( #346 )
2017-07-22 18:01:29 +08:00
omar
15be7e1a71
ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h ( #346 )
2017-07-22 18:01:16 +08:00
omar
dd9c2f97a8
ColorPicker: Renamed _NoSliders to _NoInputs ( #346 )
2017-07-22 17:38:38 +08:00
omar
eba33deaf3
ColorPicker: Longer white line for hue/alpha selection, scale down according to ItemInnerSpacing. ( #346 )
2017-07-22 17:35:18 +08:00
omar
1edeea2f5a
ColorPicker: Removed extraneous ImGui:: prefixes + minor comments ( #346 )
2017-07-22 16:58:28 +08:00
omar
e79d7553b0
ColorPicker: Don't use Alpha setting when enabling all 3 sliders ( #346 )
2017-07-22 16:52:41 +08:00
omar
97bedd704c
Better, unified color tooltip ( #346 )
2017-07-21 03:06:25 +08:00
omar
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
2017-07-21 02:34:19 +08:00
omar
138a9dbaeb
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) ( #862 )
2017-07-21 02:21:48 +08:00
omar
100d30a0a1
Comments about IMGUI_DISABLE_TEST_WINDOWS ( #1240 , #169 )
2017-07-20 23:12:58 +08:00
omar
e4007f7145
Internals: Move GetVisibleRect() a few functions above so it gets to hang out with its peers.
2017-07-20 22:30:56 +08:00
omar
85d9c8fb46
Internals: renaming IndexWithinParent to OrderWithinParent
2017-07-20 21:25:31 +08:00
omar
25f3717a1c
Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. ( #1237 )
2017-07-20 20:57:46 +08:00
omar
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
2017-07-19 14:53:25 +08:00
omar
d1145e990d
Comments tweak ( #1231 )
2017-07-16 13:07:11 +08:00
omar
41f944238b
Comments about GlyphExtraSpacing ( #1192 )
2017-07-15 18:03:43 +08:00
omar
1987e23ce5
ImDrawList::PrimReserve() minor renaming of locals to make things clearer
2017-07-15 17:52:52 +08:00
omar
f3cf5e0322
Examples: SDL+GL3: Fixed old comments ( #1229 )
2017-07-15 17:50:01 +08:00
omar
8261d9ff30
Comments ( #1172 , #1231 )
2017-07-15 17:11:53 +08:00
omar
be7fa76fdd
Fixed Clang unknown-warning-ignored warning by ignoring it..... we are truly living in a special time ( #1090 )
2017-07-15 13:27:44 +08:00
omar
52df0032a5
Travis: Blind fix for SDL+GL3 project on the Travis build setup.
...
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229 , #1209 )
2017-07-15 13:19:13 +08:00
omar
358e667b7a
Travis: Adding the SDL+GL3 project on the Travis build setup (for both Linux and OSX).
...
Examples: SDL+GL3: Makefile blind fix for OSX (untested) (#1229 , #1209 )
2017-07-15 13:13:09 +08:00
omar
0fe5728971
Examples: SDL+GL3: Makefile fix for Linux ( #1229 , #1209 )
2017-07-15 13:07:43 +08:00
omar
03e6bfe84a
Comments
2017-07-14 19:49:11 +08:00
omar
cb6d893a13
Comments ( #383 , #1224 )
2017-07-14 18:12:40 +08:00
omar
afae9398cb
Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.
2017-07-14 17:49:42 +08:00
omar
1094afc6be
Merge pull request #1209 from fr500/master
...
Examples: Fix Makefile for non-6.3 MINGW versions, added SDL+GL3 Makefile.
2017-07-09 17:29:57 +02:00
radius
8b6896faf9
add SDL GL3 makefile
2017-07-02 21:38:27 -05:00
radius
d43695b748
fix gl2 sample too
2017-07-02 21:28:56 -05:00
radius
e0aac34672
fix compilation on MINGW
2017-07-02 11:21:24 -05:00
omar
d3f4309491
Comments about ImGuiStyleVar enum ( #1198 )
2017-06-24 13:11:46 +02:00
omar
1e981f00e5
Comments
2017-06-21 13:50:31 +02:00
omar
a5e0210902
Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. ( #1184 )
2017-06-19 21:19:48 +02:00
omar
e47cf79773
Comments tweaks, typos ( #1188 )
2017-06-17 19:30:30 +02:00
omar
4c8d87d3fb
Comments ( #1188 )
2017-06-17 19:25:58 +02:00
omar
978c84d2e9
Removed dependency on int64_t type (unvailable in VS2008) by rewording an assert ( #1184 )
2017-06-16 14:08:17 +02:00
omar
12d265fa31
Version 1.51 WIP tag
2017-06-13 11:30:22 +02:00
omar
a2f7c40e30
Fixed comment ( #1178 )
2017-06-13 11:29:21 +02:00
omar
1cd1ca259e
Update README.md
2017-06-02 14:01:06 +02:00
omar
5e1caaaef3
Version 1.50
2017-06-02 12:22:34 +02:00
omar
7ad84b22f8
Comments
2017-06-02 12:13:47 +02:00
omar
99ff2ec6fb
Examples: DirectX9/10/11: Comments
2017-06-02 11:28:48 +02:00
omar
2acbd1ac2d
Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear
2017-06-02 11:25:45 +02:00
omar
51c200ac0d
Examples: DirectX9: Clarified texture release code ( #1163 )
2017-06-02 11:25:45 +02:00
omar
32f5ef4f98
Added Pascal binding
2017-06-01 12:25:01 +02:00
omar
62c4698a73
Further clarifications of the key indices passed to IsKeyXXX functions ( #1159 )
2017-05-27 17:55:48 +02:00
omar
8228dc20df
Merge branch 'master' into 2016-07-navigation
2017-05-26 13:44:08 +02:00
omar
c038339a4c
Merge branch 'master' into 2015-02-colorpicker
2017-05-26 13:43:36 +02:00
omar
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
2017-05-26 13:42:36 +02:00
omar
026d021df1
Demo: Fixed warnings introduced in 0828a1fd6c
2017-05-26 13:40:53 +02:00
omar
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
2017-05-26 13:36:52 +02:00
TinyTinni
3a7111cfcd
casting to GLint on init
2017-05-17 21:42:34 +02:00
Nicolas Guillemot
ad3c1e68ab
save and restore sampler in GL 3 examples
2017-05-16 16:43:59 -07:00
TinyTinni
0981d8e381
fixes types
2017-05-16 12:49:47 +02:00
omar
0828a1fd6c
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
2017-05-14 16:27:10 +02:00
omar
bd9868f447
Scrollbar: Avoid rendering when sizes are negative to reduce glitches (not sure how this ever slipped through - perhaps because of WindowMinSize settings).
2017-05-13 20:25:09 +02:00
omar
df52f46b13
Comments, documentation ( #1121 )
2017-05-02 10:43:00 +02:00
omar
9614552eba
README.md added link to Nicolas Guillemot flashtalk ( #1099 )
2017-05-01 17:16:40 +02:00
omar
b0db625cab
Examples: Vulkan: Fixed an extra validation (tested on Windows with VulkanSDK 1.0.46.0) ( #1042 )
2017-05-01 17:07:53 +02:00
omar
f87b152522
Examples: Vulkan: Various very minor stylistic fixes, fixing typos in comments, etc. ( #1042 #1043 )
2017-05-01 17:07:05 +02:00
Peter Particle
201d589714
Image presentation now depends on the completeness of command buffer submission through semaphores.
...
To maintain maximum frame rate we render to the last acquired swapchain image but present the last but one drawn image. This behavior is optional through conditional compilation macros.
2017-05-01 16:54:49 +02:00
Peter Particle
a9add1ce63
Removed redundant VkResult plugged into VkPresentInfoKHR pResults attribute. This is only meaningful when we present directly to multiple swapchains. In that case we can an VkResult per swapchain.
2017-05-01 16:53:54 +02:00
Peter Particle
eaae754211
Removed redundant barrier.
...
The transition of the swapchain image(s) can happen implicitly in the renderpass. This approach has been stated to be more efficient than using an explicit barrier.
See "Vulkan Programming Guide", Chapter 7: "Graphics Pipelines", section "Renderpasses".
2017-05-01 16:52:52 +02:00
Peter Particle
33874073dc
Fixed all issues found by vulkan debug report. Reasons for the major design changes are commented.
2017-05-01 16:48:16 +02:00
omar
89d03d5cca
Examples: Vulkan: Disable IMGUI_VULKAN_DEBUG_REPORT by default. Update .bat files for newer VulkanSDK.
2017-05-01 16:46:57 +02:00
Peter Particle
56dff3a080
Vulkan backend: optionally enabling vulkan validation layers and debug report callback
...
Additional layer, extension and the callback itself are used/created when IMGUI_VULKAN_DEBUG_REPORT is defined. The callback reports seven (potential!) errors which will be fixed with another pull request.
2017-05-01 16:32:45 +02:00
omar
55be2f0722
Merge branch 'ParticlePeter-g_FrameIndex_not_used_fix'
2017-05-01 16:23:27 +02:00
omar
9fd3ba871b
Merge branch 'g_FrameIndex_not_used_fix' of https://github.com/ParticlePeter/imgui into ParticlePeter-g_FrameIndex_not_used_fix
2017-05-01 16:21:43 +02:00
omar
5418bb19ff
Examples: Vulkan: windows batch file for 64-bits.
2017-05-01 16:14:13 +02:00
omar
497381dc3d
Comments
2017-05-01 15:53:50 +02:00
omar
23e7cdcee8
Merge branch 'martty-vk_small_fix'
2017-05-01 15:27:05 +02:00
omar
ac2eb4b960
Merge branch 'vk_small_fix' of https://github.com/martty/imgui into martty-vk_small_fix
2017-05-01 15:26:29 +02:00
omar
c3d9e0a6eb
Examples: SDL2: Tweaked batch files for Win32.
2017-05-01 15:00:42 +02:00
omar
475446b8b9
Merge pull request #1080 from SaschaWillems/master
...
Examples: Vulkan: Small changes to be in line with specs and fix validation layer errors/warnings
2017-05-01 14:50:34 +02:00
omar
b3d237a5ce
Examples: SDL2: Added build .bat files for win32.
2017-05-01 13:47:59 +02:00
omar
dbfd5d6e9a
Ignoring unreasonnable Clang -wformat-pedantic warning ( #1090 )
...
See e.g.
http://clang-developers.42468.n3.nabble.com/The-p-conversion-and-cast-to-void-td4044226.html
2017-05-01 12:55:47 +02:00
omar
27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +02:00
omar
89b1497843
Merge branch 'master' into 2016-02-colorpicker
2017-05-01 12:37:34 +02:00
omar
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
2017-05-01 12:36:46 +02:00
omar
7cd55ce939
Merge branch 'ecraven-addimagequad'
2017-05-01 12:34:45 +02:00
omar
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
2017-05-01 12:34:32 +02:00
omar
f06b20185f
Merge branch 'addimagequad' of https://github.com/ecraven/imgui into ecraven-addimagequad
2017-05-01 12:25:25 +02:00
omar
884c435fd3
Merge branch 'greggman-fix-opengl3-example'
2017-05-01 12:21:05 +02:00
omar
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
2017-05-01 12:20:51 +02:00
Gregg Tavares
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
2017-05-01 16:05:45 +09:00
omar
d878462866
End() avoid calling Columns() if no columns set is open, not sure what it wasn't the case.
...
Pros: Faster. Avoid early crashes StackId underflow that are meant to be more gracefully caught by CheckStacksSize() (with more explicit assert). Cons: Excercise less code.
2017-04-30 12:10:45 +02:00
omar
bbd44b4edd
Clarified asserts in CheckStacksSize() when there is a stack mismatch
2017-04-30 12:10:45 +02:00
omar
a606f2dcb5
Update README.md
2017-04-28 13:43:11 +02:00
omar
9ab9a846a1
Update README.md
2017-04-28 13:40:50 +02:00
omar
6e69923e35
Update README.md
2017-04-28 13:32:04 +02:00
omar
32390a252f
Added UnrealEngine_ImGui link
2017-04-28 10:28:52 +02:00
Peter
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
2017-04-28 10:04:20 +02:00
omar
104936ab1a
imconfig: Added comment about redefining ImDrawIdx
2017-04-26 19:12:46 +02:00
omar
f030087f8e
Comments to redirect people to OpenGL3 examples ( #1116 )
2017-04-26 18:27:10 +02:00
omar
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
Michael Link
8df58e2cfd
MenuItem should only be selected on release
2017-04-25 15:15:56 +02:00
omar
670775ac22
Added assert/comment about using MergeMode ( #1100 )
2017-04-13 20:01:24 +02:00
omar
15d7f20d4f
Update README.md
2017-04-01 18:44:34 +02:00
omar
0e1950f7d6
Comments about child menu positioning ( #1086 )
2017-04-01 18:01:47 +02:00
omar
4b125e7d5c
Merge pull request #1078 from nem0/master
...
Added missing IMGUI_API macros in ImGuiTextEditCallbackData methods.
2017-03-29 14:51:26 +02:00
saschawillems
4da26d85cd
Clip negative scissor offsets to zero
2017-03-26 19:54:59 +02:00
saschawillems
12deb53b11
Set required depth member for buffer image copy
2017-03-26 19:38:05 +02:00
Mikulas Florek
7a37a1c3f6
do not export inline function, it causes problems on some compiers
2017-03-24 12:45:09 +01:00
Mikulas Florek
316555f9de
missing API
2017-03-24 10:10:22 +01:00
omar
288dccd5a5
Merge branch 'master' into 2016-07-navigation
2017-03-17 21:30:16 +01: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
b84eac53d8
ImFont: Reorder field initialization to match declaration order
2017-03-17 21:29:28 +01:00
omar
931bc61345
Comment about ImGuiInputTextFlags_CtrlEnterForNewLine for InputTextMultiline()
2017-03-16 21:55:36 +01:00
omar
2a3c61e5f8
Merge branch 'master' into 2016-07-navigation
2017-03-16 19:31:12 +01:00
omar
92ea8d1131
Merge branch 'master' into 2016-02-colorpicker
2017-03-16 19:28:30 +01:00
omar
9a068ce005
Merge pull request #1068 from codecat/fix-colorbutton
...
ColorButton: fix showing wrong hex value for alpha in tooltip.
2017-03-16 09:51:04 +01:00
Codecat
fdd11658eb
Fix ColorButton showing wrong hex value for alpha
2017-03-15 21:25:29 +01:00
Jefferson Montgomery
30954b4a88
Merge latest from ocornut/imgui
2017-03-13 13:26:55 -07:00
Peter Particle
337019a68f
typo, #elif instead of #else, fixed
2017-02-26 17:16:37 +01:00
Peter Particle
fd90da38e1
Vulkan backend: g_FrameIndex not used fix -> huge perf gain
...
Added a macro to switch between unlimited frame rate (VK_PRESENT_MODE_IMMEDIATE_KHR) and limited to 60 fps (VK_PRESENT_MODE_FIFO_KHR). Only the latter mode is guaranteed to be available, but the former one most likely is.
2017-02-26 13:25:54 +01:00
Marcell Kiss
e0244c8f62
Fix scissor offset being negative
2017-02-11 12:20:12 +01:00
Marcell Kiss
509df3e279
Fix new Vulkan validation warnings
2017-02-11 12:19:44 +01:00
omar
6384eee34f
Minor comments ( #998 )
2017-01-29 16:53:01 +01:00
omar
4653197ca4
Update README, kinder
2017-01-28 23:26:25 +01:00
omar
a7cf369e71
Update README.md
2017-01-28 23:14:35 +01:00
omar
8e8117c7b1
stb_truetype update (with OpenType, Type 2 font handling) ( #976 )
2017-01-21 19:23:47 +01:00
omar
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
2017-01-14 13:47:16 +01:00
omar
b6c0227add
Merge branch 'master' into 2016-02-colorpicker
2017-01-11 21:03:35 +01:00
omar
c76be71acf
Merge branch 'master' into 2016-07-navigation
2017-01-11 21:03:25 +01:00
omar
6257b5814a
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
2017-01-11 20:56:55 +01:00
omar
cffdbfe01b
Comments ( #972 )
2017-01-10 10:36:07 +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
bb4d19ff7c
Merge branch 'master' - merge fix
2016-12-23 12:15:09 +01:00
ocornut
fdc70456f4
Merge branch 'master' into 2016-07-navigation
2016-12-23 12:13:52 +01:00
ocornut
db593220fc
Comments, clarified use of io.MouseDelta ( #942 )
...
(ImGuiIO structure layout changed)
2016-12-23 11:34:23 +01:00
omar
f4f0ee750f
Update README.md
2016-12-21 21:13:43 +01:00
ocornut
1396659b72
Examples: Speculative fix for OSX Makefile to make Travis happy (re #812 )
2016-12-21 20:12:43 +01:00
omar
081aec482b
Merge pull request #931 from nlguillemot/master
...
Combo, ListBox: Extra const correctness.
2016-12-21 20:06:04 +01:00
ocornut
baa2e3b451
Minor documentation tweaks
2016-12-21 18:42:52 +01:00
ocornut
d74a3349e9
Examples: DirectX9: Explicitely setting viewport to match that other examples are doing ( #937 )
2016-12-19 23:15:38 +01:00
ocornut
52308a54f8
Demo: comments
2016-12-12 11:05:41 +01:00
Nicolas Guillemot
36d78e0565
const correctness for Combo and ListBox
...
Since Combo and ListBox only read and display the list of items, they
should not modify the pointers inside the array of pointers passed in.
Adding "const" here makes it possible to call these functions with such
an array of const pointers. Previously, a cast to "const char**" was
required as a workaround, otherwise there was a compile error.
2016-12-04 12:54:31 -08:00
ocornut
55d651812d
Renaming and massaging internal Settings/Ini functions ( #923 )
2016-11-29 21:55:20 +01:00
ocornut
0b6211f907
Fixed clicking on a window's void while staying still overzealously marking .ini settings as dirty ( #923 )
2016-11-29 21:46:21 +01:00
ocornut
9235e0da46
SliderInt, SliderFloat(): Fixed edge case where style.GrabMinSize being bigger than slider width can lead to a division by zero ( #919 )
2016-11-29 21:07:26 +01:00
ocornut
ca9a918535
SliderInt(): Fixed reverse direction mode when (v_max-v_min)==-1 ( #854 ) (+ ref #919 )
2016-11-28 20:43:11 +01:00
ocornut
bbd0a37bd2
ImFileOpen: MinGW uses _wfopen() codepath to support UTF-8 filenames ( #917 )
2016-11-28 20:30:36 +01:00
ocornut
449c47c789
SliderInt, SliderFloat() interacting enforce modifying to the value to be consistent with other widget behaviors ( #919 )
2016-11-28 11:05:24 +01:00
ocornut
94c77edfa5
SliderInt, SliderFloat() Better display support for v_min==v_max range. ( #919 )
2016-11-28 11:03:48 +01:00
ocornut
37a27a8025
Merge branch 'master' into 2016-07-navigation
2016-11-27 18:35:48 +01:00
ocornut
0a483379af
Split SliderBehaviorCalcRatioFromValue() out of SliderBehavior(), fix + Not using fabsf() anymore
2016-11-27 18:34:46 +01:00
ocornut
004e863727
Split SliderBehaviorCalcRatioFromValue() out from SliderBehavior()
2016-11-27 18:32:24 +01:00
ocornut
67c6d6026a
Nav: SliderFloat() Fixed non-linear sliders in Nav branch ( #787 , #323 )
2016-11-27 18:29:38 +01:00
ocornut
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-11-27 18:25:20 +01:00
ocornut
f4cf972ea9
Merge branch 'master' into 2016-02-colorpicker
2016-11-27 18:21:14 +01:00
ocornut
219e4fb8fb
SliderInt, SliderFloat: Passing v_min==v_max disable setting value from clicking/dragging ( #919 )
2016-11-27 17:49:04 +01:00
ocornut
a868c32ed1
SliderInt, SliderFloat: Renaming
2016-11-27 17:43:32 +01:00
ocornut
61d5b46307
SliderInt, SliderFloat(): support reverse direction ( #854 )
2016-11-27 17:38:33 +01:00
ocornut
104b381023
Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). ( #917 )
2016-11-27 16:43:36 +01:00
Geoffrey Tucker
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
2016-11-13 23:58:09 -08:00
ocornut
9c6048f781
Tools: binary_to_compressed_c.cpp : comments + link to precompiled binaries
2016-11-13 21:42:40 +01:00
ocornut
3085716708
Merge branch 'Loftilus-master'
2016-11-13 17:57:57 +01:00
ocornut
127dd7c88c
Examples: Vulkan: Coding style fixes ( #910 )
2016-11-13 17:57:43 +01:00
Håvard Mathisen
a5600b6e59
Vulkan example: Proper surface format search.
2016-11-13 05:23:33 +01:00
Håvard Mathisen
b447a71cf6
Vulkan example: Fix gamma for some implementations.
2016-11-13 04:28:26 +01:00
Håvard Mathisen
08ef9819c8
Vulkan example: Fix validation layer warnings and errors and redeclare gl_PerVertex.
2016-11-13 03:00:36 +01:00
ocornut
1a0e414d3a
Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()).
2016-11-12 21:17:30 +01:00
ocornut
fdbad2708c
Ignore GCC 6 warnings ( #883 )
2016-11-12 21:04:55 +01:00
ocornut
7c2b35704d
Examples: DirectX9-10-11: Only call Windows' SetCursor(NULL) when io.MouseDrawCursor is set ( #585 , #909 )
2016-11-12 19:46:52 +01:00
ocornut
2973287fd3
Merge branch 'martty-master'
2016-11-12 17:50:25 +01:00
ocornut
55863dd274
Examples: Vulkan: Shallow stylistic changes (following #879 )
2016-11-12 17:49:59 +01:00
ocornut
0449bb98e2
Merge branch 'master' of https://github.com/martty/imgui into martty-master
2016-11-12 17:36:46 +01:00
ocornut
98e1d500d4
Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery ( #586 )
2016-11-12 17:08:31 +01:00
ocornut
e0aef0018f
Updated README
2016-11-12 16:08:26 +01:00
ocornut
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
2016-11-12 12:48:33 +01:00
ocornut
775ac24d45
Fixed overzealous GCC warnings ( #883 ) + partly undo 8553bab241
2016-11-12 11:14:37 +01:00
omar
89d033aba3
Merge pull request #898 from tinnnysu/master
...
Examples: SDL+OpenGL2: Update cmdline syntax in Windows compilation.
2016-11-12 11:08:51 +01:00
ocornut
379533f661
Updated stb_truetype.h, stb_rect_pack.h primarily to reduce warnings ( #883 )
2016-11-11 20:19:07 +01:00
ocornut
8553bab241
Ignoring overzealous GCC warnings ( #883 )
2016-11-11 20:17:35 +01:00
ocornut
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
2016-11-11 18:40:13 +01:00
ocornut
941cf1b436
Merge branch 'master' into 2016-07-navigation
2016-11-09 15:21:36 +01:00
ocornut
ccb3db94da
Merge branch 'master' into 2016-02-colorpicker
2016-11-09 15:17:20 +01:00
sushitao
833ed760ae
update cmdline syntax in windows compilation
2016-11-09 14:53:23 +08:00
ocornut
faafcf418d
Demo: Comments, even though nobody appears to read the comments.
2016-11-07 17:33:46 +01:00
ocornut
3689efb726
Font: Readme about icons
2016-11-06 22:53:36 +01:00
ocornut
da9feba539
Fixed missing frame padding on title bar text when Collapse triangle is disabled
2016-11-06 22:40:47 +01:00
ocornut
620497e466
Font: Font name include size
2016-11-06 22:21:21 +01:00
ocornut
84f480a638
Font: Added Roboto-Medium + tweaked readme
2016-11-06 22:21:10 +01:00
ocornut
b2f0ea6c0d
Font: Default font given explicit name "ProggyClean.ttf"
2016-11-06 21:51:20 +01:00
ocornut
b376b68326
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
2016-11-06 21:50:18 +01:00
ocornut
357167f917
Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.
2016-11-06 18:13:14 +01:00
ocornut
907dd2ed20
Comments ( #896 )
2016-11-06 15:25:28 +01:00
ocornut
ddf08ec2e8
BeginChild(const char*) applies stack id to provided label ( #894 , #713 )
2016-11-06 15:12:50 +01:00
Matt Keeter
32dbe836d0
Add user-facing IsPopupOpen function
2016-10-29 15:33:09 -04:00
Marcell Kiss
53126cd713
Add location decorators & change to use structs as in/out in glsl, update embedded spv (produced with glslangValidator -x)
2016-10-18 22:43:20 +02:00
Marcell Kiss
44250caf50
Null the released resources
2016-10-18 22:07:51 +02:00
omar
43e6c46c8d
Merge pull request #877 from Velro/patch-1
...
Demo: Outdated dragging API mentioned in demo text
2016-10-16 18:32:13 +02:00
James Fulop
6fa3aaf7c0
outdated dragging API mentioned in demo text
...
Looks like you changed the API on dragging, but did not update the description text for it.
https://github.com/ocornut/imgui/issues/167
2016-10-16 12:21:38 -04:00
ocornut
dd6163241c
Merge branch 'master' into 2016-02-colorpicker
2016-10-16 14:02:15 +02:00
ocornut
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
2016-10-16 14:01:13 +02:00
ocornut
b3790e7549
InputText: Fixed pressing home key on last character when it isn't a trailing \n ( #588 , #815 )
2016-10-16 13:34:47 +02:00
ocornut
7252d93dcd
stb_textedit.h Merged from master 1.9 (merged bits from #473 )
2016-10-16 11:34:33 +02:00
ocornut
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
2016-10-15 11:36:43 +02:00
ocornut
d649bc485b
Minor comments
2016-10-15 11:18:29 +02:00
ocornut
cb7e1c18b5
Separator: Fixed zero-height bounding box resulting in clipping when at top of clipping rectangle ( #860 )
2016-10-10 22:37:59 +02:00
ocornut
31dc7d8d63
Added ImGuiMouseCursor_None for usage by app/binding
2016-10-10 18:03:37 +02:00
ocornut
4de35b4f30
Removed left-over empty op
2016-10-09 10:58:38 +02:00
ocornut
1810b3ff38
Added ImGuiCorner enum to clarify some internal code
2016-10-09 10:56:23 +02:00
ocornut
d567595dde
ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions
2016-10-09 10:35:01 +02:00
ocornut
abaada4224
Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)
2016-10-09 10:31:39 +02:00
ocornut
5957af8a80
Fixed not using IM_ARRAYSIZE() where appropriate
2016-10-09 10:08:03 +02:00
ocornut
fa73e5aa0e
Plot: Fixed calling with values_count == 0
2016-10-08 12:43:30 +02:00
ocornut
51111b0ed5
FAQ clarified the ClipRect entry a little
2016-10-07 10:27:19 +02:00
ocornut
e4deb7a190
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-10-07 09:52:14 +02:00
ocornut
404979e48d
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-10-07 09:52:00 +02:00
ocornut
e07d45709f
ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing ( #844 )
2016-10-07 09:49:52 +02:00
omar
7995cabce5
Merge pull request #864 from jslee02/fix-clang-unknown-warning
...
Fix clang warning for old Clang versions: unknown warning group '-Wreserved-id-macro'
2016-10-06 21:48:00 +02:00
Jeongseok Lee
1d7e05327b
Fix clang warning: unknown warning group '-Wreserved-id-macro'
2016-10-06 14:48:47 -04:00
ocornut
05b580e691
Tools: Fixed binary_to_compressed_c.cpp not to use different types on both sides of ternary op ( #856 )
2016-10-02 17:25:09 +02:00
ocornut
a2487bc143
Minor tweaks
2016-10-01 15:16:17 +02:00
ocornut
9896faf731
Merge branch 'madeso-master'
2016-10-01 15:00:00 +02:00
ocornut
2919c77bee
Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called ( #800 )
2016-10-01 14:59:28 +02:00
ocornut
b96471143f
Merge branch 'master' of https://github.com/madeso/imgui into madeso-master
2016-10-01 14:56:24 +02:00
ocornut
28974dfbbb
Merge branch 'thedmd-2016-08-use_bgra_colors'
2016-10-01 14:29:27 +02:00
ocornut
68c81739bf
Minor tidying up following merge BGRA color PR ( #844 )
2016-10-01 14:29:12 +02:00
ocornut
eb0382a1c1
Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors
2016-10-01 14:19:25 +02:00
ocornut
dfe4683c17
EndGroup(): Made IsItemHovered() work when an item was activated within the group ( #849 ) (loosely follows #840 )
2016-10-01 14:10:24 +02:00
Michał Cichoń
1999c01db8
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
2016-09-26 12:00:33 +02:00
Michał Cichoń
d75d2b1871
Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h.
...
When IMGUI_USE_BGRA_PACKED_COLOR is defined packed color hold in ImU32 use BGRA format instead RGBA.
2016-09-26 12:00:33 +02:00
ocornut
82dcdc9dfc
ShowStyleEditor: tweak font map display to show glyph details when hovered.
2016-09-25 15:52:04 +02:00
ocornut
f5b37dbc52
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 15:31:36 +02:00
ocornut
fea0fcb7c3
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 15:25:55 +02:00
ocornut
d7c518e6cc
ShowStyleEditor: show font map / grid in more details.
2016-09-25 15:22:41 +02:00
ocornut
6def01be5d
Fixed IsItemActive() lagging by one frame on initial widget activation ( #840 )
2016-09-25 14:32:38 +02:00
ocornut
f2699de242
Fix using IsItemActive() after EndGroup() or any widget using groups ( #840 , #479 )
2016-09-25 14:18:10 +02:00
ocornut
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 12:59:24 +02:00
ocornut
1b5bbf725b
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-09-25 12:57:22 +02:00
ocornut
56cdbe434d
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ( #842 )
2016-09-25 12:53:13 +02:00
ocornut
0f303d363a
Refactor text alignment options to use ImVec2, removed ImGuiAlign ( #842 , #222 )
2016-09-25 12:19:15 +02:00
ocornut
de9f8944ea
Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
2016-09-25 11:38:04 +02:00
ocornut
02cea0c3c3
Comment
2016-09-25 11:16:19 +02:00
ocornut
281898e82e
Tidying up PushStyleVar/PopStyleVar() a little more ( #842 )
2016-09-25 11:14:10 +02:00
ocornut
c5b8c6303a
Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ( #842 )
2016-09-25 11:06:14 +02:00
ocornut
35c6fd682f
Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder ( #839 )
2016-09-23 09:09:07 +02:00
ocornut
7f51929dc4
Tools: binary_to_compressed_c: Avoid ?? trigraphs sequences in string outputs ( #839 )
2016-09-23 09:06:19 +02:00
omar
18d36e6f63
Merge pull request #837 from fdb/patch-1
...
Update link to Synergy repo.
2016-09-21 21:18:56 +02:00
Frederik De Bleser
5c3f8b12b9
Update link to Synergy repo
...
The Synergy repository has moved from synergy/synergy to symless/synergy.
2016-09-21 20:26:27 +02:00
ocornut
6e87f071b8
Shutdown() clear out some remaining pointers ( #836 )
2016-09-20 12:41:21 +02:00
ocornut
87d99fce6b
ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df)
2016-09-19 09:32:21 +02:00
ocornut
0420ab027e
Metrics: Displaying window position + moving extraneous line in IsPopupOpen().
2016-09-16 01:09:57 +02:00
ocornut
b397fb507e
Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) ( #829 )
2016-09-13 09:18:17 +02:00
ocornut
612b17ef57
Fixing minor english typos ( #827 )
2016-09-11 22:02:35 +02:00
Brian Swetland
5a47346f5a
ImFont: add RenderGlyph() to allow rendering of individual glyphs
2016-09-10 18:21:49 -07:00
ocornut
02399852fe
Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners ( #824 )
2016-09-10 17:43:17 +02:00
omar
012223114d
Merge pull request #825 from philix/fix-build
...
Examples: OSX: Fix Mac OS X build XCode project and remove cruft from Makefile
2016-09-10 11:31:41 +02:00
Felipe Oliveira Carvalho
6e6f04f513
Fix Mac OS X build and remove cruft from Makefile
2016-09-10 11:22:40 +02:00
omar
500d19bfdf
Update README.md
2016-09-08 09:12:17 +02:00
omar
b594b25be8
Update README.md
2016-09-08 09:11:29 +02:00
ocornut
f6d4ca6473
TODO list
2016-09-07 12:02:37 +02:00
ocornut
bc57fd5d1d
Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness ( #807 )
2016-09-05 23:39:52 +02:00
ocornut
031d4e689d
Examples: OpenGL3: Revert Makefile change for OSX for now ( #812 )
2016-09-05 22:52:45 +02:00
omar
3a699e7264
Update README.md
2016-09-05 13:40:04 +02:00
ocornut
2825eaa0be
Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback ( #810 )
2016-09-03 19:24:57 +02:00
ocornut
c0fcf223be
Fixed assert triggering when a window has zero rendering but has a callback ( #810 )
2016-09-03 19:02:57 +02:00
omar
056e49eec1
Merge pull request #812 from linkemars/master
...
Examples: opengl3 glfw: Mac makefile - correct name for linking opengl3_example
2016-09-02 15:00:49 +02:00
Kun Lin
aa0cb13aa4
Correct name for linking opengl3_example
...
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.
Changed this made the compilation on my Mac successfully.
2016-09-02 21:57:31 +09:00
omar
9af74181ce
Merge pull request #804 from Loftilus/master
...
Examples: Vulkan: Fix Vulkan example for use when a depth buffer is active.
2016-09-01 09:23:46 +02:00
Gustav
08a9e78da5
fixed space issues
2016-08-29 23:35:56 +02:00
Håvard Mathisen
99b4f951b9
Fix Vulkan example for use when a depth buffer is active.
2016-08-27 19:08:24 +02:00
Gustav
5def10c3a0
Fixed OpenGL error when calling Shutdown without calling NewFrame
2016-08-27 00:32:20 +02:00
omar
b36ba12929
Travis test fix
2016-08-25 16:20:34 +02:00
ocornut
5ae71aa04a
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
2016-08-25 10:25:51 +02:00
ocornut
3c384c2f10
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
2016-08-25 10:18:09 +02:00
ocornut
ef10b984fe
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-23 17:00:47 +02:00
ocornut
f39513ac47
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-23 17:00:11 +02:00
ocornut
63d47bc5a4
ImFormatString() Fixed an overflow handling bug with implementation of vsnprintf() that do not return -1 ( #793 )
2016-08-23 16:55:06 +02:00
ocornut
e8e5c6d788
Nav: Comments. Fixed two -Wall warnings. Removed unused function. ( #787 )
2016-08-23 08:58:51 +02:00
ocornut
3883a2027f
Nav: Fixed Selectable() crash introduced earlier today in 43ee5d73 + added comments/assert ( #323 )
2016-08-21 17:52:42 +02:00
ocornut
df9bdf38f9
Nav: NavActivateId, NavInputId are no repeat actions. Repeat buttons handle it themselves already anyway. ( #323 )
2016-08-21 17:32:15 +02:00
ocornut
67fd805839
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-21 16:13:40 +02:00
ocornut
c6c7371a4c
Nav: Removed unnecessary test following 49ca1c2b88 ( #323 )
2016-08-21 16:11:53 +02:00
ocornut
49ca1c2b88
Nav: InitDefaultRequest saves a fallback item so PadMenu on a collapsed window gets us to the collapse button ( #323 )
2016-08-21 16:07:55 +02:00
ocornut
2303b67c40
Close button submitted after collapse button. Should have no effect. Consistent with expectation & will be used as fallback for nav ( #323 )
2016-08-21 16:05:19 +02:00
ocornut
252f094101
Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() ( #323 )
2016-08-21 15:26:40 +02:00
ocornut
fddf9ca10e
Nav: Fixed nav highlight clipping (affected non non-menu items within menubar) ( #323 )
2016-08-21 15:25:29 +02:00
ocornut
78b7e2dfb3
Nav: Process and apply mouse move request immediately after move request result comes ( #323 )
2016-08-21 14:53:26 +02:00
ocornut
f71cdd13b7
Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code.
2016-08-21 14:39:13 +02:00
ocornut
ac7826c8a5
ImRect: Added Translate() helper, removed redundant and misleading Reduce()
2016-08-21 14:37:48 +02:00
ocornut
87eb749cbc
Added IsItemHoveredOrFocused() (provisional name), better handling of popup/tooltip positioning when using mouse+nav ( #323 )
2016-08-21 13:25:40 +02:00
ocornut
ea2425ad9a
Nav: Fixed entering child with PadActivate not setting ActiveIdSource to Nav ( #323 )
2016-08-21 12:44:59 +02:00
ocornut
43ee5d73e9
Nav: Hovering MenuItem/Selectable with mouse makes NavId, matching what seems to be Windows beahvior at least for menus ( #323 )
2016-08-21 11:45:50 +02:00
ocornut
30c04d0dbe
Nav: Mouse pos passed to backend always rounded, so that lossy application of non-integer mouse pos doesn't lead to undesirable movement ( #3
2016-08-21 00:10:48 +02:00
ocornut
bf42657850
Nav: Clearing mouse hover flag using MouseClicked[] test instead of MouseDown[] so that invalid mouse button won't keep breaking nav ( #323 )
2016-08-20 23:59:54 +02:00
ocornut
695ca7bb45
Nav: Tidying up. Comments. ( #323 )
2016-08-20 23:27:25 +02:00
ocornut
4f7c63a7af
Nav: Fixed a bug where mouse positioning requests would be sent while opening submenus with mouse ( #323 )
2016-08-20 23:25:53 +02:00
ocornut
e4c099d67c
Nav: Comments + fixed handling of PadLeft in menus (fix e55882f) ( #323 )
2016-08-20 22:11:00 +02:00
ocornut
e3fec8c0aa
Renamed function ( #323 )
2016-08-20 19:19:58 +02:00
ocornut
82768e05f3
Ignore list for Visual Studio
2016-08-20 13:30:42 +02:00
ocornut
787a802f2e
Merge branch 'martty-master'
2016-08-20 13:30:10 +02:00
Marcell Kiss
4bc6a951fe
tabs to space, remove braces
2016-08-20 13:27:03 +02:00
Marcell Kiss
3234f81cb1
maxImageCount may be 0; add missing sType; change to 1 push constant range
2016-08-20 13:08:34 +02:00
omar
622715725d
Merge pull request #783 from bear24rw/patch-1
...
Demo: Add null terminator to ShowStyleEditor() output_type combo options
2016-08-19 18:00:27 +02:00
Max Thrun
4f389b7f6a
Add null terminator to ShowStyleEditor output_type combo options
...
Without a null terminator the Combo() function indexes outside of the "items_separated_by_zeros" string.
2016-08-18 11:00:23 -07:00
ocornut
ead79dcdac
Metrics: 64-bit display fix
2016-08-15 17:34:17 +02:00
ocornut
3ab0d5cdfd
Nav: NavHighlight gets its own color (default to Header color), made rectangle thicker ( #323 )
2016-08-15 13:07:39 +02:00
ocornut
cf16ba6572
Nav: Exposed RenderNavHighlight() in imgui_internal.h to increase discoverability and reordered arguments to be more consistent ( #323 )
2016-08-15 11:52:02 +02:00
ocornut
6c19d7b13c
Nav: Fixed clipping rect of navigation highlight, notably for collapsing arrow ( #323 )
2016-08-15 11:41:56 +02:00
ocornut
9501cd9991
InputText: Fixed calling callback on frame of losing active id, fix part of 848e62bfe0 (nav branch only)
...
#323 #701
2016-08-13 14:22:34 +02:00
ocornut
cff815fd2d
Merge branch 'master' into 2016-02-colorpicker
2016-08-11 23:22:15 +02:00
ocornut
a83f9b7885
Merge branch 'master' into 2016-07-navigation
2016-08-11 23:21:04 +02:00
ocornut
0f9addb002
Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway)
2016-08-11 23:20:53 +02:00
ocornut
bfe1e163b8
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-11 23:01:48 +02:00
ocornut
2afffcdeb9
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-11 23:00:47 +02:00
ocornut
4bc3f9d1f7
Minor shuffle to ease merging branches.
2016-08-11 22:59:44 +02:00
ocornut
996eb080fa
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-11 22:53:26 +02:00
ocornut
df1d1b5b25
Nav: DragBehavior: Adjust minimum step to displayed precision when using navigation ( #323 , #180 )
2016-08-07 20:40:57 +02:00
ocornut
09cba02d3f
Nav: DragBehavior: Fix for fast speed ( #323 #180 )
2016-08-07 20:31:51 +02:00
ocornut
761a74c62b
Selectable/MenuItem: Not activated on Click but only on Release is more standard ( #126 , #245 , #323 )
...
Apparently menu items started with OnClick (vs OnClickHoldRelease) when
doing #126 . Hope to not break anything.
Also allows using xxx_DontClosePopup flags.
2016-08-07 20:21:18 +02:00
ocornut
8828889d5e
Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup ( #323 )
2016-08-07 20:05:24 +02:00
ocornut
785f51227a
Demo tweaks
2016-08-07 19:07:24 +02:00
ocornut
525ef5b357
Nav: Tweaked default highlight clipping (clipped by scrollbar) and removed subtle background ( #323 )
2016-08-07 15:31:00 +02:00
ocornut
a68132948b
Nav: Added ImGuiCol_NavWindowingHighlight into style ( #323 )
2016-08-07 15:26:04 +02:00
ocornut
6aa8019763
Nav: Fixed bug where pressing NavInput(Triangle) to turn slider/drag into text input would then change subsequent NavActivate as well ( #323 )
2016-08-07 15:19:29 +02:00
ocornut
e55882f74b
Nav: Allow PadLeft to close a menu ( #323 )
2016-08-07 15:18:04 +02:00
ocornut
c203be94c6
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-07 13:55:59 +02:00
ocornut
6eb35b8a04
BulletText(): doesn't stop displaying at the ## mark
2016-08-07 13:53:41 +02:00
ocornut
8a6d209f68
Nav: Failed movement request with no current NavId fallback to an InitDefaultRequest so that we always land somewhere on first move ( #323 )
2016-08-07 13:34:25 +02:00
ocornut
5ef8452509
Nav: Comments ( #323 )
2016-08-07 13:33:15 +02:00
ocornut
cbf24c13ca
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-07 12:15:21 +02:00
ocornut
5d1a0a6f77
Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015)
...
OpenNextNode() -> SetNextTreeNodeOpen()
GetWindowIsFocused() -> IsWindowFocused()
GetItemBoxMin() -> GetItemRectMin()
GetItemBoxMax() -> GetItemRectMax()
IsMouseHoveringBox() -> IsMouseHoveringRect()
IsClipped() -> !IsRectVisible()
2016-08-06 09:48:04 +02:00
ocornut
aa9786077c
Merge branch 'thedmd-2016-08-generalized_visibility_test'
2016-08-06 09:40:38 +02:00
ocornut
b8397c2933
Tweak comments ( #768 )
2016-08-06 09:40:26 +02:00
ocornut
a1521534ba
Merge branch '2016-08-generalized_visibility_test' of https://github.com/thedmd/imgui into thedmd-2016-08-generalized_visibility_test
2016-08-06 09:36:24 +02:00
ocornut
af33efb146
Using IM_COL32() for colors in a few spots ( #767 )
2016-08-06 09:35:05 +02:00
ocornut
a7f6ea592f
Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ( #759 )
2016-08-06 09:22:41 +02:00
Michał Cichoń
7588dfb67e
Add ability to test arbitrary rectangle for visibility without need of moving cursor.
2016-08-05 11:47:16 +02:00
ocornut
d85c1be6b6
Nav: Reordered Cancel handling code so you you can leave a child within a popup without closing the popup ( #323 )
2016-08-04 12:53:46 +02:00
ocornut
c263961f07
Nav: Menu: Allow PadDown to open a menu from a menu bar, PadRight from a menu ( #323 , #126 )
2016-08-04 10:41:33 +02:00
ocornut
dcff032429
Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. ( #323 )
2016-08-03 23:23:04 +02:00
ocornut
4ccc87c91d
Typo in commented default-value
2016-08-03 21:53:07 +02:00
ocornut
c0dcef4e16
Nav: Moving window with nav stick disables mouse hover ( #323 )
2016-08-03 21:02:27 +02:00
ocornut
4e91b521ee
Demo: Arrange some inputs panels.
2016-08-03 20:55:54 +02:00
ocornut
36fa2b9523
Nav: DragBehavior removed bogus test ( #323 )
2016-08-01 22:23:56 +02:00
ocornut
d0801057ba
Demo: Tweak handling of "animate" flag in graph demo so it doesn't keep running.
2016-08-01 20:55:54 +02:00
ocornut
2e52bee12e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-31 17:00:44 +02:00
ocornut
907265d632
Using ImGuiID instead of ImU32 is a few places
2016-07-31 16:48:06 +02:00
ocornut
8b190f1100
Nav: quick tap on NavMenu with no focused window doesn't focus one (holding still does) ( #323 )
2016-07-31 16:12:01 +02:00
ocornut
e9c881e4de
Nav: fixed using NavMenu/windowing select when no window is already focused + cleanup code ( #323 )
2016-07-31 16:07:58 +02:00
ocornut
1ecbf73c97
Nav: working on early bits of documentation ( #323 )
2016-07-31 15:41:51 +02:00
ocornut
a154625a56
Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work ( #323 )
2016-07-31 13:40:14 +02:00
ocornut
08a28c16ae
Nav: Merge FocusedWindow and NavWindow that were basically duplicate at this point ( #323 )
2016-07-31 13:38:57 +02:00
ocornut
2545d75c3b
Tidying up, removed two unnecessary window flags from being exposed in imgui.h
2016-07-31 13:05:13 +02:00
ocornut
b3cba62b80
Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows ( #323 )
2016-07-31 12:55:23 +02:00
ocornut
769a1dd748
Nav: No scrolling while using windowing functionalities ( #323 )
2016-07-31 10:41:41 +02:00
omar
9ab20e6c9c
Merge pull request #756 from jseward/master
...
Examples: SDL: Fix compile warnings.
2016-07-31 09:28:21 +02:00
Jamie Seward
0a1d456de1
Fix compile warnings in SDL examples
2016-07-30 15:26:49 -07:00
ocornut
a88d189f18
Nav: MoveRequest doesn't affect io.NavUsable so that navigation failure doesn't trigger false positive & not needed (undo part of 3cc1419df)
2016-07-30 23:52:03 +02:00
ocornut
f72e2fd1b1
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-30 23:46:09 +02:00
ocornut
954c890c67
SameLine() with explicit X position is relative to left of group/columns (ref #746 , #125 , #630 )
2016-07-30 23:41:44 +02:00
ocornut
68b73b61b5
Nav: Comment ( #323 )
2016-07-30 23:17:32 +02:00
ocornut
79e7ece259
Nav/Examples: honoring the io.WantMoveMouse flag in most common examples ( #323 )
...
Missing support Vulkan (#549 ), Apple (#575 , #247 ), SDL (#58 , #356 ),
Allegro, Marmalade (#368 , #375 )
2016-07-30 23:17:11 +02:00
ocornut
d88dcc26cc
Demo: console text input keeps focus in a less harsher and more navigation friendly way ( #323 )
2016-07-30 19:17:26 +02:00
ocornut
3cc1419df3
Nav: making io.NavActive more suitable for end-user detecting if they should pass inputs to game ( #323 )
2016-07-30 19:16:41 +02:00
ocornut
cc66731c39
Nav: Calling SetItemDefaultFocus() doesn't make mouse cursor dirty if nav highlight is off ( #323 )
2016-07-30 19:15:12 +02:00
ocornut
8d0186c82b
Nav: programmatic call to SetKeyboardFocusHere() doesn't quality as a nav input (doesn't position mouse) ( #323 )
2016-07-30 19:08:20 +02:00
ocornut
e2dd48ae65
Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus ( #323 )
2016-07-30 18:06:05 +02:00
ocornut
4c4d750cae
Nav: Fixed Collapse icon disappearing when Nav is disabled (since b2aaab873d) ( #323 )
2016-07-30 18:05:14 +02:00
ocornut
3672105b87
Tidying up
2016-07-30 17:20:59 +02:00
ocornut
04157da291
Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) ( #323 )
2016-07-30 17:18:34 +02:00
ocornut
4309b8c1ed
Clarifying that MovedWindow* apply to mouse moving only
2016-07-30 16:25:45 +02:00
ocornut
f2d1472481
Nav: Fixed navigating outside of current scrolling bounds (bug from 0cc20fca83) ( #323 )
...
+ spaces
2016-07-30 15:17:12 +02:00
ocornut
efc8858328
ImRect: fixed Clip() function being the other way around (INTERNAL API BREAKING CHANGE- wasn't exposed, hoping nobody uses that) + actually fixes the function behavior.
2016-07-30 14:38:33 +02:00
ocornut
d6ce800a20
Nav: ActiveIdAllowNavMove -> ActiveIdAllowNavDirFlags for more flexibility (nav up/down typically allowed on a single-line text input) ( #323 )
2016-07-30 14:31:34 +02:00
ocornut
d9d6b0e629
Nav: Renamed private ImGuiNavDir_ enum to use left/right/up/down to be consistent with key enums ( #323 )
2016-07-30 13:45:46 +02:00
ocornut
cbe03e3108
Nav: CalcListClipping/ImGuiListClipper: fix to ensure we can navigate clipped lists ( #323 )
2016-07-30 11:22:18 +02:00
ocornut
b3ddae07d1
Nav: not activating widgets with NavActivate when NavMenu is held ( #323 )
2016-07-30 11:11:17 +02:00
ocornut
b2aaab873d
Nav: collapse button is interactve, allow collapsing, tidying up, resize speed takes account of framebuffer scale ( #323 )
2016-07-30 10:56:52 +02:00
ocornut
4735802096
Shallow tidying up ctrl+wheel scaling code in NewFrame()
2016-07-30 10:26:57 +02:00
ocornut
20a0fde012
Tidying up default clipboard handler for non Windows-OS
2016-07-30 10:02:46 +02:00
omar
cabba0f158
Update README.md
2016-07-29 18:52:38 +02:00
ocornut
f34d7ea199
Fixed bad merge
2016-07-29 11:23:04 +02:00
ocornut
5f6f4d0ffc
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-29 11:17:13 +02:00
ocornut
4a4d3eab70
Merge branch 'michaelbartnett-add-osx-homeend-keys'
2016-07-29 11:06:27 +02:00
ocornut
7086a17854
InputTextEx: got rid of unnecessary locals.
2016-07-29 11:06:16 +02:00
ocornut
776ea6b946
InputTextEx(): more shallow tidying up, still being cautious with this function
2016-07-29 11:01:06 +02:00
ocornut
666d83b5c7
InputText/IO: Got rid of individual OSX options in ImGuiIO, added io.OSXBehaviors ( #473 , #650 )
2016-07-29 10:56:47 +02:00
ocornut
0ff22dbf0b
InputTextEx(): minor tidying up
2016-07-29 10:51:35 +02:00
ocornut
e5b6ddde26
InputText(): minor tidying up/simplification following changes for osx style improvements ( #650 )
2016-07-29 10:42:08 +02:00
ocornut
802e91f69e
Merge branch 'add-osx-homeend-keys' of https://github.com/michaelbartnett/imgui into michaelbartnett-add-osx-homeend-keys
2016-07-29 10:34:01 +02:00
ocornut
d8dacd729b
Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it ( #752 )
2016-07-29 10:10:41 +02:00
ocornut
aeabda5a5f
Navigation: Tap NavMenu to access menu and close buttons, hold to focus/resize ( #323 )
...
Introducing a concept of NavLayer to filter navigable items
2016-07-24 14:56:14 +02:00
ocornut
c3aa36d9ab
Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu ( #323 )
2016-07-24 14:49:16 +02:00
ocornut
175f42420c
Navigation: Can nav-out but not nav-in a window with ImGuiWindowFlags_NoNav flag ( #323 )
2016-07-24 14:41:27 +02:00
ocornut
67feb5ac6c
Navigation: comments + moving init block of code above in NavUpdate(), should have no side-effect (committed to simplify next commit) ( #323 )
2016-07-24 14:15:34 +02:00
ocornut
a424d6f805
Navigation: Fixed missing initialization (had no side-effect, would be set in Begin) ( #323 )
2016-07-24 14:08:50 +02:00
ocornut
49ec65b1b5
Navigation: can't manually focus out of a modal window with controller ( #323 )
2016-07-24 14:00:29 +02:00
ocornut
5cac4926c8
Fixed display of TitleBgActive color on window before a Modal window + modal window availability for navigation ( #323 )
2016-07-24 13:56:31 +02:00
ocornut
ba43310df1
Navigation: Renaming, shortened some unnecessary long fields names ( #323 )
2016-07-24 12:46:25 +02:00
ocornut
4bbdaa4e3c
Navigation: Moving NavInitWindow() around and making it static ( #323 )
2016-07-24 11:56:36 +02:00
ocornut
b2ad33ce41
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-23 20:33:25 +02:00
ocornut
e9d8b48a4c
Navigation: Allow to navigate out of text input with direction or NavCancel ( #323 )
2016-07-23 20:30:44 +02:00
ocornut
2f94563564
Navigation: Collapsed window uses ImGuiCol_TitleBgActive when navigation is active ( #323 )
2016-07-23 20:09:41 +02:00
ocornut
afadc7cf59
Navigation: Scoring: Improved directional navigation. Not totally cancelling out dx. Better support for zero-spaced items. ( #323 )
2016-07-23 20:05:17 +02:00
ocornut
e74d96642f
Navigation: mouse/popup position gets clamped within visible display ( #323 )
2016-07-23 19:42:19 +02:00
ocornut
0cc20fca83
Navigation: Scoring uses rectangle as clipped by parent. Fix selectable extending past parent column among other things ( #323 )
2016-07-23 19:24:56 +02:00
ocornut
2f1fb41579
Navigation: Fixed automatic fallback scrolling from glitching near scroll limits because of miscalculation of SizeContents ( #323 )
2016-07-23 16:31:23 +02:00
ocornut
ad48309047
Navigation: Fixed using NavWindowed when a menu is open. ( #323 )
2016-07-23 16:01:27 +02:00
ocornut
2cab404a81
Fixed tooltip positioning issues when using navigation ( #323 )
2016-07-23 15:44:56 +02:00
ocornut
bccd3d8a32
Merge branch 'nProtect-master'
2016-07-20 11:39:53 +02:00
ocornut
8efd05a148
Tab->Spaces, missing spaces, typos
2016-07-20 11:39:38 +02:00
Adisorn Aeksatean
4141144b21
Added GetGlyphRangesThai()
2016-07-20 11:37:08 +02:00
ocornut
c2cb2a6928
Gamepad/Keyboard navigation support, initial commit, WIP ( #323 )
2016-07-20 00:02:59 +02:00
ocornut
4a11cc35b9
Updated code for repeat delay / repeat handling. GetKeyPressedAmount() now returns a count to support fast repeat rate (where DeltaTime > RepeatRate).
...
Renamed from recently added IsKeyPressed() variant to GetKeyPressedAmount(). (no API breakage, added in branch, bbd3b75609 ) (#323 )
2016-07-19 21:26:36 +02:00
ocornut
88c1966629
Added IsAnyWindowFocused(). Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsPosHoveringAnyWindow() -> IsAnyWindowHoveredAtPos(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
2016-07-18 18:24:23 +02:00
ocornut
23a81027e8
Comment on invalid comment regarding preserving keyboard focus of a closed window, due to commit 19d02becef. This is probably still what we want. (followup #727 )
2016-07-18 18:22:11 +02:00
ocornut
eb405ab375
DragBehavior: Moving code around, in what should be a no-op, to simplify upcoming Nav diff ( #323 , #180 )
2016-07-18 18:22:10 +02:00
ocornut
c816e6c742
Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). ( #323 , #246 )
2016-07-18 18:22:09 +02:00
ocornut
e10ecfe28a
BeginChild(): tweak to make the code easier to understand
2016-07-18 18:22:08 +02:00
ocornut
24f79b91bd
Style: minor tweak to default color theme to make currently focused window more prominent ( #323 , #707 )
2016-07-18 18:22:07 +02:00
ocornut
e72e3b2cbc
Demo: tweaks.
2016-07-18 18:22:06 +02:00
ocornut
0300e73b3f
Comments
2016-07-18 15:26:07 +02:00
ocornut
2df229d002
Fixed incorrect comment for ParentWindow ( #615 , #604 )
2016-07-18 15:26:06 +02:00
ocornut
068984691e
Tab-key focusing inhibited when CTRL is held ( #323 )
2016-07-18 15:26:05 +02:00
ocornut
267e54cf06
NewFrame(): update activeid data and keyboard before mouse. Should have no side-effects! (So that later we can update Nav between Keyboard and Mouse) ( #323 )
2016-07-18 15:26:04 +02:00
ocornut
272745bd93
ImGuiIO: initializing fields in the same order as the declaration.
2016-07-18 15:26:03 +02:00
ocornut
848e62bfe0
InputText: don't process keys during the activation frame (this is mostly a workaround to that activation with enter doesn't validate immediately, which is turns triggers an assert in InputScalarAsWidgetReplacement - can't see an issue with changing it this way so trying out) + using local flag clear_active_id to only clear the active id at the end of the frame, which is one of the step that my stash for #701 requires. ( #323 )
2016-07-18 15:26:02 +02:00
ocornut
57841f417d
SliderBehavior, RoundScalar: split into separate functions for usage in upcoming nav commits. Testing power==1.0f without fabsf(). Maybe just use == 1.0f as well? ( #323 )
2016-07-18 15:26:01 +02:00
ocornut
6f7da2f9f2
Popup: Fixed popup initial frame reading MousePos again instead of the value already stored within the CurrentPopupStack in the previous frame. Doesn't make a big difference here, but will do as gamepad/keyboard navigation will set its own popup position. ( #323 )
2016-07-18 15:26:01 +02:00
ocornut
91e1c56da6
Minor bits.
2016-07-18 15:25:59 +02:00
ocornut
bbd3b75609
Added IsKeyPressed() with explicit repeat delay and repeat rate (for usage by nav) ( #323 )
2016-07-18 15:25:58 +02:00
ocornut
9f92cc255b
SetActiveId() sets ActiveIdIsJustActivated only when id changes. ( #323 )
2016-07-18 15:25:57 +02:00
ocornut
ffdd7d7f17
Begin: Moved code that calls FocusWindow() on a newly appearing window lower in the function so that Nav branch can use CursorStartPos on the first window frame. ( #323 )
...
Pushing in master because it _should_ be a no-op but I'd rather test for any issue in Begin() as soon as possible.
2016-07-18 15:25:44 +02:00
ocornut
19d02becef
Closing the focused window restore focus to the first active root window in descending z-order (part of #727 )
2016-07-17 19:17:49 +02:00
ocornut
e215905765
Fixed scrolling offset when using SetScrollY(), SetScrollFromPosY(), SetScrollHere() with menu bar.
...
Tests:
a) add SetScrollY(+20) after Begin("ImGui Demo") test with/without title/menu.
b) add ImGuiWindowFlags_MenuBar in BeginChild() in scrolling tracking demo.
2016-07-16 18:12:41 +02:00
ocornut
4961b2ea18
Speculative build fix for FreeBSD+GLIBC configuration
...
See
a1f9b62dd0
2016-07-16 11:44:10 +02:00
ocornut
44a13a7f25
Windows: No default IME handler when compiling using GCC. ( #738 )
2016-07-16 11:29:41 +02:00
ocornut
04b36bc397
TODO list
2016-07-14 13:38:44 +02:00
ocornut
81036ee46f
InputTextMultiline(): fix so that IsItemActive() can be used afterwards (otherwise the info was lost by using child/group)
2016-07-14 13:27:14 +02:00
ocornut
c0f77f12ea
InputText(): Fixed state corruption/crash bug in stb_textedit redo logic when exhausting undo char buffer ( #715 #681 )
2016-07-14 13:08:37 +02:00
ocornut
88721118fd
InputTextEx: comments (related to #725 )
2016-07-13 01:54:29 +02:00
ocornut
d9e2e688e9
InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. ( #725 )
...
Partial fix, won't stop ids from functioning because of a zombie id.
2016-07-13 01:18:59 +02:00
ocornut
9c71ec38f0
ImVector: reserve() tweak to avoid undefined behavior warning ( #731 )
2016-07-12 11:19:38 +02:00
Michael Bartnett
921fc50c85
add shortcut+backspace support
2016-07-07 13:03:00 -04:00
Michael Bartnett
86f42b5950
osx uses super+arrows for home/end, built on work in ocornut/imgui#473
2016-07-07 13:02:52 -04:00
ocornut
5525c2356a
Using GetCurrentWindowRead() instead of GetCurrentWindow()
2016-06-29 10:30:42 +02:00
ocornut
fe7274b6c7
SetCursorScreenPos() fixed not adjusting CursorMaxPos as well
2016-06-29 10:25:47 +02:00
ocornut
b9b3dec7da
ImGuiListClipper: Fix to behave within column ( #661 , #662 , #716 )
2016-06-29 10:19:01 +02:00
ocornut
74bbfcfaa6
ImGuiListClipper: fixed automatic-height calc path dumbly having user display element 0 twice ( #661 , #716 )
...
First bug out of two. Was easily visible using e.g. 50% alpha text.
2016-06-29 10:07:36 +02:00
ocornut
297bb3fc92
NextColumn() tidying up with a sane early out
2016-06-29 09:53:02 +02:00
ocornut
ba7acdac47
Added assert to track stb_textedit.h issue ( #715 )
2016-06-27 12:59:49 +02:00
ocornut
c36fd541ad
InputTextMultiline(): Fixed Ctrl+DownArrow moving scrolling out of bounds
2016-06-27 09:56:45 +02:00
ocornut
e06852abaf
Fixed Windows default clipboard leaving its buffer unfreed on application's exit. ( #714 )
2016-06-26 13:24:30 +02:00
ocornut
de61fcc619
Minor bits
2016-06-25 17:03:49 +02:00
ocornut
355dae5d99
Comments amend 3c8e490778 (committed before saving last comment edit) ( #703 )
2016-06-25 14:37:14 +02:00
ocornut
3c8e490778
Comment on dealing with io.WantCaptureKeyboard ( #703 )
2016-06-25 14:28:58 +02:00
ocornut
13615a1318
InputText: render currently edited buffer from the internal buffer, toward #701
2016-06-25 13:57:05 +02:00
ocornut
2f4e2eec68
InputText, ImGuiTextFilter: using strncpy instead of printf("%s").
2016-06-25 13:54:34 +02:00
ocornut
4621b357c1
Wrapped text: fixed incorrect testing for negative wrap coordinates, they are perfectly legal. ( #706 )
2016-06-19 12:50:22 +02:00
ocornut
92bff4c8d7
ColorEdit4(): better preserve inputting value out of 0..255 range, display then clamped in Hexadecimal form
2016-06-16 23:09:48 +02:00
ocornut
9cb271f4c8
Fixed minor text clipping issue in window title for when using font straying above usual line ( #699 )
2016-06-15 23:09:40 +02:00
ocornut
1ef7980e17
Merge branch 'master' into 2016-02-colorpicker
2016-06-15 10:05:17 +02:00
ocornut
c4db79f34b
Member variable name renamed "ID" "Id" for casing consistency
2016-06-12 22:27:15 +02:00
ocornut
f83790dc5a
Comments
2016-06-12 12:23:20 +02:00
ocornut
9f21c7189f
TextUnformatted() fixed clipping bug in the large-text path when horizontal scroll has been applied ( #692 , #246 )
2016-06-12 12:23:16 +02:00
ocornut
d79186931e
ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command
2016-06-11 15:42:10 +02:00
ocornut
3fd3eac370
Fixed TextWrapped() override wrap position is one is already set ( #690 )
2016-06-11 10:23:37 +02:00
ocornut
2da30e8702
Comments ( #691 )
2016-06-11 09:28:20 +02:00
ocornut
65a525550e
ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000)
2016-06-07 09:14:54 +02:00
ocornut
4fddfa4b5e
Demo: extra (somehow duplicate) Selectables+Columns demo
2016-06-07 09:05:36 +02:00
ocornut
d6a5fd06d7
Demo: Added an extra 3-way columns demo
2016-06-07 08:46:50 +02:00
ocornut
0f36ec9cb9
Fixed a crash bug in stb_textedit.h ( #681 )
2016-06-04 14:48:08 +01:00
ocornut
8291d7dc7c
Fixed minor bug introduced in 45dacbf084 ( #682 )
...
Actually minor because nobody uses that value. Still a terrible
bug.
2016-05-31 22:34:48 +02:00
ocornut
d1c073a199
Comments, tweaks
2016-05-31 00:00:44 +02:00
ocornut
254a1a9e4c
InputText: Added support for CTRL+Backspace.
2016-05-30 20:00:20 +02:00
ocornut
5d4cf1c3f3
Version 1.50 WIP
2016-05-30 19:38:36 +02:00
ocornut
adb85d800d
Version 1.49
2016-05-29 19:16:44 +02:00
ocornut
9a751da136
Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files
2016-05-29 19:14:19 +02:00
ocornut
3ddb50a925
Merge branch 'master' into 2016-02-colorpicker
2016-05-29 19:07:23 +02:00
ocornut
0fb51b6b4b
Removed various superflous ImGui:: prefixes in internal code
2016-05-29 18:58:41 +02:00
ocornut
9886c1b43d
Undo modification of ContentsRegionRect.Max, too many side-effects (undo dff078365f)
2016-05-29 18:37:26 +02:00
ocornut
dcef7dedce
Comments ( #590 )
2016-05-29 18:24:02 +02:00
ocornut
784e1ef053
CollapsingHeader() with close button adapt to horizontal scrolling ( #600 )
2016-05-29 18:12:25 +02:00
ocornut
dff078365f
Fix selectable/tree node not reaching right-side of contents size when horizontal scrolling is active and no explicit size is known
2016-05-29 18:08:51 +02:00
ocornut
45dacbf084
Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect.
...
Relates to horizontal scrollbar, explicit contents size
2016-05-29 17:50:23 +02:00
ocornut
d5a12866fe
Comments ( #676 , #655 )
2016-05-29 14:00:35 +02:00
ocornut
1483a69c11
Demo: Tree: showing how to align tree node label with current x position ( #324 , #581 )
2016-05-28 19:30:01 +02:00
ocornut
61c294bb52
Added optional Indent() Unindent() width ( #324 , #581 )
2016-05-28 18:40:00 +02:00
ocornut
a0a48f6e59
Added TreeAdvanceToLabelPos() ( #581 )
2016-05-28 18:15:54 +02:00
ocornut
793f5f8cdb
Comments
2016-05-28 17:54:40 +02:00
ocornut
806a146198
TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet ( #324 , #581 )
2016-05-28 17:12:13 +02:00
ocornut
2acb61e3a1
Comments
2016-05-28 16:52:59 +02:00
ocornut
b5521a81d4
Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection ( #581 )
2016-05-28 14:18:46 +02:00
ocornut
8f4b123e1b
SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints ( #668 )
2016-05-28 14:02:14 +02:00
ocornut
213025f3cd
BeginMenu: a menu that becomes disabled when open gets closed down, facilitate user's code ( #126 )
2016-05-28 11:14:02 +02:00
ocornut
65b1ae6ecc
Comments ( #335 )
2016-05-22 10:20:58 +02:00
ocornut
e3d8055d90
Speculative 64-bit warning fix ( #668 )
2016-05-21 23:13:11 +02:00
ocornut
3a776d93f2
Fixed compile issue (bloody git stashes) ( #668 )
2016-05-21 23:03:21 +02:00
ocornut
b7ebeb1610
Added SetNextWindowSizeConstraint() + demo code ( #668 )
2016-05-21 22:53:08 +02:00
ocornut
753bf5cefe
Comments
2016-05-21 22:35:05 +02:00
ocornut
713730af0c
Minor sizing refactor, should be no-op. Making it a commit for further bisection since sizing code is super brittle. ( #668 )
2016-05-21 20:55:28 +02:00
ocornut
102d03a7eb
Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. ( #668 )
...
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
2016-05-21 20:50:15 +02:00
ocornut
81bf5aeb09
Minor bits
2016-05-21 20:07:51 +02:00
omar
681d5624f7
Merge pull request #666 from jslee02/patch-1
...
Fix minor typo in examples/README.txt
2016-05-20 13:24:41 +02:00
Jeongseok Lee
47911d92b2
Fix minor typo in examples/README.txt
2016-05-20 07:04:54 -04:00
ocornut
b4302187dd
ImFontAtlas: Tweak to allow MergeMode to apply on a font that isn't the previous one, by setting the DstFont field.
2016-05-17 19:47:13 +02:00
ocornut
1dfafeb602
CheckStacksSize() added literal strings in IM_ASSERT calls to reach end-user on common failure
2016-05-17 09:36:27 +02:00
ocornut
0e51f91c5e
Including limits.h again to get INT_MAX, assuming previous report of missing limits.h was erroneous ( #1 , yes, issue ONE!)
2016-05-16 20:27:52 +02:00
ocornut
69a29e4715
Added NewLine() (very shy reminder that #97 isn't done)
2016-05-16 20:14:07 +02:00
ocornut
47d10944a5
Build fix
2016-05-16 20:07:02 +02:00
ocornut
787be01e61
ImGuiListClipper comments ( #660 , #661 , #662 )
2016-05-16 20:03:18 +02:00
ocornut
f291f2c5dd
InputText(): Fixed cursor rendering on first character when framepadding is 0.0 (following #601 )
2016-05-16 19:44:03 +02:00
ocornut
28b09199de
ImGuiListClipper: removed assert ( #662 )
2016-05-16 19:25:42 +02:00
ocornut
7a28f5bb81
ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere ( #662 )
2016-05-16 19:22:51 +02:00
ocornut
fa5ae60bce
Demo: added decorated label to some vertical sliders.
2016-05-16 12:05:26 +02:00
ocornut
82fa628135
Merge branch 'trezanik-master'
2016-05-16 10:55:04 +02:00
ocornut
1349d0aacf
Examples: DirectX9: Removing spaces ( #663 )
2016-05-16 10:54:52 +02:00
ocornut
e41fbb0390
Merge branch 'master' of https://github.com/trezanik/imgui into trezanik-master
2016-05-16 10:51:29 +02:00
Trezanik
790275eae2
Example: DirectX9: Backup and restore all state
2016-05-16 01:02:09 +01:00
ocornut
339e191c53
Demo: Console: Add a "Scroll to bottom" button ( #662 )
2016-05-15 18:08:41 +02:00
ocornut
9e6ed0991d
Demo: clarified misleading example ( #660 )
2016-05-15 16:03:15 +02:00
ocornut
431eaf1abe
Comments to clarify what float[2] int[2] etc. are. May switch to pointers? ( #659 )
2016-05-14 15:35:50 +02:00
ocornut
39bda5ea09
Fixed a IMGUI_API->inline case ( #657 , #349 )
2016-05-14 10:22:25 +02:00
ocornut
e79d2828c4
Metrics window: coarse clipping the detailed vertex buffer for pleasure and benefits.
2016-05-13 23:10:16 +02:00
ocornut
f48f9a30ef
ButtonBehavior(), fixed subtle old bug when a repeating button would also return true on release + comments ( #656 )
2016-05-13 11:13:54 +02:00
ocornut
e1e2752dcb
Fixed repeating button behavior triggering twice, typically affect the +/- of InputInt/InputFloat and user repeating buttons ( #656 )
...
+ Took note of further work
Broken in 547f34cf22
2016-05-13 10:50:59 +02:00
ocornut
a2a5d71582
Demo: Tweak irritating pink color.
2016-05-12 23:13:54 +02:00
ocornut
8d5b2fba95
Fixed TitleBg/TitleBgActive color being rendered above WindowBg color, being inconsistent and causing visual artefact ( #655 )
...
Broke the meaning of TitleBg and TitleBgActive. Only affect values where
Alpha<1.0f. Fixed default theme.
2016-05-12 23:12:55 +02:00
ocornut
b628acbb52
StyleEditor: comments ( #652 )
2016-05-12 20:59:20 +02:00
omar
10d3da6b73
Merge pull request #641 from cosmy1/errors-fix
...
Fix compilation errors when disabling test windows.
2016-05-12 13:41:05 +02:00
ocornut
2f55dc1f33
ImFontConfig: Clarified persistence requirement of GlyphRanges array ( #651 )
2016-05-12 11:58:05 +02:00
ocornut
ed20fcf9d5
Fixed incorrect parameter to ButtonBehavior() in Columns code - had no side-effect ( #649 )
...
Broken in 3eabad0321
2016-05-11 10:31:30 +02:00
ocornut
91f11fb1bd
Comments / todos
2016-05-11 09:58:43 +02:00
ocornut
8648346eab
Modal: fixed non-child window stacked over a modal losing its hoverabilty/focusability ( #615 , #604 )
2016-05-10 17:02:10 +02:00
ocornut
b630cb5b42
ImGuiWindow: Storing ParentWindow ( #615 , #646 )
2016-05-10 17:00:42 +02:00
Branimir Karadžić
a59a04f4d0
Fixed iOS/OSX build.
2016-05-10 01:10:31 +02:00
cosmy1
4b5a4cae09
Fix compilation errors when disabling test windows.
2016-05-09 00:21:05 +02:00
ocornut
aa11934efa
Comments to clarify default shared ImFontAtlas and current context pointer thread-safety ( #586 , #591 )
2016-05-08 17:12:54 +02:00
ocornut
8a0d3b9628
Examples; DirectX10/11: Added comments about removing dependency on d3dcompiler DLL ( #638 )
2016-05-08 11:49:21 +02:00
ocornut
382253eccf
Merge branch 'master' of https://github.com/ocornut/imgui
2016-05-07 21:10:16 +02:00
ocornut
36ca8a8194
Minor warnings fixes.
2016-05-07 21:09:53 +02:00
omar
8af76d56b4
Merge pull request #639 from sergof/conversion-warnings
...
Ignore various anal GCC warnings.
2016-05-07 21:08:43 +02:00
ocornut
2ef766a1ce
Examples: DirectX10: Apply depth-stencil state like DirectX11 example ( #640 , #636 )
2016-05-07 20:57:38 +02:00
ocornut
656b1e848c
Examples: DirectX11: Fixed uninitialized fields. Disabling depth-write ( #640 , #636 )
2016-05-07 20:53:55 +02:00
ocornut
f4633d09ac
Examples: DirectX10, DirectX11: Removed seemingly unnecessary bunch of rasterizer state creation code.
2016-05-07 20:19:04 +02:00
ocornut
834bfe4af5
Examples: DirectX11: Fixed handle leak + minor coding style fix for #640
2016-05-07 20:11:14 +02:00
ocornut
1e9c9df6de
Merge branch 'master' of https://github.com/josiahmanson/imgui into josiahmanson-master
2016-05-07 20:04:41 +02:00
ocornut
7b9c0a5c3f
Renamed ImGuiState -> ImGuiContext ( #586 , #269 )
2016-05-07 19:55:51 +02:00
ocornut
8b428e8c74
Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() ( #586 , #269 )
2016-05-07 19:54:27 +02:00
josiahmanson
5fe2cacd4d
DX11 example depth test
2016-05-07 10:42:48 -07:00
Sergej Reich
6e8579fc14
Ignore implicit conversion warnings
2016-05-07 18:49:24 +02:00
ocornut
69cc00f91f
ImGuiStorage: Added bool helper functions for completeness.
2016-05-07 18:18:37 +02:00
ocornut
ce4d731486
Minor comments, tweaks
2016-05-07 18:10:32 +02:00
ocornut
313d388bba
Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows ( #635 )
2016-05-06 11:31:32 +02:00
ocornut
67df0ba185
Updated FAQ and Readme with more prominent info about WantCaptureMouse etc. flags ( #635 )
2016-05-06 09:18:07 +02:00
ocornut
f22b6e1e09
Fixed/silenced various absurd GCC warnings from outer space ( #626 )
2016-05-04 23:28:16 +02:00
ocornut
c1da3e354e
Examples: SDL: Fixed unused variable warning on non-Windows platforms ( #626 )
2016-05-04 23:20:41 +02:00
ocornut
79ad22e1f2
Fixed various Clang -Weverything warnings ( #626 )
2016-05-04 23:17:53 +02:00
ocornut
efedaa5df3
Updated FAQ ( #628 )
2016-05-04 20:49:17 +02:00
ocornut
9b79327673
BeginGroup() fixed using within Columns set ( fix #630 )
2016-05-04 20:22:57 +02:00
ocornut
0058492156
Fonts readme, refering to IconFontCppHeaders, AddRemapChar() function, etc.
2016-05-04 17:20:11 +02:00
ocornut
4ce6cf0512
Demo: Moved "Fonts" section style editor
2016-05-03 20:22:35 +02:00
ocornut
f46c91f5ad
Examples: DirectX9: Removed dependency on dxguid.lib + remainder of d3dx9.lib ( #611 )
2016-05-03 11:30:43 +02:00
ocornut
731ff3d3f5
Examples: DirectX9: Removed dependency on dx3x9 (remainder) ( #611 )
2016-05-03 11:12:59 +02:00
ocornut
50df86985d
Examples: DirectX9: Removed dependency on dx3x9.h so it can be used in a DirectXMath.h only environment ( #611 )
2016-05-03 10:47:42 +02:00
ocornut
89d5026187
Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). ( #625 , #579 )
2016-05-02 12:32:16 +02:00
omar
1b9894cfb4
Merge pull request #624 from develophant/master
...
Fix typo in Programmer guide
2016-05-02 09:48:54 +02:00
Anton Holmberg
4f34ed5010
Fix typo in Programmer guide
2016-05-01 16:18:31 -07:00
ocornut
4170b4847d
Style: Changed default IndentSpacing from 22 to 21 ( #581 , #324 )
2016-05-01 23:49:10 +02:00
ocornut
13df4668d1
Added GetTreeNodeToLabelSpacing() helper - tentative name ( #581 , #324 )
2016-05-01 23:47:58 +02:00
ocornut
b93040e600
TreeNode: minor tidying up ( #581 , #324 )
2016-05-01 23:46:48 +02:00
ocornut
bb674ccee6
TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag ( #581 , #324 )
2016-05-01 21:15:46 +02:00
ocornut
9733f4fa24
Internal RenderBullet() helper.
2016-05-01 20:19:28 +02:00
ocornut
f79b2d6ce3
TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag ( #581 , #324 , #190 )
2016-05-01 20:12:14 +02:00
ocornut
df764c21d6
Bullet(), BulletText(): slightly bigger. less polygons
2016-05-01 20:04:48 +02:00
ocornut
470b88e965
ButtonBehavior(): ImGuiButtonFlags_PressedOnDoubleClick clears active id on double-click so that multiple flags don't trigger multiple times
2016-05-01 20:02:25 +02:00
ocornut
dc8446d048
Demo: Added simple tree node selection demo ( #581 , #516 , #190 )
2016-05-01 17:55:04 +02:00
ocornut
4c880b7106
Added ImGuiTreeNodeFlags_OpenOnDoubleClick ( #581 , #516 , #190 )
2016-05-01 17:46:08 +02:00
ocornut
a38fd2e186
Added TreeNodeEx() functions ( #581 , #600 , #190 )
2016-05-01 17:45:31 +02:00
ocornut
547f34cf22
Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516 )
2016-05-01 17:43:51 +02:00
ocornut
ac501102fc
Added IsItemClicked() helper ( #581 )
2016-05-01 17:43:17 +02:00
ocornut
ec6471ca87
TreeNodeEx() wired the display-side ImGuiTreeNodeFlags_Selected flag ( #581 )
2016-05-01 16:06:46 +02:00
ocornut
ab6bc05fc3
Fixed ImGuiTreeNodeFlags_AllowOverlapMode to behave better on touch-style inputs ( #600 )
2016-05-01 15:44:50 +02:00
ocornut
df749e3f13
Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. ( #600 )
...
New flag and declaration makes uses of SetNextTreeNode() functions on
collapsing header more obvious as well (#579 ).
2016-05-01 14:34:55 +02:00
ocornut
befe02559a
Added IsRootWindowOrAnyChildHovered() helper ( #615 )
2016-05-01 12:14:07 +02:00
ocornut
60d6c6d0e8
Comments/tweaks on ItemAdd()
2016-05-01 11:46:49 +02:00
ocornut
bfb2dc2290
Examples: OpenGL3: Saving/restoring glActiveTexture() state ( #602 )
2016-04-30 19:02:19 +02:00
ocornut
7406d64c64
PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582 )
2016-04-30 18:55:23 +02:00
ocornut
819cc414b1
Metrics window: uses IM_COL32() macro to generate constant colors.
2016-04-28 10:25:23 +02:00
ocornut
c5149cd53c
MenuItem(): checkmark render in disabled color when disabled
2016-04-27 23:34:24 +02:00
ocornut
be7621f7c5
Updated FAQ about non UTF-8 literal ( #609 , #613 )
2016-04-26 19:23:36 +02:00
ocornut
544ba36bf6
Fixed GetFrontMostModalRootWindow() ( #604 )
2016-04-26 11:59:56 +02:00
ocornut
6bcc31e575
Merge branch 'master' into 2016-02-colorpicker
2016-04-26 11:06:24 +02:00
ocornut
ea6b615179
Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ( #610 )
2016-04-26 11:03:51 +02:00
ocornut
4b6e9ac396
ImFont: Added AddRemapChar() helper ( #609 )
2016-04-26 10:08:06 +02:00
ocornut
247da0e01b
BeginGroup() comment tweaks ( #608 )
2016-04-25 08:45:32 +02:00
ocornut
4b51e43d60
BeginGroup() extra comment because this is overused and misleading ( #608 )
2016-04-24 22:52:07 +02:00
ocornut
919eb69931
Scrollbar: minor fix for top-right rounding of scrollbar background when window has menubar but no title bar
2016-04-24 22:38:30 +02:00
ocornut
7da2d51480
MenuBar fixed missing lower border
2016-04-24 22:36:46 +02:00
ocornut
a753aff07a
Moved Bullet*() code below TreeNode*() code.
2016-04-24 19:38:37 +02:00
ocornut
c2c0b57e5e
Examples: OpenGL2: Extra comments ( #606 )
2016-04-24 18:11:54 +02:00
ocornut
a0c411ffd2
Fixed typos in previous commit 1884f550bc ( #582 , #597 ))
2016-04-23 14:40:43 +02:00
ocornut
1884f550bc
Fixed clipping rectangle floating point representation to ensure renderer-side ops yield correct results ( #582 , 597)
2016-04-23 14:22:41 +02:00
ocornut
41215534d5
Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),
2016-04-23 14:10:36 +02:00
ocornut
727ca4bd17
ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes
2016-04-23 11:37:18 +02:00
ocornut
a20d69f9ce
ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split
2016-04-23 11:29:42 +02:00
ocornut
44fb99542f
ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead.
2016-04-23 11:09:56 +02:00
ocornut
fe73a23cf5
ImFont: Added RenderChar() helper.
2016-04-22 19:58:10 +02:00
ocornut
29e259a43c
InputText() clipping cursor rendering in case it gets out of the box (which can be forced w/ ImGuiInputTextFlags_NoHorizontalScroll) ( #601 )
2016-04-22 08:38:56 +02:00
ocornut
7ce6c18bbe
Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h ( #600 )
2016-04-21 09:55:02 +02:00
ocornut
559963e832
Examples: Apple/iOS: lowered xcode project deployment target from 10.7 to 10.11 ( #598 , #575 )
2016-04-20 20:49:49 +02:00
ocornut
ab4a69bcd4
Comments
2016-04-19 18:31:40 +02:00
ocornut
fc3b8d0a56
Relative order of Child windows creation is preserved during sort ( #595 )
2016-04-19 18:31:25 +02:00
ocornut
d92f1deff8
ImDrawList: Added AddQuad(), AddQuadFilled() helpers.
2016-04-18 19:04:47 +02:00
omar
fec7dc22a9
Update README.md - binaries
2016-04-18 16:33:49 +02:00
omar
ce61367520
Update README.md - binaries
2016-04-18 16:33:04 +02:00
omar
af46ca2b4c
Merge pull request #587 from sergof/patch-1
...
Fix font config propagation in FontFromMemoryCompressedTTF()
2016-04-13 09:52:34 +02:00
Sergej Reich
d5eb87d0a2
Fix font config propagation in FontFromMemoryCompressedTTF()
2016-04-13 02:01:18 +02:00
ocornut
1612ca071b
Examples: SDL: Initialize video+timer subsystem only.
2016-04-13 00:15:58 +02:00
ocornut
006934fd15
Todo items + not using function called isblank() because it may be a macro in some C library
2016-04-12 22:36:51 +02:00
ocornut
4466a7b3b0
Examples: DirectX9: save/restore some more device state.
2016-04-11 18:33:16 +02:00
ocornut
074a6853c7
Moved comments
2016-04-09 19:13:02 +02:00
ocornut
77177c18f0
Merge branch 'master' into 2016-02-colorpicker
2016-04-09 19:12:03 +02:00
ocornut
1588eda1ac
Version 1.49 WIP
2016-04-09 19:10:42 +02:00
ocornut
95cbcdca3f
Version 1.48
2016-04-09 17:46:48 +02:00
ocornut
4c25de950c
Warning fixes for clang. Using int64_t, may be an issue?
2016-04-09 17:46:38 +02:00
ocornut
31852e1d05
Silence borderline warning with -Werror=strict-overflow
...
Error: assuming signed overflow does not occur when assuming that (X -
c) > X is always false [-Werror=strict-overflow]
2016-04-06 11:11:38 +02:00
omar
319e288eef
Update README.md
2016-04-05 23:08:21 +02:00
ocornut
71b981d05f
Examples: Apple: Readme tweaks ( #575 #247 )
2016-04-05 22:50:23 +02:00
omar
b359ed7b3e
Remove local glfw3 lib for osx. (+1 squashed commit)
...
Examples: Added OS X example (moved from ios, added support for os x)
2016-04-05 22:43:36 +02:00
James Chen
67b604412b
Remove local glfw3 lib for osx. (+1 squashed commit)
...
Squashed commits:
[34cc3b7] Adds osx example. (+6 squashed commits)
Squashed commits:
[20330f2] Uses glfw by brew install.
[0427861] Renames imguiex folder name to imguiex-ios
[f9e27e5] Renames ios_example to apple_example.
[44f8fe3] Updates the glfw header/library path.
[919f279] Renames target from imguiex to imguiex-ios since there is already a imguiex-osx target now.
[24395f5] Adds osx example.
2016-04-05 18:13:48 +08:00
cheriff
2ee76bbff6
Trivial format string fix in demo
2016-04-05 09:23:00 +02:00
ocornut
e808b7cfca
Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. ( #337 )
...
bg_alpha parameter of 5-parameters version of Begin() is an override,
however that function may become obsolete someday.
2016-04-04 01:37:02 +02:00
ocornut
947171dcef
Fixed InputTextMultiLine(), ListBox(), BeginChildFrame(): outer frame not honoring bordering (following #462 )
2016-04-04 00:30:50 +02:00
ocornut
07df3cfb3e
Added ImGuiWindowFlags_AlwaysUseWindowPadding flag to ensure non-border child window uses window padding ( #462 )
2016-04-04 00:29:57 +02:00
ocornut
8e353af1d3
Renamed ImGuiWindowFlags_Force**Scrollbar to ImGuiWindowFlags_Always**Scrollbar ( #476 )
2016-04-03 23:28:05 +02:00
ocornut
26be1511e9
Merge branch 'Loftilus-master'
2016-04-03 17:43:40 +02:00
ocornut
c1427de5b6
Examples: Libs: Update glfw binaries to glfw master.
2016-04-03 17:41:59 +02:00
ocornut
0e7b9b8284
Examples: Vulkan: Coding style tweaks.
2016-04-03 17:32:53 +02:00
ocornut
9c513d4443
Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master
2016-04-03 16:42:56 +02:00
ocornut
f45fd1cef6
Comments
2016-04-03 16:42:35 +02:00
ocornut
552246feed
Examples: DirectX10,DirectX11 : Minor renaming
2016-04-03 13:02:04 +02:00
ocornut
518f32ccfe
Examples: DirectX10: Save/restore state + minor cleanups ( #570 )
2016-04-03 12:59:56 +02:00
ocornut
90493f8add
Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570 )
2016-04-03 12:48:38 +02:00
ocornut
726b91a2cd
Merge branch 'nlguillemot-patch-1'
2016-04-03 12:43:43 +02:00
ocornut
2942240072
Examples: DX11: Cleanup state backup/restore code ( #570 )
2016-04-03 12:43:17 +02:00
Nicolas Guillemot
d4d51a7802
capture and restore all state
2016-04-02 19:08:27 -07:00
ocornut
4c1d4233b2
Merge branch 'master' into 2016-02-colorpicker
2016-04-03 01:10:26 +02:00
ocornut
650515ce49
Updated todo list and comments
2016-04-03 01:07:11 +02:00
ocornut
d53c308852
Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394
2016-04-03 00:47:41 +02:00
ocornut
1eacfd120b
Update README.md
2016-04-03 00:26:00 +02:00
ocornut
c61e08e8c4
InputText: move to next word OS X style behavior on OS X ( #473 )
2016-04-02 22:06:47 +02:00
ocornut
aeaf5ccebb
stb_textedit.h: proposal for upstream PR to allow custom move-left/move-right handlers (following #473 )
2016-04-02 21:20:41 +02:00
ocornut
9945eecaf4
stb_truetype: updated 1.08 > 1.10 + minor unused variable warning fix
2016-04-02 20:12:20 +02:00
ocornut
c3376cd45c
stb_textedit.h Local warning fixes
2016-04-02 20:08:42 +02:00
ocornut
e7b95646b9
stb_textedit.h updated to 1.8 (our two main changes were merged now)
2016-04-02 20:08:11 +02:00
ocornut
f48fc51777
IO: Added unused MultiSelectUsesSuperKey dummy field to convey semantic for OS X compatible behavior ( #473 )
2016-04-02 18:58:42 +02:00
ocornut
aa7a29cdbf
InputText(): Added io.DoubleClickSelectsWord option for OS X compatible behavior ( #473 )
2016-04-02 18:57:50 +02:00
ocornut
587fc60f25
InputText/IO: Added WordMovementUsesAltKey , ShortcutsUseSuperKey for OS X Compatible behavior ( #473 )
2016-04-02 18:57:08 +02:00
ocornut
a6399f120f
IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ( #473 )
...
NB: Value not used.
2016-04-02 18:22:40 +02:00
omar
171b0e5ca9
Update README.md
2016-03-30 16:30:17 +02:00
ocornut
ae0c33c983
Examples: Links
2016-03-29 11:33:23 +02:00
ocornut
9e817a7c38
ColorPicker3/4: Fixed missing ID scoping ( #346 )
2016-03-28 23:45:23 +02:00
ocornut
6a241d4895
ColorPicker3: Fixed
2016-03-28 23:38:04 +02:00
ocornut
326c4e40f8
Merge branch 'master' into 2016-02-colorpicker
2016-03-28 23:17:13 +02:00
omar
41c5d4651b
Update README.md
2016-03-27 12:04:17 +02:00
omar
c4876078b4
Update README.md
2016-03-27 11:43:12 +02:00
ocornut
cfbf06e394
Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)
2016-03-27 10:38:14 +02:00
omar
39c9bb73e8
Merge pull request #563 from mneumann/fix_dragonfly
...
Fix compilation on DragonFly BSD
2016-03-26 16:40:00 +01:00
ocornut
7661b1e778
Trim trailing spaces
2016-03-26 15:43:45 +01:00
ocornut
2b7eeba143
Trim trailing spaces
2016-03-26 15:38:52 +01:00
ocornut
d6750c87c2
Combo: display popup above if there's isn't enough space below / or select largest side ( #505 )
2016-03-25 23:36:43 +01:00
ocornut
7c9fa59329
Combo: Right-most button stays highlight when popup is open.
2016-03-25 22:55:45 +01:00
ocornut
c71aae08f3
Merge branch 'brushfiregames-master'
2016-03-25 22:28:19 +01:00
ocornut
fdc4299c6c
Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
2016-03-25 22:27:43 +01:00
ocornut
e6c2c1fcfd
Examples: SDL: Minor fixes to follow syntax of other examples ( #495 )
2016-03-25 22:25:20 +01:00
Nick Gravelyn
8a61c0afea
Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
2016-03-25 22:20:57 +01:00
Nick Gravelyn
a9b0abe493
Automatically updating DisplayFrameBufferScale by reading the OpenGL drawable size and comparing with the window size. This fixed dear imgui which was rendering only to 1/4 of my window.
2016-03-25 22:19:07 +01:00
ocornut
aecf5d12e6
DragFloat(), SliderFloat(), InputFloat(): fixed cases of erroneously returning true repeatedly after a text input modification ( #564 )
2016-03-25 21:53:59 +01:00
Michael Neumann
adb4d4d48b
Fix compilation on DragonFly BSD
2016-03-24 19:37:11 +01:00
ocornut
5b8aa0dc84
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 )
2016-03-24 11:06:57 +01:00
ocornut
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
2016-03-24 11:00:47 +01:00
ocornut
d39029f3a8
Branch fix
2016-03-23 10:51:40 +01:00
ocornut
baabe3b62c
Merge branch 'master' into 2016-02-colorpicker
2016-03-23 10:50:37 +01:00
ocornut
367c53967f
Metrics: inspect individual triangles in drawcall
2016-03-22 21:17:24 +01:00
ocornut
5bed7144fe
ImDrawList: Added AddTriangle() function
2016-03-22 20:10:06 +01:00
ocornut
9260d46c2c
Comments
2016-03-21 22:51:51 +01:00
ocornut
b495a52fc0
ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default
2016-03-21 22:43:53 +01:00
ocornut
37d50dccf9
Added GetFontTexUvWhitePixel() helper.
2016-03-21 22:30:32 +01:00
ocornut
a274a09955
Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340 )
2016-03-21 22:29:11 +01:00
ocornut
928832a5bc
Various tidying up / comments, moved columns functions declarations, no functional changes
2016-03-21 22:11:43 +01:00
ocornut
9cbc6e196b
ImDrawList: AddRect() added optional thickness parameter + updated demo
2016-03-21 21:56:23 +01:00
ocornut
86fb3a6a3c
ImDrawList: AddCircle() takes optional thickness parameter
2016-03-21 21:48:05 +01:00
omar
8e8e59a942
Merge pull request #555 from DMartinek/patch-1
...
CheckboxFlags: Added support for passing/testing multiple flags at the same time.
2016-03-21 13:09:55 -07:00
ocornut
1bd3942b8e
Merge branch 'kylawl-master'
2016-03-21 13:02:33 -07:00
ocornut
feba83cfcd
Merge branch 'master' of https://github.com/kylawl/imgui into kylawl-master
2016-03-21 13:02:25 -07:00
ocornut
a9e303e006
Minor comments
2016-03-21 12:56:56 -07:00
Kyle Rocha
b8fcb4e7e4
Converted tabs to spaces
2016-03-21 12:40:02 -07:00
Kyle Rocha
3f46d9b933
Renamed FindTextDisplayEnd to FindRenderedTextEnd
2016-03-21 12:33:48 -07:00
Kyle Rocha
5bffc85ba6
Exposed FindTextDisplayEnd to imgui_internal.h
2016-03-21 12:07:13 -07:00
Daniel Martinek
37716184b3
Fixed coding style.
2016-03-18 16:49:19 +01:00
Daniel Martinek
5abb39cb1f
Added support for CheckboxFlags that can set multiple flags at the same time.
2016-03-18 14:02:14 +01:00
Håvard Mathisen
1394616d9c
Vulkan Example: Some code layout changes.
2016-03-10 12:30:38 +01:00
Håvard Mathisen
4ea4fa3e73
Vulkan Example: Fix synchronization.
2016-03-10 11:59:42 +01:00
Håvard Mathisen
0ceddc29ff
Vulkan Example: Fix windows build.
2016-03-09 17:01:38 +01:00
Håvard Mathisen
4cbd316f01
Vulkan example.
2016-03-09 16:39:54 +01:00
ocornut
4b7edffe8a
Comments
2016-03-08 20:54:21 +01:00
ocornut
9ea093ddd0
DragFloat(): always apply value when mouse is held/widget active, so that can use a drag over an always-reseting value
2016-03-07 13:12:15 +01:00
ocornut
1dcb9c877d
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state ( #486 , #547 )
2016-03-06 10:46:57 +01:00
ocornut
6346690962
Comment ( #544 )
2016-03-04 14:09:08 +01:00
ocornut
459af7683c
Merge branch 'master' into 2016-02-colorpicker
2016-03-04 13:57:33 +01:00
ocornut
3db40903ba
InputText() ImGuiInputTextFlags_CallbackAlways event set the EventFlag field of ImGuiTextEditCallbackData ( #541 )
2016-03-04 13:07:42 +01:00
ocornut
2065cbec4d
Removed extraneous comma for pedantic compilers ( #516 )
2016-03-03 00:34:06 +01:00
ocornut
76ce08c338
Merge branch 'zapolnov-master'
2016-03-03 00:30:26 +01:00
ocornut
b816d05e33
Minor tidying up following ( #516 ) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments
2016-03-03 00:30:08 +01:00
ocornut
6846873f23
Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master
2016-03-03 00:18:58 +01:00
ocornut
d45044fe54
CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag ( #533 ) + demo + made code a little less messy
2016-03-03 00:09:41 +01:00
ocornut
cf12bc7dea
InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. ( #541 )
2016-03-02 23:34:29 +01:00
ocornut
17d3c202ac
BeginChild()/EndChild() fixed incorrect layout to allow widgets submitted after an auto-fit child wnidow ( #540 )
2016-03-02 21:46:23 +01:00
ocornut
ba80a457b9
Demo: plot code doesn't use ImVector to avoid heap allocation + comment ( #538 )
2016-02-29 12:53:05 +01:00
ocornut
1881cbe860
TextUnformatted: Fixed rare crash bug with large blurb of text (2k+) not finishing with a '\n' and fully above the clipping Y line. ( #535 )
2016-02-24 22:43:17 +01:00
ocornut
4afe67cdc8
Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) ( #536 )
2016-02-24 11:50:21 +01:00
Jefferson Montgomery
f6181b3428
Examples: DirectX12: Add directx12_example
2016-02-22 15:22:48 -08:00
ocornut
a43a9e602a
ColorEdit4: support ImGuiColorEditFlags_NoSliders to display only a button (wip #346 )
2016-02-21 23:55:01 +01:00
ocornut
f8fede1d8b
Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346 )
...
Still pretty much experimenting so may break API
2016-02-21 23:23:30 +01:00
ocornut
ab97b42935
Merge branch 'master' of https://github.com/ocornut/imgui
2016-02-21 18:10:44 +01:00
ocornut
d1061c8799
Exposed FindWindowByName() in imgui_internal.h (missing chunk following 339b67c01a)
2016-02-21 18:10:35 +01:00
omar
991d9e2884
Update README.md
2016-02-20 23:20:15 +01:00
omar
874df53403
Update README.md
2016-02-20 20:46:08 +01:00
ocornut
339b67c01a
Exposed FindWindowByName() in imgui_internal.h
2016-02-20 17:37:36 +01:00
ocornut
2813a44dcc
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer ( #486 )
2016-02-16 09:14:38 +01:00
ocornut
9e86d0e225
Examples: SDL/OpenGL: Tabs to spaces
2016-02-15 10:56:37 +01:00
ocornut
87a6110994
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order ( #527 )
2016-02-15 10:55:20 +01:00
ocornut
20ba769644
Allow windows with only a callback only to be functional + minor cleanup ( #524 )
2016-02-14 10:33:56 +01:00
ocornut
5b7a0b1b40
InputText() added comment ( #526 )
2016-02-11 23:00:14 +01:00
ocornut
07e379a950
Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures ( #521 )
2016-02-08 09:03:43 +01:00
ocornut
dafedc3246
Demo: use locally defined strdup because compilers/standard librairies are an annoyance ( #520 )
2016-02-08 08:44:45 +01:00
ocornut
2c6bc95dd5
Demo: InputText password demo filters out blanks ( #515 )
2016-02-03 09:24:57 +01:00
ocornut
b329a36d27
Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517 )
2016-02-02 19:52:30 +01:00
Nikolay Zapolnov
a908c109c0
Added flag for selectables to handle double clicks.
2016-01-31 22:08:35 +01:00
ocornut
62fe0b59bf
Updated todo list
2016-01-30 18:34:19 +01:00
ocornut
2efaa9a86f
ImDrawList: fixed index overflow check broken by AddText(). Added extra assert. ( #514 )
2016-01-30 17:01:10 +01:00
ocornut
a3b00b79f2
Fixed removal of trailing draw command if it is a callback command
2016-01-30 16:37:30 +01:00
ocornut
b671840d15
InputTex(): Comment ( #512 )
2016-01-30 15:00:45 +01:00
ocornut
b1ec90d565
InputText() fixed clipping bounds of contents ( #512 )
2016-01-30 14:57:24 +01:00
ocornut
7afd62ec57
Tentative fix for GCC/Clang ( #484 , #504 )
2016-01-25 21:45:45 +00:00
ocornut
595684e08c
Remove dependency on <new> header ( #484 , #504 )
...
(Now expecting something to fail somewhere..)
2016-01-25 21:26:53 +00:00
ocornut
3ee50af57e
Fixed clipping of child windows within parent not taking account of childouter clipping boundaries (including scrollbar, etc.) ( #506 )
2016-01-25 20:55:34 +00:00
ocornut
005b897d7d
ProgressBar() handling of border size + storing border size in window structure ( #503 )
2016-01-24 11:00:37 +00:00
ocornut
9f6b1ace8f
Tidying up internal FindBestPopupWindowPos()
2016-01-23 15:13:55 +00:00
ocornut
94dc3df956
ColorEdit4: Empty label doesn't add InnerSpacing, like other widgets (ref #346 )
2016-01-23 14:57:48 +00:00
ocornut
b6fe5eb4b4
Cleaned up the top of imgui.h, documenting all types / forward declarations
2016-01-23 12:45:56 +00:00
ocornut
d5fd87e806
Added IM_COL32 macros (ref #346 )
2016-01-23 12:15:49 +00:00
ocornut
570a9dadc4
Honoring exact width passed to PushItemWidth(), previously it would add extra FramePadding.x*2 over that width. (ref #346 )
...
If you had manual pixel-perfect alignment in place it might affect you.
2016-01-23 12:07:26 +00:00
ocornut
8f0f71c7ba
InputScalarEx(): removed unnecessary aabb computation.
2016-01-23 11:56:39 +00:00
ocornut
2a505ebb9a
ColorEdit4(): removed unnecessary calls to scanf() when idle in hexadecimal edit mode.
2016-01-23 11:29:22 +00:00
ocornut
56927cbb54
Begin(): made the close button explicitly set the boolean to false instead of toggling it ( #499 )
2016-01-22 10:00:32 +00:00
ocornut
13b1e0ec9b
Merge branch 'master' of https://github.com/ocornut/imgui
2016-01-21 22:30:51 +00:00
ocornut
b8f86ec4bd
Examples: OpenGL2/3 Makefile; Added -lGL to Linux build
2016-01-21 22:30:47 +00:00
omar
d6be992bef
Travis CI: test adding osx
2016-01-21 21:43:24 +00:00
ocornut
a81a5e5235
Commented Clang warning that's not compatible with all versions. Comments.
2016-01-21 21:40:22 +00:00
ocornut
9e8795f4e2
Examples: Added extra comments
2016-01-21 18:51:42 +00:00
ocornut
f144646c83
Merge branch 'master' of https://github.com/ocornut/imgui
2016-01-20 10:30:33 +00:00
ocornut
e585204d82
ImFontAtlas: heuristic increase texture width up to 4096 with 4000+ glyphs. Various comments ( #491 )
2016-01-20 10:30:28 +00:00
omar
39510d05ea
Update README.md
2016-01-17 10:35:21 +00:00
ocornut
3922988dea
TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label.
...
Removed DisableHideTextAfterDoubleHash hack used by Metrics window.
2016-01-16 12:25:40 +00:00
ocornut
739e73b07b
CalcTextSize(): adding early out for empty displayed string ( #487 )
2016-01-16 12:11:57 +00:00
ocornut
fc66365805
Added overlooked test for label_size.x>0 before calling RenderText for label in a few instances ( #487 )
2016-01-16 12:01:18 +00:00
ocornut
31fe006c85
Examples: DirectX10 fixed ImGui_ImplDX10_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
2016-01-11 10:29:03 +00:00
ocornut
6277ffe00f
Examples: DirectX11: fixed ImGui_ImplDX11_NewFrame() from recreating device objects if render isn't called (g_pVB not set)
2016-01-11 10:19:38 +00:00
ocornut
85725ff9c6
Added ImGuiWindowFlags_ForceVerticalScrollbar, ImGuiWindowFlags_ForceHorizontalScrollbar flags ( #476 )
2016-01-10 12:01:56 +00:00
ocornut
76ca7c42ca
ImDrawList: Added PrimQuadUV() helper to ease custom rendering of textured quads
2016-01-08 14:57:25 +00:00
ocornut
bf6f6ba858
Demo: extra comments and example for PushItemWidth(-1)
2016-01-06 01:24:49 +01:00
ocornut
49fb7364b5
Examples: SDL2+OpenGL3: Fix context creation options ( #468 , #463 )
2016-01-05 10:23:43 +01:00
ocornut
35085a4480
Drag*, Slider* clarified that keyboard inputs aren't clamped ( #413 )
2016-01-02 12:21:30 +01:00
ocornut
749e8fa345
Minor optimization so that mass-calling BeginPopupContext* functions can early out more commonly without hashing ID
2015-12-31 12:11:28 +01:00
ocornut
81c86dd5e7
Various minor fixes following a pass of cppcheck static analyzer
2015-12-30 11:55:37 +01:00
ocornut
8061a6ceea
ImVector: erase/insert uses Data/Data+Size directly.
2015-12-30 11:45:34 +01:00
ocornut
4e3c6f64c0
Various minor fixes following a pass of cppcheck static analyzer
2015-12-30 11:45:13 +01:00
ocornut
3aa4a108ed
Examples: SDL/OpenGL3: Fixed linking documentation for MacOSX ( #463 )
2015-12-30 11:27:39 +01:00
ocornut
40ed6a51b0
Fixed ImGuITextBuffer::empty() - unused in core lib - from being utterly broken
2015-12-30 11:07:31 +01:00
ocornut
68bde7b862
Clarify comment ( #455 )
2015-12-27 21:41:01 +01:00
ocornut
d212401624
Fixed ImDrawList::AddRect() which used to render a rectangle 1 px too large on each axis., fixed Image(), ImageButton() as well ( #457 )
2015-12-27 21:31:43 +01:00
ocornut
6dbdc69131
ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup #457
2015-12-27 20:18:43 +01:00
ocornut
668a247af0
Demo: added more draw primitives in the Custom Rendering example ( #457 )
2015-12-27 19:49:31 +01:00
ocornut
dc4a07c49a
Fixed various Clang -Weverything warnings
2015-12-26 14:59:07 +01:00
ocornut
e41568f87f
Version number 1.48 WIP + Update binaries
2015-12-26 10:02:57 +01:00
ocornut
24d186753e
Version number 1.47
2015-12-25 22:44:03 +01:00
ocornut
1c5aa32d2b
TODO items. Moved ImDrawList::Clear* methods suggesting they aren't for end-user.
2015-12-25 17:41:45 +01:00
ocornut
1bdd3b8e00
Merge branch 'master' of https://github.com/ocornut/imgui
2015-12-25 12:00:07 +01:00
ocornut
2849596069
Comments about ImDrawList::PushClipRect
2015-12-25 11:59:49 +01:00
omar
8de3f4843c
Update README.md - revert + patrons
2015-12-24 20:19:59 +01:00
omar
f631ae26ca
Update README.md - dear imgui
2015-12-24 20:06:09 +01:00
ocornut
e4cf44e967
Minor rebranding "ImGui" -> "dear imgui" ( #21 )
2015-12-24 20:00:50 +01:00
ocornut
25c9448dda
imconfig.h tweak, not advertising IMGUI_INCLUDE_IMGUI_USER_INL anymore.
2015-12-24 20:00:49 +01:00
omar
e34b4b46da
Update README.md - dear imgui
2015-12-24 20:00:29 +01:00
ocornut
f3b41b35c2
Initial creation of a ImGuiWindowFlags_NoBringToFrontOnFocus window push it at the front of global window list
2015-12-24 14:55:42 +01:00
ocornut
40ddf8e287
Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h ( #448 )
2015-12-24 14:47:11 +01:00
ocornut
96e2b925b1
Comments ( #449 )
2015-12-24 10:45:52 +01:00
ocornut
fc7a3d07bb
BeginPopupContextItem: fixed comment ( #439 )
2015-12-21 17:21:16 +01:00
ocornut
4723d97cfb
Added BeginPopupContextItem() comment ( #439 )
2015-12-21 00:04:33 +01:00
ocornut
6102aa1375
BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click ( #439 )
2015-12-20 23:39:47 +01:00
ocornut
66886405f6
Minor comment ( #439 )
2015-12-20 23:32:24 +01:00
ocornut
217a6c875a
Examples: OpenGL: Tentative fix for miscaled call to glViewport on high-DPI screens ( #441 )
...
Fix for 980ca286fe
2015-12-19 20:54:23 +01:00
ocornut
2e5577f44f
Fix for popups being incorrectly positioned if their contents are larger than display and WindowPadding < DisplaySafeAreaPadding
2015-12-17 12:22:50 +00:00
ocornut
21f0d64a74
stb_rect_pack.h update to 0.08
2015-12-16 11:14:49 +00:00
ocornut
0b10bec71f
ImDrawList: Simplified code and added check to avoid mis-recycling a callback command.
2015-12-16 01:13:36 +00:00
ocornut
0873da85ec
ImDrawList: Fixed bug with PopClipRect() sometimes altering TextureId + fixed merging of draw calls with same TextureId
2015-12-16 01:01:34 +00:00
ocornut
370de414ef
TreeNode(): Fixed horizontal spacing for layout to match Bullet() (followup to #414 , #282 )
2015-12-13 23:42:44 +00:00
ocornut
2e5352786a
Bullet(), BulletText(): vertical and horizontal alignment fixes (namely for widget sized line height). (followup to #414 , #282 )
2015-12-13 23:41:02 +00:00
ocornut
558430ca8f
TreeNode() fixed alignment of collapse arrow to it matches bullet (broken in 4006fb77bc)
2015-12-13 22:07:01 +00:00
ocornut
5084f90a0d
Added ProgressBar() ( #333 )
2015-12-13 21:41:45 +00:00
ocornut
76ab5587e4
GetColorU32: Comments
2015-12-13 19:55:15 +00:00
ocornut
9b6b1bc0f3
Added GetColorU32 helpers (previously internal and misplaced as window->Color())
2015-12-13 19:32:37 +00:00
ocornut
7bcebdc207
Comments and missing forward declaration
2015-12-13 18:02:15 +00:00
ocornut
8afbdd1ade
ImColor: Added SetHSV helper function.
2015-12-13 17:17:53 +00:00
ocornut
7b0bf23071
Ensure that individual widgets are pixel aligned when using non pixel snapped font rendering.
2015-12-13 17:12:35 +00:00
ocornut
02ce1a2b32
Demo: Display extra info from ImFontConfig in the font display
2015-12-13 16:15:11 +00:00
ocornut
56c4f5b7dc
MenuBar clipping rectangle fix for bordered mode
2015-12-13 16:03:52 +00:00
ocornut
b49a985324
Various adjustment for border to be inside instead of outside the window size
2015-12-13 16:01:25 +00:00
ocornut
18223fd3ab
Demo: Tweak window option and style display
2015-12-13 14:03:26 +00:00
ocornut
a9bdda0d95
Demo: Added style editor in demo menu + exposed WindowFillAlphaDefault
2015-12-13 13:36:00 +00:00
ocornut
b1b759938e
Fixed SizeContents and auto-fit size not being rounded to integer, which affects border rendering when using non-default font
2015-12-13 12:52:55 +00:00
ocornut
9583868bab
Added ImGuiIO::ClearInputCharacters() superfluous helper.
2015-12-12 00:08:54 +00:00
ocornut
6c7f8efe1e
InputText: update mouse drag on mouse move only & key input reposition selection bounds (better fix for #429 )
2015-12-11 22:37:47 +00:00
ocornut
4bfd5cd95f
InputText: when keys are being input while mouse is dragging, disable mouse drag until button release ( #429 )
2015-12-11 22:20:16 +00:00
ocornut
bf83ac8b55
Examples: Fixed msvc batch files from warning.
2015-12-07 21:27:25 +00:00
ocornut
de4ae2d53a
Metrics: computing drawcmd bounding box handle case where buffer has been de-indexed.
2015-12-05 11:26:47 +00:00
ocornut
5dec997fbe
Minor tidying up of now redundant code
2015-12-04 23:41:24 +00:00
ocornut
c80e2274f1
Renamed Color() helpers to ValueColor() - dangerously named, rarely used and probably to be made obsolete.
2015-12-04 23:39:54 +00:00
ocornut
ecc97bda7d
Added SetItemAllowOverlap() exposed in imgui_internal.h only
2015-12-03 21:30:17 +00:00
ocornut
18724f021a
Merge branch 'JuJuBoSc-master'
2015-12-03 18:32:33 +00:00
ocornut
9596e6f794
Examples: DirectX10: Minor tweaks, updated to latest example changes ( #424 )
2015-12-03 18:32:01 +00:00
ocornut
dadd03fc11
Examples: DirectX10: Fix warning, disable debug device, add ignore list ( #424 )
2015-12-03 18:20:48 +00:00
ocornut
59f0db6f15
Merge branch 'master' of https://github.com/JuJuBoSc/imgui into JuJuBoSc-master
2015-12-03 18:18:14 +00:00
Julian Bosch
32c1a3e46c
Removed d3d11 references
2015-12-03 13:39:03 +01:00
ocornut
730e8119fe
Updated stb_truetype 1.07 -> 1.08
2015-12-03 12:35:27 +00:00
Julian Bosch
1f3a0e78cc
Ported d3d11 renderer to d3d10
2015-12-03 13:18:35 +01:00
omar
fe2972e8b2
Merge pull request #420 from RaptorFactor/master
...
Examples: DX11: Compile shaders with lower features levels.
2015-11-30 19:36:06 +00:00
Joshua Boyce
6adf644448
Allow DX11 renderer to be used with devices with lower feature levels.
2015-12-01 05:08:30 +11:00
ocornut
1b7aee7b9d
Examples: DX11: Remove debug flag ( #415 )
2015-11-30 10:22:46 +00:00
ocornut
632f9ec36a
Commenting asserts
2015-11-30 09:45:45 +00:00
ocornut
5f8200d52c
TreeNode/CollapsingHeader: some minor cleanup of that horrible function.
2015-11-29 22:38:58 +00:00
ocornut
d1b4159b51
TreeNode/CollapsingHeader: some minor cleanup of that horrible function.
2015-11-29 22:25:13 +00:00
ocornut
9dca2ca960
Comments & spacing
2015-11-29 22:01:26 +00:00
ocornut
b7e1ae4bf9
Added comment on using PushFont() before building the font ( #232 )
2015-11-29 21:33:51 +00:00
ocornut
a500c0daf7
Demo: some TreeNode layout examples ( #414 , #282 )
2015-11-29 21:02:15 +00:00
ocornut
4006fb77bc
TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after ( #414 , #282 )
2015-11-29 20:35:58 +00:00
ocornut
546962351b
Internal minor renaming
2015-11-29 20:27:48 +00:00
ocornut
6cee2fca94
Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples.
...
+ Standardized comments.
2015-11-29 14:54:05 +00:00
ocornut
6269859315
Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing.
2015-11-29 14:15:07 +00:00
ocornut
3aebddc4ac
Tweak GetGlyphRangesJapanese() to it is easier to modify
2015-11-29 11:55:54 +00:00
ocornut
94ec3d534e
Examples: Header comments.
2015-11-29 11:25:15 +00:00
ocornut
6800939e73
Examples: Header comments.
2015-11-29 11:19:30 +00:00
ocornut
5c52e9ec0d
Examples: Clarified comments. Removed font merging example from comments.
2015-11-29 11:11:03 +00:00
ocornut
d673db3092
Examples: Added README into the Visual Studio solution to people are less likely to miss it.
2015-11-29 11:01:50 +00:00
ocornut
9735563b65
Additional comments for new users
2015-11-29 10:53:03 +00:00
ocornut
eb6575508f
Demo: Tweaked Clipping example.
2015-11-29 10:29:06 +00:00
ocornut
b2b4bbe5ea
Demo: Fixed variable shadowing warning.
2015-11-29 10:25:55 +00:00
ocornut
79b09e7d10
Fixed int>void* warnings for 64-bits architectures and fancy warnings
2015-11-29 10:20:50 +00:00
ocornut
f505a372fd
Speculative build fix for old versions of Visual Studio compiler
2015-11-28 20:00:40 +00:00
ocornut
ba77166432
Demo: comments ( #414 )
2015-11-28 17:23:32 +00:00
ocornut
32d2768734
Demo: Moved property editor demo to its own mini example applet ( #414 )
2015-11-28 17:16:59 +00:00
ocornut
d3df39fed1
Columns: Added Property Tree demo among tidying up demos ( #125 , #414 )
2015-11-28 16:44:09 +00:00
ocornut
4ca34a879d
Columns: Fixed bug with indentation within columns, also making code shorter/faster ( #414 , #125 )
2015-11-28 16:36:25 +00:00
ocornut
a9009b133c
Columns: Undo accidental change from 807d4ff92c
2015-11-28 15:52:57 +00:00
ocornut
6e2e60ffad
Merge branch 'master' of https://github.com/ocornut/imgui
2015-11-28 15:35:22 +00:00
ocornut
e4ba6e525b
Columns:: columns set with no implicit id include the columns count into the id to avoid collisions ( #125 )
2015-11-28 15:35:10 +00:00
ocornut
807d4ff92c
Columns: minor tidying up while investigating severe issues with indenting within columns ( #414 )
2015-11-28 12:14:50 +00:00
omar
c0ec9f4e63
Merge pull request #416 from zryan3/bugfix/sdl2_typos
...
Examples:SDL: fixed comment referencing GLFW.
2015-11-28 09:36:06 +00:00
zryan3
aa6cb32bd4
fixed text referencing GLFW library in SDL examples
2015-11-27 23:04:35 -07:00
omar
b4556c404d
Update README.md
...
Removed paragraph.
2015-11-27 23:43:19 +00:00
omar
bfacd250df
Update README.md
2015-11-27 23:42:07 +00:00
ocornut
58b23b4785
Columns: avoid growing ColumnsData vector when closing a window with no columns ( #125 )
...
(Will break calling GetColumnOffset() when there's no column but it
would only have worked after the first frame anyway, so basically it
didn't work)
2015-11-26 23:07:10 +00:00
ocornut
1aac69c937
Columns: tidying up, moving OffsetT to a ImGuiColumnData structure
2015-11-26 23:01:15 +00:00
ocornut
95138fa8d6
Merge branch 'master' of https://github.com/ocornut/imgui
2015-11-26 22:43:28 +00:00
ocornut
3102c0c97e
Rename internal ColumnsStartX to IndentX, makes more sense
2015-11-26 22:43:21 +00:00
omar
60b75d78ea
Update README.md
2015-11-24 19:13:05 +00:00
ocornut
10ba61f882
Added links
2015-11-24 15:35:07 +00:00
ocornut
5d84f4b450
Update README.md - faq
2015-11-22 23:16:19 +00:00
omar
b959c74488
Update README.md - faq
2015-11-22 23:12:50 +00:00
ocornut
83e6cfbec0
Examples: DirectX9/11: Removed assumption about Unicode build in example main.cpp ( #399 )
2015-11-22 21:23:56 +00:00
ocornut
dc86a8a0bf
Examples: OpenGL3: Fixed gl3w.c for Linux when compiled with C++ compiler ( #411 )
2015-11-22 17:16:55 +00:00
ocornut
38cfdafbaf
Examples: SDL/OpenGL3: Added -ldl to Linux command-line ( #411 )
2015-11-22 17:09:03 +01:00
omar
1e69a86d30
Update README.md
2015-11-20 09:36:43 +01:00
ocornut
92c518a420
InputText: Added password mode via ImGuiInputTextFlags_Password ( #237 , #363 , #374 )
2015-11-19 23:09:59 +01:00
ocornut
6b03ddbcb1
Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment ( #409 )
2015-11-16 22:43:42 +01:00
ocornut
e2ecc02e02
Examples: Updated README
2015-11-16 22:17:10 +01:00
ocornut
f96de74e05
Merge branch 'zach2good-SDL_OpenGL3_Implementation'
2015-11-16 22:13:58 +01:00
ocornut
899cb3b4e9
Examples: SDL+OpenGL3: Fixed readme ( #356 )
2015-11-16 22:13:06 +01:00
ocornut
ab7e91b65e
Examples: SDL+OpenGL3: Various fixes to example to make it matches current GL3 example ( #356 )
2015-11-16 22:12:18 +01:00
ocornut
9d0caa2e66
Examples: SDL+OpenGL3: Using glew like existing example + renaming ( #356 )
2015-11-16 22:05:22 +01:00
ocornut
624adb1b23
Tweak build batch files and readmes
2015-11-16 22:03:13 +01:00
ocornut
9a8cbf128d
Merge branch 'SDL_OpenGL3_Implementation' of https://github.com/zach2good/imgui into zach2good-SDL_OpenGL3_Implementation
2015-11-16 21:35:49 +01:00
ocornut
693efccb62
ImageButton() uses FrameRounding up to a maximum of available framing size ( #394 )
2015-11-15 19:43:05 +01:00
ocornut
5549744e0f
Minor popups comment tweak ( #402 )
2015-11-15 19:09:30 +01:00
ocornut
f87deff0f3
Moving stdlib.h include outside of imgui.h ( #405 )
2015-11-13 17:08:54 +01:00
ocornut
9243aee62c
Fixed unused variable warning if asserts are compiled out.
2015-11-11 10:26:12 +00:00
ocornut
3b2fdf27a8
Examples: Added /Zi (output debug information) in build_win32.bat files
2015-11-11 09:45:18 +00:00
omar
0b47edcefe
Merge pull request #403 from JasonWilkins/master
...
Fixed a couple of problems found by CppCat code analyzer.
2015-11-10 23:28:51 +00:00
Jason Wilkins
4dee8473b5
Fixed a couple of problems found by CppCat code analyzer.
...
* incorrect implementation of ImVec4 operator- which always gives a w value of 0
* boolean formula of ((A && B) || B) can be simplified to just (B)
2015-11-10 17:06:37 -06:00
ocornut
1d76890526
Examples: OpenGL3: Implement ImGui_ImplGlfwGL3_InvalidateDeviceObjects() like other examples.
2015-11-08 22:52:25 +00:00
ocornut
e4fb14a9e0
TODO notes
2015-11-08 11:00:56 +00:00
ocornut
e46c7b70eb
Examples: Most examples apps detect if ImDrawIdx was changed to 32-bits instead of 16
2015-11-08 11:00:31 +00:00
ocornut
4982cd136e
Fixed Shutdown() not clearing FontAtlas if NewFrame() was never called. ( #396 , #303 )
2015-11-07 23:10:09 +00:00
omar
b168c72dd1
Update README.md
2015-11-01 22:53:29 +00:00
omar
d963ff13ca
Update README.md
2015-11-01 22:25:33 +01:00
omar
acc87f7f5e
Update README.md
2015-11-01 22:18:37 +01:00
ocornut
6b23fca1ff
Speculative build fix for using alloca on PS4 & FreeBSD
2015-10-30 18:05:06 +01:00
ocornut
0a23e2c832
Tabs to spaces
2015-10-30 15:57:03 +01:00
ocornut
980ca286fe
Examples: OpenGL2/3: Save/setup/restore viewport as part of render function. Update SDL example to match GL2 one. ( fix #392 )
2015-10-30 15:44:47 +01:00
ocornut
6ffe0fddbf
Examples: Fixed crash when both buttons are held ( #393 )
2015-10-30 15:01:26 +01:00
ocornut
1a42a3f91b
Refactor internal SliderBehavior() to take flags instead of a bool.
...
Sorry!
2015-10-30 11:43:23 +01:00
ocornut
3eabad0321
Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers.
...
This is quite a risky change frankly but I'd rather refactor sooner than
later. Hopefully few people are using the internal functions.
2015-10-30 11:36:51 +01:00
ocornut
e858d229a0
Examples: update all examples with same comment ( #389 )
2015-10-30 10:45:16 +01:00
omar
d0afb23a3f
Merge pull request #389 from dougbinks/master
...
Font merge demo and documentation minor additions.
2015-10-30 10:39:59 +01:00
Doug Binks
e1bc0dd7d5
Font merge demo and documentation minor additions.
...
Clarifies the lifetime requirements for the ranges parameter for AddFont* functions.
2015-10-25 16:06:42 +00:00
omar
0b0c460324
Travis CI: revert, giving up update for now.
2015-10-19 20:10:43 +01:00
omar
7245599f04
Travis CI: test upgrading to container-based build (3)
2015-10-19 20:05:02 +01:00
omar
d86dd37091
Travis CI: test upgrading to container-based build
2015-10-19 19:59:53 +01:00
omar
f11adc1c08
Travis CI: test upgrading to container-based build
2015-10-19 19:57:46 +01:00
ocornut
217ef444d4
ColorEdit4: Fixed broken tooltip on hovering the color button (actually fixes #373 , #380 )
2015-10-19 12:02:52 +01:00
ocornut
5f0db60a57
Version number 1.47 WIP
2015-10-18 20:13:01 +01:00
omar
42529f1270
Merge pull request #378 from Gargaj/patch-1
...
Examples: DirectX9: NULL out font texture on Invalidate so NewFrame() can be called directly without ImGui_ImplDX9_CreateDeviceObjects()
2015-10-18 18:11:54 +01:00
Gargaj
e4d916a4b3
NULL out font texture on invalidate
...
If this isn't done, NewFrame won't re-create the font.
2015-10-18 19:05:04 +02:00
ocornut
72dde4d323
Version 1.46
2015-10-18 17:36:27 +01:00
ocornut
fbdcb51dde
Fix to allow using SetNextWindow* functions with ImGuiSetCond_Appearing on modal windows ( #377 )
...
Also affect other popups which called FindBestPopupWindowPos() on their
second frame but it most often acts as a no-op but it wouldn't be
noticeable.
2015-10-18 17:30:53 +01:00
ocornut
8b9c0b2545
Tweaks (calling inner SetNext* functions directly from Begin)
2015-10-18 17:20:03 +01:00
ocornut
7a61b7dd57
Renamed Window LastFrameDrawn to LastFrameActive, more correct
2015-10-18 16:57:10 +01:00
ocornut
465e6839a4
ColorEdit4: hovering the color button shows correct alpha ( fix #373 )
2015-10-18 16:24:44 +01:00
ocornut
5b7a2149fc
ColorConvertFloat4ToU32() round the floats instead of truncating them.
2015-10-18 16:09:37 +01:00
ocornut
43ff5a41be
InputText(): always use live input data for display in read-only mode ( fix #360 )
2015-10-18 15:50:46 +01:00
ocornut
a0d24ac03d
Scrollbar: background color less translucent in default style (flattened alpha) so it works better on non-WindowBg colored background.
2015-10-18 15:36:39 +01:00
ocornut
64b6e87f54
Scrollbar: fixed vertical alignment with border + no menu bar (following #365 )
2015-10-18 15:35:27 +01:00
ocornut
b090d711e2
InputText: removed the need for text_end pointer in the cursor position calculation loop, allows switching buffers
2015-10-18 15:25:36 +01:00
ocornut
214e87d59c
InputText: comments.
2015-10-18 12:18:28 +01:00
ocornut
bc34ac882f
InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo
2015-10-18 10:57:29 +01:00
ocornut
2b3fb5c0f7
Example: Marmalade: shallow tweaks and cleanups to match ImGui coding style ( #375 )
2015-10-15 12:44:30 +02:00
omar
81927b073e
Merge pull request #375 from gzito/master
...
Examples: Added example app for the Marmalade platform.
2015-10-15 11:32:13 +01:00
gzito
ba9c469ff0
no message
2015-10-14 23:13:02 +02:00
gzito
ebf4f1fa02
no message
2015-10-14 23:05:01 +02:00
gzito
79ca203850
Merge branch 'master' of https://github.com/ocornut/imgui
2015-10-14 23:01:52 +02:00
ocornut
5d53f37a5d
Examples: Possibly clarified the intent of imgui_impl_* files.
2015-10-13 17:53:43 +02:00
ocornut
1c69b3d0df
Tools: binary_to_compressed_c.cpp: added -nocompress option.
2015-10-12 13:13:00 +02:00
ocornut
d4d2e5bc62
Added items to Todo list
2015-10-12 12:31:41 +02:00
ocornut
a5c895f791
Added SetClipboardText / GetClipboardText helper shortcuts to match MemAlloc / MemFree
2015-10-12 12:20:01 +02:00
omar
59cedca02e
Merge pull request #371 from nguillemot/master
...
Examples: DirectX11: Fix vertex POSITION format (ImDrawVert::pos is 2D, not 4D)
2015-10-12 09:26:49 +01:00
Nicolas Guillemot
509ac33abe
fix POSITION format (ImDrawVert::pos is 2D, not 4D)
...
the inputlayout incorrectly described the POSITION attribute as being
4D, while ImDrawVert::pos is 2D. This went unnoticed because the buffer
binding has a stride of sizeof(ImDrawVert) and the POSITION is treated
as a float2 in the vertex shader. If you switch POSITION to float4 in
the vertex shader (and actually use the z/w in the matrix
multiplication) then everything become wacky-looking since it's
interpreting the texture coordinates as z/w. On a similar note: It's
weird that the projection matrix takes z and w into consideration when
those don't exist in the shader due to positions being float2s.
2015-10-11 16:42:22 -07:00
ocornut
a5132286b7
ImDrawList: ChannelsSetCurrent() added an extra assert
2015-10-11 17:50:55 +02:00
ocornut
8eb4df0dd6
Added comments ( #369 #370 )
2015-10-11 17:20:07 +02:00
ocornut
8c5c0c41fc
ImDrawList: AddImage() uv parameters default to (0.0) and (1.1)
2015-10-11 17:17:03 +02:00
omar
b93e787f51
Merge pull request #369 from richardkogelnig/master
...
InputText: Fix for not being able to enter certain characters in InputText on german keyboard
2015-10-11 17:16:10 +02:00
richardk
8a6bde3527
Fix for AltGR being send as Ctrl&Alt on german keyboards. Don't consume characters if CTRL key press is detected AND ALT key press is detected in Imgui::InputTextEx
2015-10-11 16:25:49 +02:00
ocornut
fae7b34a3f
Fixed bug with handling of malformed utf-8 at the end of a non-zero terminated string range.
2015-10-09 21:47:41 +02:00
gzito
50b25b6c75
Added example for the Marmalade platform
2015-10-08 22:38:37 +02:00
ocornut
b8281d96bd
Fixed mouse release double-triggering ( #359 , #362 )
2015-10-08 20:59:49 +02:00
ocornut
a77e534ded
Examples: OpenGL2: Add msys2/mingw64 target ( #361 )
2015-10-08 20:48:50 +02:00
omar
379079ac42
Merge pull request #361 from fr500/master
...
Examples: OpenGL3: Add msys2/mingw64 target.
2015-10-08 20:47:22 +02:00
ocornut
80173fec96
Merge branch 'osman-brian-master'
2015-10-08 20:44:25 +02:00
ocornut
edf730b672
Missing tidying up ( #358 )
2015-10-08 20:44:13 +02:00
ocornut
48bb3c8026
Merge branch 'master' of https://github.com/osman-brian/imgui into osman-brian-master
2015-10-08 20:40:54 +02:00
ocornut
de92bc873f
Scrollbar: fixed minor rendering offset when borders are enabled ( fix #365 )
2015-10-08 20:25:49 +02:00
omar
0298603040
Update README.md
...
More begging, still in search for a solution..
2015-10-08 15:35:39 +02:00
ocornut
bd78892164
Fixed IsKeyReleased() and IsMouseReleased() returning true on the first frame.
...
Loosely related to #362
2015-10-08 15:28:09 +02:00
ocornut
e83b529846
BeginChildFrame() helper has the extra_flags parameter.
2015-10-07 00:22:44 +02:00
ocornut
d087671369
HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API.
2015-10-06 19:27:24 +02:00
ocornut
06d594e86b
Dummy() create an item so functions such as IsItemHovered() can be used.
2015-10-05 20:27:22 +02:00
ocornut
54805fd22a
InputText: fixed crash when passing a buf_size==0 (which can be of use for read-only selectable text boxes) ( #360 )
2015-10-05 14:13:24 +02:00
radius
a465b2b3d8
add msys2/mingw64 target
2015-10-04 15:14:35 -05:00
ocornut
7508d30b83
ImGuiTextBuffer: added c_str() helper.
2015-10-04 11:22:47 +02:00
omar
69678d1ed2
Merge pull request #357 from orthographic-pedant/spell_check/accommodate
...
Fixed typographical error, changed "accomodate" to "accommodate" in README.
2015-10-03 19:13:04 +02:00
ocornut
e031fe484c
Added ImGuiWindowFlags_NoBringToFrontOnFocus behavior.
2015-10-02 19:07:04 +02:00
osman-brian
69e6f299f3
Update imgui_draw.cpp
...
Fix Decode85 on big-endian systems.
2015-10-01 14:57:31 -04:00
ocornut
c1983d5c3f
Draw: Fixed rectangle rendering glitches with width/height <= 1/2 and rounding enabled.
2015-09-30 21:48:36 +02:00
ocornut
f21fda1231
Scrollbar: Tweaked scrollbar inner padding for small scrollbars.
2015-09-30 21:47:44 +02:00
ocornut
6e4d959953
Window: fixed window lower-right clipping limit so it plays more friendly with both OpenGL and DirectX coordinates.
...
Not sure about this. Hmm.
2015-09-30 21:30:27 +02:00
ocornut
c9d51d99b4
Scrollbar: tidying up ( #355 )
2015-09-30 21:19:54 +02:00
ocornut
5d3d136733
Scrollbar: horizontal scrollbar demo allows to enable simultanaeous scrollbars on both axises.
2015-09-30 21:15:47 +02:00
ocornut
b92daf0ba2
Scrollbar: fixed rounding of background + child window consistenly have ChildWindowBg color under ScrollbarBg fill ( #355 )
2015-09-30 21:15:17 +02:00
orthographic-pedant
ea66a34f9d
Fixed typographical error, changed accomodate to accommodate in README.
2015-09-30 13:16:55 -04:00
Zach Toogood
e130b09d91
Previous SDL implementation didn't work with my OpenGL 3.3 project, spliced the GLFW OpenGL examples on top of the SDL example to create an option that works for me. Could be useful for others.
2015-09-30 15:12:00 +01:00
ocornut
a76b75c2d5
InputFloat() fixed explicit precision modifier, both display and input were broken.
2015-09-30 15:36:17 +02:00
ocornut
572bf91006
Comments
2015-09-30 15:35:30 +02:00
ocornut
ecb63ff8f3
Inline functions not marked with IMGUI_API because apparently it is illegal for MinGW ( fix #349 )
...
ARGH C++.
2015-09-27 22:28:16 +02:00
ocornut
963f6b782d
Examples: OpenGL3: saving more of blend state ( #347 )
2015-09-27 22:21:11 +02:00
omar
9d89e03346
Merge pull request #348 from zho7611/add_korean_support
...
ImFontAtlas: Added GetGlyphRangesKorean() for Korean.
2015-09-23 18:49:11 +02:00
Jiho Choi
cc53d31764
Add support for Korean.
2015-09-24 00:50:00 +09:00
ocornut
d5502cdd6d
Examples: OpenGL3: Saving/restoring the Enable state, better than nothing ( #347 )
2015-09-23 09:14:27 +02:00
ocornut
98465d401b
Silencing inadequate MSVC warnings when exporting as DLL ( #345 )
2015-09-22 00:53:51 +02:00
ocornut
914516110c
Minor spacing
2015-09-22 00:53:11 +02:00
ocornut
127f44c12b
Demo: Extra plotting examples.
2015-09-20 13:29:18 +02:00
ocornut
ab5def6ad8
PlotHistogram: Minimum bar width ensure better rendering with lots of points (~related to #342 )
2015-09-20 12:02:17 +02:00
ocornut
e268303c02
PlotLines: fixed rendering issue added in previous commit ( #342 )
2015-09-20 11:37:46 +02:00
omar
994c286f61
Merge pull request #342 from nem0/master
...
PlotHistogram: Fixed rendering of histogram with a lot of values.
2015-09-20 11:26:13 +02:00
Mikulas Florek
93200a6c37
fixed rendering of histogram with a lot of values
2015-09-19 21:12:26 +02:00
omar
774099918a
Update README.md
2015-09-19 15:37:28 +02:00
ocornut
fee9e07e61
Updated FAQ ( #341 )
2015-09-19 15:22:05 +02:00
ocornut
ff12afbd18
InputText(): fixed cursor pixel-alignment when horizontally scrolled.
2015-09-19 13:48:27 +02:00
ocornut
0e86ed9361
InputText(): fixed mouse-dragging not scroll tracking the cursor when text doesn't fit ( fix #339 )
2015-09-19 13:45:51 +02:00
ocornut
08bfe9bc7c
Fixed assert introduced in 3b01b0a2f2
2015-09-18 15:03:44 +02:00
ocornut
c4562ac573
Fixed mouse click detection to be more friendly to DeltaTime 0.0 ( #338 )
2015-09-17 23:42:34 +01:00
ocornut
3b01b0a2f2
Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts ( #335 )
2015-09-16 23:48:42 +01:00
ocornut
0a1d6b6b74
InputText() fixed ignoring text inputs when ALT is pressed ( #334 )
2015-09-16 10:38:42 +01:00
ocornut
ec7eb05e88
ImGuiTextFilter::Draw helper return bool and resplit when filter is modified
2015-09-14 13:03:20 +01:00
ocornut
f9928e96c7
InputText(): lose cursor/undo-stack when reactivating focus is buffer has changed size
2015-09-12 00:02:59 +01:00
ocornut
0abe668221
ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice( #327 )
2015-09-11 16:50:00 +01:00
ocornut
bc8eb5e9cf
ImDrawList, ImFontAtlas: comments, tweaks. moved less scary functions at the top of the file.
2015-09-11 16:35:37 +01:00
ocornut
7b1168eb30
Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size
2015-09-11 16:01:54 +01:00
ocornut
4d83519244
Comments ( #328 )
2015-09-11 15:52:03 +01:00
ocornut
25b4b88a7a
Examples: Update readme.
2015-09-10 21:10:01 +01:00
ocornut
ad4c962224
Examples: DirectX11: Fixed batch file for VS 2012+, still works for 2008/2010.. Include path order matters...
2015-09-10 20:58:43 +01:00
ocornut
853f265025
Examples: Added batch files to build Windows examples with VS
2015-09-10 20:34:06 +01:00
ocornut
167c02d502
Better Git ignore list for quick compilations in same folder
2015-09-10 20:09:29 +01:00
ocornut
951e1bd9a8
Merge branch 'master' of https://github.com/ocornut/imgui
2015-09-10 10:26:20 +01:00
ocornut
2903c98bca
Minor typo
2015-09-10 10:26:09 +01:00
ocornut
07776595c2
Added missing IMGUI_API definitions in imgui_internal ( fix #326 )
2015-09-10 10:22:17 +01:00
omar
c31ca3e2d5
Update README.md - demo binaries
2015-09-09 14:28:09 +01:00
ocornut
1793c1a991
Comments
2015-09-09 14:15:17 +01:00
ocornut
cafe8b0cd7
Comments
2015-09-09 12:42:59 +01:00
ocornut
fcbbb0070e
Fixed assert introduced in dafad3903e if there are no active draw list
2015-09-09 12:39:16 +01:00
ocornut
b4f1e88860
Added ImGuiInputTextFlags_ReadOnly flag for InputText()/InputTextMultiline() ( #211 )
2015-09-09 09:08:08 +01:00
ocornut
f5fb5f0c1e
Minor tidying, reordering functions/members/initialisation to follow same orders
2015-09-07 23:39:36 +01:00
ocornut
a09411b936
Demo: using MouseDelta
2015-09-07 23:33:44 +01:00
ocornut
8a3593257f
Fixed warning with VS2015 in stb_truetype.h
2015-09-07 15:51:43 +01:00
ocornut
7d6ddbe5c8
Examples: comment on setting the RenderDrawListsFn function.
2015-09-07 14:58:26 +01:00
ocornut
dafad3903e
Added GetDrawData() alternative to setting a Render function.
2015-09-07 14:56:39 +01:00
ocornut
93f9ad9ddf
README.md
2015-09-05 20:03:05 +01:00
ocornut
e34ad0a05a
ImDrawList: fixed 1 leak per ImDrawList using the ChannelsSplit() API (via Columns) ( fix #318 )
2015-09-03 23:42:08 +01:00
ocornut
dbc7903da8
IsMouseHoveringRect() added 'bool clip' parameter to disable clipping the rectangle with the current parameters ( #316 )
2015-09-03 13:13:13 +01:00
ocornut
09f659271e
ImFont: fixed comment ( #317 )
2015-09-03 10:42:38 +01:00
ocornut
fc052e24b2
Added ImGuiWindowFlags_NoFocusOnAppearing flag ( #314 )
2015-09-02 19:13:25 +01:00
ocornut
965fa3cb16
Version number 1.46 WIP
2015-09-02 19:09:19 +01:00
ocornut
c9e19f8953
Version number 1.45
2015-09-01 20:34:10 +01:00
ocornut
77bcb7152b
Examples: DirectX11: fixed vertex shader which breaks with VS2015 somehow (DX11 version?) ( #313 )
2015-09-01 10:47:36 +01:00
ocornut
f195bf744f
Tabs to spaces
2015-08-30 22:15:33 +01:00
ocornut
4ab43dce19
Comments
2015-08-30 22:10:49 +01:00
omar
13daaf78a2
Update README.md
2015-08-30 19:41:02 +01:00
ocornut
e4ef140e10
Speculative Linux build fix, not using itoa ( #246 )
2015-08-30 18:55:46 +01:00
ocornut
350d96466e
Demo: tweaks ( #246 )
2015-08-30 18:43:42 +01:00
ocornut
1eef2c9108
Comment
2015-08-30 18:35:02 +01:00
ocornut
71026d3655
Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo ( #246 )
2015-08-30 18:33:38 +01:00
ocornut
7a31030978
Begin() windows flags are locked on the first begin of the frame, allowing using to not bother passing flags for append
2015-08-30 18:30:54 +01:00
ocornut
e5e9c5cfbe
Demo: removed extraneous flag in demo code + tweak comment ( #246 )
2015-08-30 18:07:51 +01:00
ocornut
bbf09fd47d
Fixed initial ScrollbarX decision when no vertical scrollbar is in ( #246 )
2015-08-30 18:07:04 +01:00
ocornut
a3cad2ff06
BeginChild() fixed missing rounding for child sizes which leaked into layout
2015-08-30 18:06:54 +01:00
ocornut
6eed3dc7c8
GetContentRegionMax() when window content size is explicit we don't adjust it with scrollbar sizes ( #246 )
2015-08-30 17:46:02 +01:00
ocornut
73e73e6ef9
TextUnformatted(): simplifying
2015-08-30 17:45:05 +01:00
ocornut
afa0346a0b
Demo: using DragFloat instead of SliderFloat
2015-08-30 17:38:42 +01:00
ocornut
e1f8fed734
Separator(): removed unnecessary computation + comment.
2015-08-30 17:25:26 +01:00
ocornut
f128a8bce1
ColumnsStartX include window->Scroll.x to simplify code ( #246 )
2015-08-30 17:25:10 +01:00
ocornut
8edbdb9775
Style: minor menubar bg alpha tweak.
2015-08-30 16:44:44 +01:00
ocornut
e68d3c614e
Style: made scrollbars rounded by default. Because nice. ( #246 )
2015-08-30 16:43:08 +01:00
ocornut
9e5fb40ddd
Demo: added horizontal scrolling example + enabled in console, log and child examples ( #246 )
2015-08-30 16:38:55 +01:00
ocornut
65a191c005
Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc ( #246 )
...
GetCursorPos, SetCursorPos, GetContentRegionMax,
GetWindowContentRegionMin, GetWindowContentRegionMax are now including
the scrolling amount. It PROBABLY shouldn't break anything for you, but
take note that SetCursorPosX(100.0f) puts you at +100 from the starting
x position which may include scrolling, not at +100 from the window left
side.
2015-08-30 16:37:56 +01:00
ocornut
9eed672725
Bullet() fixed inconsistent layout behaviour when clipped.
2015-08-30 15:42:42 +01:00
ocornut
d88b73a8b7
Added GetContentRegionAvailWidth() helper. Demo tweaks.
2015-08-30 15:35:59 +01:00
ocornut
fc13ae2aa5
Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit ( #246 )
2015-08-30 15:08:13 +01:00
ocornut
e0c375e7b8
Tidying up
2015-08-30 13:09:56 +01:00
ocornut
b326c8fd1f
Added GetCurrentWindowRead() for functions that don't write to the window
2015-08-30 11:56:04 +01:00
ocornut
b994dd777a
Fixed OpenPopup() accessing current window, effectively opening "Debug" on an empty window stack
2015-08-30 11:11:15 +01:00
ocornut
0aa353868f
Minor internal shortcuts not calling GetCurrentWindow()
2015-08-30 10:49:47 +01:00
ocornut
aa35547f94
Demo: long text example uses ImGuiListClipper
2015-08-30 00:03:08 +01:00
ocornut
2d565d4bfb
Style: rename ScrollbarWidth to ScrollbarSize (sorry!)
2015-08-29 23:47:47 +01:00
ocornut
64fcb5e568
TreeNode() fixed IsItemHovered() being inconsistent with visual behavior ( #282 )
2015-08-29 18:15:42 +01:00
ocornut
65fe60f2b2
Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) ( #282 )
2015-08-29 18:13:30 +01:00
ocornut
0bb46c824e
Examples: OpenGL2/3: save/restore some more state correctly.
...
Might save an hour of staring at blank-screen to 5% of the population,
worth it.
2015-08-29 17:44:52 +01:00
ocornut
f2c68109a6
Merge branch 'master' of https://github.com/ocornut/imgui
2015-08-29 14:45:15 +01:00
ocornut
c381d58fb1
TreeNode(): arbitrary interaction padding after text label not part of layout ( #282 )
2015-08-29 14:12:53 +01:00
ocornut
62a3142036
Demo: comments.
2015-08-29 13:31:30 +01:00
ocornut
da807e55ea
Examples: Ignore list a little more friendly to Unix systems.
2015-08-28 16:03:05 +01:00
ocornut
5ebd61f89c
Ignore list a little more friendly to Unix systems
2015-08-28 15:55:22 +01:00
ocornut
e7cc048d81
Demo: custom rendering tweak.
2015-08-28 15:35:08 +01:00
ocornut
0a11024459
IO.WantInputCharacters -> WantTextInput ( #305 )
2015-08-28 15:34:53 +01:00
ocornut
30461345aa
Removed default name parameter in Begin()
...
We already have a "Debug" window pushed to the stack in the first place
so it's not really a useful default.
2015-08-28 15:24:04 +01:00
ocornut
8430c88451
Demo: added a bezier curve in the old custom rendering demo.
2015-08-28 14:41:10 +01:00
ocornut
b803d284c3
InvisibleButton() honor negative size consistently with other widgets that do so
2015-08-28 14:18:50 +01:00
ocornut
90e5c97f13
AddBezier()->AddBezierCurve(). PathBezierTo()->PathBezierCurveTo(), and reads current point back, more standard ( #311 )
2015-08-28 13:48:14 +01:00
ocornut
d2e529e533
Merge branch 'master' of https://github.com/ocornut/imgui
2015-08-28 13:19:43 +01:00
ocornut
80ad773c87
ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves ( #311 )
2015-08-28 13:18:34 +01:00
omar
55ea2988d2
Update README.md
2015-08-28 00:04:49 +01:00
ocornut
e58f99179a
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ( #287 )
2015-08-27 19:51:02 +01:00
ocornut
a36001212f
ImDrawData: added ScaleClipRects() helper ( #287 )
2015-08-27 18:45:43 +01:00
ocornut
8b225923f8
Malformed UTF-8 don't terminate string, output 0xFFFD ( #307 )
2015-08-27 13:44:31 +01:00
ocornut
59d498f3d0
Added ColorConvertU32ToFloat4() helper and ImColor(ImU32) constructor.
2015-08-26 21:18:08 +01:00
ocornut
62671ef96e
Examples: update readme
2015-08-25 22:14:31 +01:00
ocornut
8cf7df7ec4
Added GetWindowHeight() for completeness + BeginGroup() comment.
2015-08-25 16:55:14 +01:00
ocornut
822eaf1751
Examples: DX9, DX11: mapping missing middle mouse button.
2015-08-25 16:54:47 +01:00
ocornut
08b345efd9
ImDrawList: Add comments on the usage of drawing channels
2015-08-25 16:31:20 +01:00
ocornut
77b82ecad7
ImDrawList: Fixed issues with channels split/merge. Functional without manually adding a draw cmd. + Removed unnecessary parameter to Channe
2015-08-25 16:24:17 +01:00
ocornut
ad00d88923
Window clipping rect fixes (for child windows with borders among others)
2015-08-25 15:01:33 +01:00
ocornut
f0aca186cc
Comments
2015-08-25 13:35:25 +01:00
ocornut
ad3c9f620d
Tabs to spaces
2015-08-25 12:40:40 +01:00
ocornut
466f01b313
Fixed child windows with the ImGuiWindowFlags_NoMove flag not taking direct focus
2015-08-25 12:39:44 +01:00
ocornut
43d073db1e
Metrics: showing some internal state
2015-08-25 12:22:30 +01:00
ocornut
b76353bbb1
Passing ImGuiWindowFlags_NoMove to BeginChild() allows to inhibit moving root window from this child
2015-08-25 11:54:13 +01:00
ocornut
063d26a191
Removed obsolete comment
2015-08-24 18:13:31 +01:00
ocornut
9a0650dbd0
Examples: imgui_impl* functions declared with IMGUI_API to ease copy & pasting into projects using DLL
2015-08-24 14:02:51 +02:00
ocornut
b1987d697f
Trim trailing whitespace ( #305 )
2015-08-24 13:50:18 +02:00
ocornut
425c6cb3a3
Remove CaptureInputCharactersFromApp and minor cleanups ( #305 )
2015-08-24 13:47:27 +02:00
Borislav Stanimirov
73917115a8
Added flag showing whether the GUI wants text input
...
Conflicts:
imgui.cpp
2015-08-24 13:44:43 +02:00
omar
7eca754094
Merge pull request #304 from yinjimmy/fix_ios
...
Examples: Fixed missing files in iOS example.
2015-08-23 11:05:39 +02:00
yinjimmy
01a17aa78e
fix ios compile error
2015-08-23 08:03:21 +08:00
omar
e885b08914
Web: Fixed screenshot (Argh web editor is broken)
2015-08-22 11:54:47 +02:00
omar
0e898fb480
Web: Fixed screenshot
2015-08-22 11:54:13 +02:00
omar
5f4cbed7ce
Web: Fixed screenshot
2015-08-22 11:53:45 +02:00
ocornut
b28858b33b
InputText: intentionally ignore character input when ctrl/alt are held (not sure if correct) ( #279 )
2015-08-21 00:24:47 +02:00
ocornut
23ce837dc7
Revert "Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )"
...
This reverts commit d80869189a .
2015-08-21 00:16:07 +02:00
ocornut
d80869189a
Examples: GLFW: using glfwSetCharModsCallback() to ensure characters aren't passed when using mods ( fix #279 )
2015-08-20 22:32:07 +01:00
omar
06c7453ee2
Merge pull request #302 from andresv/mac-sdl2-example-build-instructions
...
Examples: SDL: Add Mac OS X build instructions for sdl_opengl_example
2015-08-20 22:21:01 +01:00
ocornut
bbced3f0f0
Build fix
2015-08-18 19:31:44 -06:00
ocornut
4ac4d1ac37
ImHash: defaults seed to zero + comment.
2015-08-18 19:17:09 -06:00
Andres Vahter
ccbc72e98b
add mac os x build instructions for sdl_opengl_example
2015-08-18 10:16:16 +03:00
ocornut
97be3428f1
Added GetMousePosOnOpeningCurrentPopup().
2015-08-15 15:10:07 -06:00
ocornut
215747635d
Examples: DirectX11: resizing buffers dynamically ( #299 )
2015-08-13 23:13:20 -06:00
ocornut
c016f6c171
Examples: DirectX9: tweaks.
2015-08-13 23:07:53 -06:00
ocornut
698c7cae85
Examples: DirectX9: resizing vertex and index buffers dynamically ( #299 )
2015-08-13 23:06:11 -06:00
ocornut
ede5956b28
Metrics window: shows indices along with triangles count ( #299 )
2015-08-13 22:33:33 -06:00
ocornut
0a6d6da732
Demo: Log: removed unnecessary style change,
2015-08-13 22:11:32 -06:00
ocornut
67b2b5f3a9
Demo: Log: removed broken clipping, tweaks.
2015-08-13 22:04:31 -06:00
ocornut
07de0448f9
ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values
2015-08-13 21:51:34 -06:00
ocornut
307ed78006
ImGuITextBuffer: shallow tweak.
2015-08-13 21:48:08 -06:00
ocornut
b770f3ffaf
Demo: Add filtering to log with better-than-none storage of line offsets.
2015-08-13 21:47:50 -06:00
ocornut
42567a9516
ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.
2015-08-13 21:25:32 -06:00
ocornut
72d3fca52f
Demo: added simple Log demo
2015-08-13 20:59:37 -06:00
ocornut
d36a634ac8
Demo: Fixed incorrectly formed string passed to Combo ( #298 )
2015-08-13 11:55:48 -06:00
ocornut
c98318a914
Renaming some argument to clarify the local vs screen coordinates
2015-08-12 22:46:39 -06:00
ocornut
f421f2f47e
IsWindowHovered() takes account of window hoverability (may be disabled because of a popup) + comment
...
Was a dupe of IsMouseHoveringWindow() anyway, they are now "clearly"
different.
2015-08-12 22:30:07 -06:00
ocornut
bcb83ed24e
Fixed minor typo in example
2015-08-12 12:29:51 -06:00
ocornut
4630815fb0
Links
2015-08-11 14:45:42 -06:00
ocornut
f1f4d68f7f
Prevent imgui_internal.h from being included without imgui.h (piles of errors)
2015-08-10 10:26:39 -06:00
ocornut
0c9fcdbe71
Allow to override ImDrawIdx type ( #292 )
2015-08-09 11:11:39 -06:00
ocornut
915b46f1c1
Added assert on index overflow ( #292 )
2015-08-09 11:05:38 -06:00
ocornut
48ed0a10d7
Minor code compaction (following #296 )
2015-08-09 10:54:28 -06:00
omar
9a97ef673e
Merge pull request #296 from tpoechtrager/master
...
Fixes for compiling Windows target with non-MSVC compiler.
2015-08-09 10:49:06 -06:00
ocornut
6a90ac2094
Tentative GCC/Clang warning fixes with unused functions (cf #296 )
2015-08-09 10:45:58 -06:00
Thomas Pöchtrager
3604aecf8f
Minor Windows adjustments
2015-08-09 17:24:10 +02:00
ocornut
23e7bdebcf
Warnings for clang ( #295 )
2015-08-08 12:30:56 -06:00
ocornut
32f15b9c9a
Merge branch 'tpoechtrager-master'
2015-08-08 12:26:44 -06:00
ocornut
aa3c26fd30
IM_PRINTFARGS takes one argument. Moved pragma outside of .h ( #295 )
2015-08-08 12:26:22 -06:00
ocornut
b637850260
Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master
2015-08-08 12:18:59 -06:00
ocornut
14822609bd
Version number 1.45 WIP
2015-08-08 12:18:37 -06:00
Thomas Pöchtrager
947cf3434f
Added printf attribute to printf like text formatting functions
2015-08-08 19:29:11 +02:00
ocornut
a99ba42a39
Version number 1.44
2015-08-08 07:57:29 -06:00
ocornut
20cc65788d
Build fix for Orbis / PS4
2015-08-07 21:52:57 -06:00
ocornut
27961401c6
Cleanup ( #219 )
2015-08-06 08:37:51 -06:00
ocornut
88a00f77e9
Cleanup - using ImRect more consistently for ImGui-side cliprect data
2015-08-06 08:23:05 -06:00
ocornut
f1fb62fa6d
Cleanup - shuffle functions around ( #219 )
2015-08-06 08:11:33 -06:00
omar
b6313577bb
Merge pull request #291 from twoscomplement/surplus_inlines
...
Remove inline qualifiers inside .cpp
2015-08-06 07:33:12 -06:00
Jonathan Adamczewski
0911597550
Remove inline qualifiers inside .cpp
...
Use of inline in the .cpp file causes link errors with gcc.
2015-08-07 15:41:22 -07:00
omar
80fc576d07
Update README.md
2015-08-05 22:17:10 -06:00
ocornut
96a7873622
Update documentation
2015-08-05 22:00:27 -06:00
ocornut
470200ee5c
Update documentation
2015-08-05 21:59:07 -06:00
ocornut
85dab1a680
Fixed documentation
2015-08-05 19:19:12 -06:00
ocornut
15cfa63e97
Comments
2015-08-05 19:09:13 -06:00
ocornut
692a38c0fc
Merge branch 'master' into 2015-07-cleanup
2015-08-05 17:41:43 -06:00
ocornut
f2b652a39e
Comments
2015-08-05 17:38:17 -06:00
ocornut
e7f1e28b6b
Merge branch 'master' into 2015-07-cleanup
2015-08-05 17:27:47 -06:00
ocornut
4b4f6d78ee
InputFloat() fixed 0 decimal_precision
2015-08-05 17:26:04 -06:00
ocornut
a54995eace
RoundScalar() fallback use powf(10.f, -x) instead of 1.0f/powf(10.0f,x)
2015-08-05 17:11:20 -06:00
ocornut
9b19f8c19d
Merge branch 'master' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-05 16:57:31 -06:00
ocornut
12d941a42a
Merge branch 'master' of https://github.com/ocornut/imgui
2015-08-05 16:51:17 -06:00
ocornut
f6e21b7ab7
InputInt() also hexadecimal input (awkwardly via ImGuiInputTextFlags_CharsHexadecimal but we will allow fmt string in InputInt* later)
...
+ Fix for large ints constant assignment
2015-08-05 16:47:46 -06:00
ocornut
cc8ff4c8d1
RoundScalar() use a lookup table to avoid calling powf(10.0f, x);
2015-08-05 16:17:11 -06:00
ocornut
f0f2afa87d
InputInt() doesn't cast to float, fix handling lost of precision with large integer. Added primitives to support more data types.
2015-08-05 16:08:53 -06:00
ocornut
a793ad682d
Merge branch 'master' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-05 15:29:38 -06:00
ocornut
ebd25cf1a3
Minor comments
2015-08-05 15:13:13 -06:00
ocornut
7fea3eacfe
Minor comments
2015-08-05 12:50:13 -06:00
ocornut
e20b90154c
Comments
2015-08-05 11:04:13 -06:00
ocornut
3ee2fac892
Slider: fixed using FramePadding between frame and grab visual. Scaling that spacing would look odd.
2015-08-05 11:00:00 -06:00
ocornut
e42bec5ba2
Fixed scaling of checkbox and radio button for the filling of "active" visual
2015-08-05 10:50:20 -06:00
ocornut
155873a6b0
Added GetContentRegionAvail() helper
2015-08-05 10:43:12 -06:00
ocornut
1b0a8f9ac3
Comments
2015-08-05 10:00:05 -06:00
ocornut
60b46cc712
Comment ( #219 )
2015-08-05 09:34:07 -06:00
ocornut
8be4d41540
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-08-05 09:32:29 -06:00
ocornut
1befd21b37
Moved ShowUserGuide() after ShowTestWindow() ( #219 )
2015-08-05 09:31:03 -06:00
ocornut
3658314638
imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built ( #219 )
2015-08-05 09:28:19 -06:00
omar
a526b423e8
Merge pull request #290 from cmaughan/master
...
Examples: DirectX11: Clear font texture view pointer to ensure Release() doesn't get called twice
2015-08-04 07:48:31 -06:00
Chris Maughan
d667de9490
Clear font texture view to ensure Release() doesn't get called twice
2015-08-04 14:22:05 +01:00
ocornut
815d1d9be4
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-03 08:12:57 -06:00
ocornut
3aca446817
Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF()
2015-08-03 08:10:10 -06:00
ocornut
da3baebd43
Fixed lower-right resize grip hit box not scaling along with its rendered size ( #287 )
2015-08-02 09:15:36 -06:00
ocornut
e099798c97
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-08-01 22:12:51 -06:00
ocornut
3ccbdc8423
Unnecessary .gitignore in root folder
2015-08-01 22:12:18 -06:00
ocornut
4b29cc9e10
Exposed relevant functions in imgui_internal.h ( #219 )
2015-08-01 21:57:24 -06:00
ocornut
e47bf041bf
Clang warning fixes
2015-08-01 21:37:32 -06:00
ocornut
11d91a27a4
Carriage return ( #289 )
2015-08-01 17:18:01 -06:00
omar
040e427dad
Merge pull request #289 from twoscomplement/sdl_error_out
...
Examples: Show SDL error message on init failure.
2015-08-01 17:07:05 -06:00
Jonathan Adamczewski
f158617551
Show SDL error message on init failure
2015-08-02 01:35:43 -07:00
ocornut
1e76c63bb6
Fixed comment
2015-08-01 08:07:16 -06:00
ocornut
2d8c134747
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-01 07:26:09 -06:00
ocornut
26a992c6f6
Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix #280 )
2015-08-01 07:22:52 -06:00
ocornut
6c63d80aa4
Tidying up InputTextApplyArithmeticOp()
2015-07-30 23:59:51 -06:00
ocornut
f63beeae86
Internal version of LogText() -> LogRenderedText() + shallow tidying up
2015-07-30 23:48:59 -06:00
ocornut
faa609a43c
Internal cleanup ParseFormatPrecision() doesn't take a reference
2015-07-30 23:14:29 -06:00
ocornut
f8646338c3
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-07-30 23:00:11 -06:00
ocornut
7650d4cc67
Internal SliderFloatAsInputText() -> InputFloatReplaceWidget()
2015-07-30 22:59:30 -06:00
ocornut
abf823c6f6
Tidying up
2015-07-30 22:49:10 -06:00
ocornut
58ee08f214
Todo list notes
2015-07-30 22:18:07 -06:00
ocornut
040f3950a3
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-07-30 21:54:07 -06:00
ocornut
e6b29b70b4
Make internal SliderFloatAsInputText() take a size to match the calling widget
2015-07-30 21:51:55 -06:00
ocornut
a7e5945206
Merge
2015-07-30 21:37:59 -06:00
ocornut
c639f65eb7
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-07-30 21:37:47 -06:00
ocornut
02fbb36918
ImDrawList: Add missing support for anti-aliased thick-lines ( #133 , also ref #288 )
2015-07-30 21:11:07 -06:00
ocornut
a79ee94fc4
Removed unnecessary assignment + added comment
2015-07-30 20:59:41 -06:00
ocornut
709c4c3168
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-07-30 20:42:12 -06:00
ocornut
527208ad7c
Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex)
2015-07-30 19:36:55 -06:00
ocornut
fddc871870
Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set.
2015-07-30 12:32:20 -06:00
omar
fc9ee2bc9b
Merge pull request #286 from GHF/cleanup
...
Remove non-text character at start of imgui.cpp
2015-07-30 12:14:01 -06:00
Xo Wang
8d45c89352
Remove non-text character at start of imgui.cpp
2015-07-26 19:18:04 -07:00
ocornut
4468ec001e
Fixed warning in console example (we're iterating chars)
2015-07-22 06:38:19 -06:00
ocornut
fb83323b1d
Tidying up
2015-07-21 20:13:12 -06:00
ocornut
62c888177a
Tweaks
2015-07-21 20:06:34 -06:00
ocornut
e1ac5a3198
Honor IMGUI_DISABLE_TEST_WINDOWS as described ( #219 )
2015-07-21 19:57:32 -06:00
ocornut
68962ae683
README update
2015-07-21 19:53:06 -06:00
ocornut
7552f48d7b
ImLoadFileToMemory() default parameters
2015-07-21 17:46:49 -06:00
ocornut
94f085aa3e
Update comments ( #219 )
2015-07-21 17:19:11 -06:00
ocornut
5a29eef1fa
Fixed further warnings with GCC/Clang ( #219 )
2015-07-21 17:13:56 -06:00
ocornut
e32f0931e8
Missing includes for imgui_draw.cpp ( #219 )
2015-07-21 17:08:20 -06:00
ocornut
52a74701f5
Updated projects to reference new files ( #219 )
...
Didn't update iOS example (#247 )
2015-07-21 17:04:03 -06:00
ocornut
dace68b6fd
Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ( #219 )
2015-07-21 17:00:28 -06:00
ocornut
60dce8bc22
Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. ( #219 )
2015-07-19 11:45:03 -06:00
ocornut
0eb196d544
Examples: OpenGL3: simplified code using glBufferData for vertices as well ( #277 , #278 )
2015-07-19 10:52:51 -06:00
ocornut
dc1cb9e625
Tweak
2015-07-19 10:49:56 -06:00
ocornut
d184730dd2
Merge branch 'trevex-master'
2015-07-19 10:45:59 -06:00
Nik Voss
bc9bae6d01
To support drivers with strict core profiles, a buffer is used for the indices as well ( fixes ocornut/imgui#277 ).
2015-07-19 17:56:14 +02:00
ocornut
83ebbebadd
Fixed inconsistent declaration of ImVec2 privates operators
2015-07-18 22:37:08 -06:00
ocornut
5a4b521855
Added ImDrawList::AddText() shorthand helper
2015-07-18 21:50:23 -06:00
ocornut
74908a9513
Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason
2015-07-18 18:45:37 -06:00
ocornut
479211808f
ImDrawList::AddPolyLine() tidying up in AA path
2015-07-18 17:31:40 -06:00
ocornut
82727d7119
Version number 1.44 WIP
2015-07-18 14:07:22 -06:00
ocornut
cdbf71ac12
Added ImGuiWindowFlags_NoInputs for input-passthru window
...
Would be more useful with finer control over display layer
2015-07-17 16:36:04 -06:00
ocornut
0ab620c2b9
Combo() clamp popup to lower edge of visible area
2015-07-17 16:14:04 -06:00
ocornut
20db726a9a
Version number 1.44 WIP
2015-07-17 16:03:13 -06:00
ocornut
4015414978
InputtextMultiline(): honor negative size consistently with other widgets
2015-07-17 16:01:21 -06:00
ocornut
3b53a6513a
Button() honor negative size consistently with other widgets that do so
2015-07-17 15:58:23 -06:00
ocornut
eca26ae91d
Build fix for MinGW ( #276 )
2015-07-17 13:38:55 -06:00
ocornut
99c5f5735c
Tweak button sizes
2015-07-17 07:08:51 -06:00
ocornut
e8cb874afe
Version number 1.43
2015-07-17 06:51:25 -06:00
ocornut
55ab515551
Binaries
2015-07-16 21:02:43 -06:00
ocornut
1266e4a181
Added a gratuitous About window
2015-07-16 20:58:26 -06:00
ocornut
f7f71043ca
InputText: stb_textedit.h tentative fix for End key on multi-line fields ( #275 )
2015-07-16 20:46:27 -06:00
omar
98047b1b65
Update README.txt
2015-07-16 14:28:16 -06:00
omar
f53d5da0f8
Update README.txt
2015-07-16 14:27:35 -06:00
ocornut
d6117e33d0
AddInputCharactersUTF8: shallow tweaks ( #274 )
2015-07-15 22:14:04 -06:00
omar
bc4ede656b
Merge pull request #274 from DanielGibson/utf8-char-input
...
ImGuiIO::AddInputCharactersUTF8(utf8str), use it in SDL2 example
2015-07-15 22:08:59 -06:00
Daniel Gibson
b7d1b91e4b
Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
...
Now Unicode text input works in this example.
2015-07-16 05:16:22 +02:00
Daniel Gibson
be8fb858cc
Add ImGuiIO::AddInputCharactersUTF8(char* utf8str)
...
It'll convert the utf8 string to ImWchar's and passes each of them
to AddInputCharacter().
Very handy for SDL2 SDL_TEXTINPUT events, which provide a buffer with an
UTF-8 string.
2015-07-16 05:15:03 +02:00
omar
b4ac413868
Merge pull request #273 from DanielGibson/fix-sdl2-linux
...
Examples: Fix SDL2 example for Linux.
2015-07-15 20:15:33 -06:00
Daniel Gibson
02a0967243
Fix SDL2-example for Linux
...
The header is called "SDL_opengl.h" - case matters on Linux.
The main() function must indeed be called main(), on Windows it'll be
renamed to SDL_main (for SDL2main.lib) by #define in SDL_main.h
(which is included by SDL.h)
I added an entry to the example's README that describes how to build
it on Linux.
2015-07-16 03:54:44 +02:00
ocornut
3ff04c95d5
Minor tweaks
2015-07-15 17:18:46 -06:00
omar
52dd99915b
Update README.md
2015-07-15 17:05:14 -06:00
ocornut
0f25885b3d
Merge branch 'master' of https://github.com/ocornut/imgui
2015-07-15 17:02:38 -06:00
omar
9d4d7f3381
Update README.md
2015-07-15 17:00:47 -06:00
omar
298118fccc
New screenshots
2015-07-15 16:58:38 -06:00
ocornut
d19d8f40ba
Removed web screenshots (moved to wiki repository)
2015-07-15 16:27:33 -06:00
ocornut
d170620816
Comments
2015-07-15 14:59:42 -06:00
ocornut
4842ac3bc6
Fonts: added Cousine-Regular.ttf
2015-07-15 14:56:29 -06:00
ocornut
5e846612d3
ImFont: tweaks
2015-07-15 14:54:56 -06:00
ocornut
80276ef07b
Fixed ClearInputData()
2015-07-15 14:48:46 -06:00
ocornut
6c3ab6fc9b
ImFont: fixed minor bug with CPU-side vertical clipping of text.
2015-07-15 13:34:59 -06:00
ocornut
a56768463a
Examples: moved demo bits around.
2015-07-15 13:16:35 -06:00
ocornut
d750df9189
Fix for Shutdown()
2015-07-15 12:37:42 -06:00
ocornut
baa2328b99
Tweak to RenderCheckMark()
2015-07-15 12:31:37 -06:00
ocornut
d7a2a23457
Updated to stb_truetype 1.06 ( #133 )
2015-07-15 12:12:36 -06:00
ocornut
8081e81e55
Fixed warnings + label
2015-07-15 11:56:07 -06:00
ocornut
1a3ef63132
Fixed parameters array size declaration (wouldn't have a side-effect but weird and misleading)
...
Thanks Coverity
2015-07-15 09:36:39 -06:00
ocornut
368d2c3568
OverlayDrawList readier for pushing elements (not exposed yet)
2015-07-15 09:26:03 -06:00
ocornut
0224d29a35
Examples: comments.
2015-07-15 09:05:17 -06:00
ocornut
035ff302d2
ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont()
2015-07-15 08:45:10 -06:00
ocornut
95f489ac1f
Merged AA branch in master! ( #133 )
2015-07-15 08:00:12 -06:00
ocornut
3e3d9f9a69
ImFontAtlas: allow AddFontDefault to take a config
2015-07-15 07:58:33 -06:00
ocornut
7ad4843f57
Fixed comments
2015-07-15 07:52:20 -06:00
ocornut
99a92ee7c5
Comments (fixed old comments)
2015-07-15 07:46:31 -06:00
ocornut
8952b93b2f
Include for alloca()
2015-07-15 07:31:32 -06:00
ocornut
fcec337061
Examples: Simplified font examples comments.
2015-07-15 07:05:34 -06:00
ocornut
815168c7ef
ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. ( #182 , #220 , #232 , #242 )
2015-07-15 07:01:21 -06:00
ocornut
6ae8062ca0
ImFont: comments, minor bits
2015-07-14 15:51:19 -06:00
ocornut
c02f9b58ef
ImFont: Cleanup to be compatible with over-sampling (not enabled)
2015-07-14 12:41:02 -06:00
ocornut
fc6545830b
Examples: displaying more font information.
2015-07-14 10:28:55 -06:00
ocornut
faec745438
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-14 09:23:50 -06:00
ocornut
8cfd963fda
Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus ( #272 )
2015-07-14 09:21:41 -06:00
ocornut
355cbf6326
Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window ( #272 )
2015-07-14 09:10:31 -06:00
ocornut
52c820e7b0
Metrics: more details in popup stack ( #272 )
2015-07-14 09:09:52 -06:00
ocornut
ba9317b924
ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype
2015-07-13 16:08:49 -06:00
ocornut
5b053dd350
Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)
2015-07-13 15:52:57 -06:00
ocornut
7eca4e2a7f
Merge bits
2015-07-12 11:05:30 -06:00
ocornut
fbb9113118
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-12 11:02:46 -06:00
ocornut
4565bf9813
Demo: custom rendering example uses AddRectFilledMultiColor()
2015-07-12 10:52:20 -06:00
ocornut
6520b6c458
ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
2015-07-12 10:48:06 -06:00
ocornut
7a0004eb86
Revert
2015-07-11 18:15:34 -06:00
ocornut
d10d0343b2
Plot() function can take 0.0f for both scale_min/scale_max to calculate scale
2015-07-11 18:10:43 -06:00
ocornut
e681937f66
Delete merging artefact that survived for a day
2015-07-11 08:41:11 -06:00
ocornut
fd44b9440b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-10 21:45:25 -06:00
ocornut
b67593a4b1
Changed SameLine() parameters from int to float.
2015-07-10 19:36:34 -06:00
ocornut
8094aa78d2
Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()
2015-07-10 18:54:26 -06:00
ocornut
827ff970cd
InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
2015-07-10 18:47:55 -06:00
ocornut
d2701727b9
InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
2015-07-10 18:17:46 -06:00
ocornut
f2bed00d80
Examples: README
2015-07-09 08:39:44 -06:00
ocornut
5ab23ab1c0
Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval
2015-07-08 17:25:56 -06:00
ocornut
398ef1a212
Comments
2015-07-08 17:10:14 -06:00
ocornut
245cf36522
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 17:09:47 -06:00
ocornut
890585cde8
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 17:08:51 -06:00
ocornut
08b1dd1035
Version number 1.43 WIP
...
Bits
2015-07-08 17:08:37 -06:00
ocornut
fec09e37ab
Disable warnings, undo f4aae6b9ec ( #265 #266 )
2015-07-08 17:05:24 -06:00
omar
7d45c84f21
Merge pull request #266 from Extrawurst/patch-4
...
Fix minor clang-x64 warnings (fixes #265 )
2015-07-08 17:02:28 -06:00
Stephan Dilly
f4aae6b9ec
fix minor clang-x64 warnings
...
fixes #265
2015-07-09 00:00:28 +02:00
ocornut
09e8c4ec11
AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control ( #133 )
2015-07-08 14:03:27 -06:00
omar
d81ba432ec
New demo binaries
2015-07-08 13:22:34 -06:00
ocornut
e5bea65582
Version number 1.42
2015-07-08 12:59:26 -06:00
ocornut
2f574ef952
Allegro 5 example: converted for indexed rendering.
2015-07-08 12:55:40 -06:00
ocornut
60dd221737
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 12:49:18 -06:00
ocornut
bbaaab7537
Allegro 5 example: fixed uv coordinate of non-default texture.
2015-07-08 12:41:09 -06:00
ocornut
4d2d0ce5cd
Allegro 5 example: handling of hardware and software mouse cursor rendering.
2015-07-08 12:16:50 -06:00
ocornut
8db229b96f
Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.
2015-07-08 12:04:13 -06:00
ocornut
c58d61dfd1
Allegro 5 example: formatting, match other example structure, fixed mouse buttons.
2015-07-08 11:53:30 -06:00
ocornut
489e28ec11
Allegro 5 example: main.cpp matches other examples. added window title.
2015-07-08 11:46:18 -06:00
ocornut
1845ff4690
SDL example: tweaks ( #233 #226 )
2015-07-08 11:42:43 -06:00
ocornut
19e3c1506f
Allegro5 example: added example from https://github.com/bggd/a5imgui_example
2015-07-08 11:34:36 -06:00
ocornut
e49977a913
SDL example: hasty readme.
2015-07-08 11:08:58 -06:00
ocornut
d041ebc6d4
Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives
2015-07-08 10:33:25 -06:00
ocornut
b7e63c163c
SDL example: update for indexed rendering.
2015-07-08 10:32:55 -06:00
ocornut
b36ff2fec3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 10:30:30 -06:00
omar
12aba576fb
Merge pull request #264 from joeld42/antialias-ios-fix
...
AA branch: iOS Example: update for API changes and index rendering
2015-07-08 10:29:39 -06:00
ocornut
a14f6696a3
SDL example: more cleanup to match other examples ( #233 #226 )
2015-07-08 10:27:25 -06:00
ocornut
22e099366f
SDL example: further cleanup to match other examples ( #233 #226 )
2015-07-08 10:20:08 -06:00
ocornut
4167528001
SDL example: moved event loop to main.cpp , adding page up/page down. ( #226 )
2015-07-08 10:10:54 -06:00
Joel Davis
81cebb9c85
Simplified to not combine vert buffers like the opengl3 example
2015-07-08 09:01:10 -07:00
ocornut
b7a2a6b23f
SDL example: renamed folder, added in README
2015-07-08 09:49:32 -06:00
ocornut
44c23e0eed
Allowing DeltaTime==0.0f to not assert
2015-07-08 09:48:10 -06:00
ocornut
b3ae2976c5
SDL example: tweaks and fixes.
2015-07-08 09:46:55 -06:00
ocornut
046dbf502c
Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2
2015-07-08 09:01:04 -06:00
ocornut
e3b9a61883
Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264 )
2015-07-08 08:27:36 -06:00
Joel Davis
ca042134ae
Update ios example for API changes and index rendering
2015-07-07 23:43:27 -07:00
ocornut
1cd391146d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-07 21:48:28 -06:00
ocornut
67d93156df
Fixed clang/gcc warnings ( #133 )
2015-07-07 21:47:33 -06:00
ocornut
5f039e7098
Merge branch 'ios_example_merge'
2015-07-07 21:39:05 -06:00
ocornut
7d144eb899
iOS Example: Optimise PNG files size
2015-07-07 21:37:50 -06:00
ocornut
fb27360ea8
iOS example: shallow tweaks and fixes (untested)
2015-07-07 21:35:09 -06:00
Joel Davis
eee6dab226
iOS example working based on modified OpenGL3 example + Synergy
2015-07-07 21:17:48 -06:00
ocornut
54c2665032
AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path ( #133 )
2015-07-07 20:56:58 -06:00
ocornut
439040bb25
AA branch: more comments on breaking changes ( #133 )
2015-07-07 20:30:46 -06:00
ocornut
d03b046ef4
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ( #133 )
2015-07-07 20:17:07 -06:00
ocornut
d35c1a9e66
AA branch: removed the 'thickness' parameter from ImDrawList::AddLine()
2015-07-07 18:34:29 -06:00
ocornut
ac56e4e209
AA branch: API breaking change documentation
2015-07-07 18:31:41 -06:00
ocornut
af7f35d7c2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-07 18:22:18 -06:00
ocornut
87ebe95fd6
Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls ( #125 )
2015-07-07 18:19:01 -06:00
ocornut
3e4841765d
ImDrawList: winodw draw lists destructed properly on Shutdown()
2015-07-07 18:00:19 -06:00
ocornut
f4fc008a2a
Fixed ListBoxHeader() not honoring negative sizes the same way as BeginChild() or BeginChildFrame() ( #263 )
2015-07-07 16:53:09 -06:00
ocornut
acf58c6223
More debug-build friendly ImVector<> use micro optimisations for the most bottle-neck bunchs
2015-07-07 13:54:06 -06:00
ocornut
bfa7d86070
AA branch: further use of ImVector<> Data/Size
2015-07-07 12:58:36 -06:00
ocornut
c3ced1bd71
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-07 12:42:29 -06:00
ocornut
3869e10574
ImVector<> access to Size/Capacity/Data ( #262 )
2015-07-07 12:39:08 -06:00
ocornut
25882c47a3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/directx9_example/imgui_impl_dx9.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
examples/opengl_example/imgui_impl_glfw.cpp
imgui.cpp
2015-07-07 12:15:35 -06:00
ocornut
502e360ee5
Removed the majority of size_t from the code. ImVector<> now uses int. ( #262 )
...
May trigger new compilation warnings?
2015-07-07 12:09:25 -06:00
ocornut
aeae03f4ac
Fixed minor zealous Clang warning (demo code intentionally uses strdup() to be copiable)
2015-07-07 12:05:15 -06:00
ocornut
02dbcf5405
ImVector<> cannot be re-defined ( #262 )
2015-07-07 11:27:22 -06:00
ocornut
4d42760c0b
Metrics window: "Show clipping rectangles when hovering ImDrawList" enabled by default
2015-07-06 22:10:44 -06:00
ocornut
de6dfe8c5d
ImRect (internal) fixed ImVec4 constructor, argh (broken e7e2fcdd19)
2015-07-06 22:05:27 -06:00
ocornut
92b61d2ee4
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-06 21:47:09 -06:00
ocornut
b92396b46a
Optimisation, removed the duplicate ClipRectStack in ImGuiWindow, storing single value
2015-07-06 21:46:12 -06:00
ocornut
6a22835f63
AA branch: ImDrawList: rename commands to cmd_buffer
...
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
2015-07-06 21:09:05 -06:00
ocornut
e7e2fcdd19
ImRect (internal) made constructors more non-optimised compilation friendly
2015-07-06 20:59:01 -06:00
ocornut
a17e47fe14
ImDrawList: fixed non-merged commands when equal clip rectangles are in the two first commands
2015-07-06 20:38:06 -06:00
ocornut
5782c69c2a
Metrics window: calculate bounding box of actual vertices when hovering a draw list.
2015-07-06 16:34:41 -06:00
ocornut
9db4b35168
Fixed ImRect.Add(ImVec2&) which was broken and somehow unused
2015-07-06 11:13:05 -06:00
ocornut
0ff2a6ff64
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-06 10:56:50 -06:00
ocornut
d6987d1586
ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering.
2015-07-06 10:52:49 -06:00
ocornut
c52cefa2c2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-05 22:27:50 -06:00
ocornut
0d5e6e125c
Documentation ( #133 #254 )
2015-07-05 22:26:01 -06:00
ocornut
0676efd37f
AA branch: added ImDrawData::DeIndexAllBuffers() helper ( #254 )
2015-07-05 22:09:55 -06:00
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
562aecdaa5
Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)
2015-07-05 20:56:01 -06:00
ocornut
3fa4451936
PlotLines(), PlotHistogram(): fixed incorrect hovering test (would trigger tooltip when menu is open)
2015-07-05 20:47:25 -06:00
ocornut
1c160adbba
Comments
2015-07-05 20:38:18 -06:00
ocornut
c9676554b9
MenuItem() can be activated on release ( #245 )
2015-07-05 20:27:06 -06:00
ocornut
8b4a470e1d
Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
2015-07-05 19:24:26 -06:00
ocornut
56553f33b8
AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes ( #133 )
2015-07-05 19:09:53 -06:00
ocornut
19e59421e5
AA branch: comments, inlining minor ops
2015-07-05 18:42:41 -06:00
ocornut
46c440d186
AA branch: AddPolyline() stores normals on stack
2015-07-05 18:19:22 -06:00
ocornut
c09af38804
AA branch: AddConvexPolyFilled() store normals on stack
2015-07-05 18:05:55 -06:00
ocornut
a74ca9025f
AA branch: oops, ImInvLengthSqr() is ImInvLength()
2015-07-05 17:37:55 -06:00
ocornut
a8b5f77591
AA branch: AddPolyline(), AddConvexPolyFilled() a little more readable with more consistent naming
2015-07-05 17:36:07 -06:00
ocornut
0292c82b9c
AA branch: fix lower-right bound of frame outlines
2015-07-05 16:52:06 -06:00
ocornut
2f21347803
CollapsingHeader() fixed label rendering outside in columns context where cliprect max isn't aligned with header
2015-07-05 16:37:49 -06:00
ocornut
7959fbe992
AA branch: CollapsingHeader() rounding down half window padding
2015-07-05 16:35:41 -06:00
ocornut
f04c2002d6
AA branch: fixed column offsets not always aligned to the pixel causing CollapsingHeader() border to incorrectly anti-alias
...
Fixing framed CollapsingHeader() inside columns, where
GetContentRegionMax() doesn't return pixel aligned rounded position.
2015-07-05 16:32:26 -06:00
ocornut
0d7ca3da24
AA branch: AddLine() api adds the 0.5f offset (unsure about that yet)
2015-07-05 16:24:55 -06:00
ocornut
18fa8e1c7e
Fixed IsMouseDragging() ( fix #260 )
2015-07-04 16:46:30 -06:00
ocornut
61e551e0ee
AA branch: fixed warning
2015-07-04 13:41:51 -06:00
ocornut
3b94c37efc
AA branch: minor tweaks + disabled debug code that disable AA when holding Ctrl
2015-07-04 12:59:55 -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
omar
a33810d652
Update README.md
2015-07-03 16:08:00 -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
7437b43b2d
Fixed warnings for more pedantic settings ( #258 )
2015-07-03 08:15:56 -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
0f9e2f8173
Tweaked scrolling example code ( #150 )
2015-07-02 21:22:16 -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
b54cb1c24c
Merge branch 'master' of https://github.com/ocornut/imgui
2015-07-02 20:49:36 -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
omar
5d59e965f6
Update README.md
2015-07-02 15:42:19 -06:00
omar
7bd28d17ca
Update README.md
2015-07-02 15:35:55 -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
1b01137c90
Fixed text baseline alignment of small button (no padding) after regular buttons
...
Currently being a coward and only doing it via the SmallButton() entry
point.
2015-07-02 12:44:48 -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
fc7b562635
Added font links courtesy of twitter + instructions for fonts compressed in C array
2015-07-02 08:16:23 -06:00
ocornut
57f70a29b2
Fixed a bug with TextUnformatted() clipping of long text ( #257 )
2015-07-02 07:42:29 -06:00
ocornut
0e5b64ecd2
SetScrollPosHere() Minor hack for effective "scroll to top" to appear like user expect it ( #150 )
...
Compensate the difference between WindowPadding and ItemSpacing
2015-07-01 19:01:27 -06:00
ocornut
824cf5ae85
Fixed window padding being reported incorrectly for child windows with borders when parent have no borders
2015-07-01 18:55:42 -06:00
ocornut
3d7b596a40
SetScrollToPosHere() fixed imprecision + handling lower gap better for bottom alignment ( #150 )
2015-07-01 18:23:11 -06:00
ocornut
49b7a8e61f
Added scroll tracking example with SetScrollPosHere() (relate #150 )
2015-07-01 18:01:43 -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
b30d08d63a
AA branch: bits
2015-06-30 14:24:50 -06:00
ocornut
c39372e7d5
Title bar uses TitleBgActive color even when window has popups/menus over ( #253 )
2015-06-30 13:52:00 -06:00
ocornut
47826830af
Adding TitleBgActive color - still issues with popups/menus ( #253 )
2015-06-30 13:40:13 -06:00
ocornut
c71b183965
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-06-30 13:31:56 -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
a8f0eb5ec6
AA branch: more optimisations.
2015-06-30 13:12:45 -06:00
ocornut
bbdf36cd3a
AA branch: minor optimisations, merging loops
2015-06-30 13:09:07 -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
5bf30bd6c4
AA branch: Minor optimisations for Debug builds
2015-06-29 19:23:57 -06:00
ocornut
71e9f2a3dd
Fixed warnings for 64-bits builds
2015-06-29 15:46:18 -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
0e3198edc2
Tidying up - renamed FindBestWindowPos() to FindBesttPopupWindowPos()
2015-06-29 15:18:26 -06:00
ocornut
af0de5f357
Tidying up - ImRect doesn't use ImVec2 operators (so we can expose it later)
2015-06-29 13:30:37 -06:00
ocornut
882c7a8cef
Tidying up - ShowUserGuide, ShowStyleEditor only uses public calls
2015-06-29 13:20:28 -06:00
ocornut
039ebb79f4
Tidying up - renamed a few internal functions
2015-06-29 13:18:44 -06:00
ocornut
8b392feba1
Tidying up - moved ImFontAtlas glyph ranges helpers outside of ImFont block
2015-06-29 12:36:24 -06:00
ocornut
0783697f87
Minor tidying up
2015-06-29 10:39:17 -06:00
ocornut
4ac21aaa12
Version number 1.42 wip + todo list entries
2015-06-26 20:48:53 -06:00
omar
14f189b2f6
Merge pull request #250 from benvanik/patch-1
...
Fixing 64-bit compilation warning caused by implicit size_t->int cast
2015-06-26 20:23:32 -06:00
Ben Vanik
5cd1a01514
Fixing 64-bit compilation warning caused by implicit size_t->int cast
2015-06-26 18:49:45 -07:00
ocornut
f66be0e7b2
Demo: satisfying buffer size
2015-06-25 21:52:16 -06:00
ocornut
ea2c824192
Version 1.41
2015-06-25 21:38:24 -06:00
ocornut
8224ca16b6
Carriage return in demo tooltip
2015-06-24 20:45:06 -06:00
ocornut
4976bf97a6
Fix for correctness and allow non-auto resized modals to have window minimum size applied - hopefully no-side effects ( #249 )
2015-06-24 20:35:40 -06:00
ocornut
af5890b276
AutoFit can be triggered on each axis separately via SetNextWindowSize() (mentioned in #249 )
2015-06-24 20:08:08 -06:00
ocornut
975ef00682
Minor construction fix (-1.0 is correct "disabled" value for TextWrapPos, didn't have any incidence anyway)
2015-06-24 19:53:41 -06:00
ocornut
d171e48b20
Fixed SetNextWindowPosCenter() being processed too early for windows that are still measuring their size (for #249 )
2015-06-23 15:45:34 -06:00
ocornut
5436266963
Added SetNextWindowPosCenter() ( #249 )
2015-06-23 15:34:44 -06:00
ocornut
bcbf53857c
BeginPopupModal() default to NoCollapse for modal windows ( #249 )
2015-06-23 15:17:27 -06:00
ocornut
06ed9257ef
Modal windows centered when appearing ( #249 )
2015-06-23 14:28:11 -06:00
ocornut
2a041cfbe1
Added GetGlyphRangesCyrillic() helper ( #237 )
2015-06-23 14:13:22 -06:00
ocornut
0f38a53d28
Added stacked modal windows example ( #249 )
2015-06-23 13:58:47 -06:00
ocornut
f0311b643a
Added modal dialog example ( #249 )
2015-06-23 13:22:37 -06:00
ocornut
a4cd585f54
Reorganized demo window
2015-06-23 12:47:38 -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
eec047c9f7
Fixed leak on Shutdown ( #200 )
2015-06-19 18:14:50 -06:00
ocornut
9e8da4dba0
Comments
2015-06-19 18:09:58 -06:00
ocornut
747999bbaf
Fixed mouse wheel scroll issues, introduced a few weeks ago ( #200 )
2015-06-19 18:01:13 -06:00
ocornut
e7b43b014b
Can't scroll with mouse wheel when window is collapsed.
2015-06-19 17:43:51 -06:00
ocornut
1b28f11acb
InputTextMultiline() filtering out \r for now ( #200 )
2015-06-19 17:34:19 -06:00
ocornut
73db855c77
InputTextMultiline() painfully merged most computation passes into one, better clipping, much faster for large text ( #200 )
2015-06-18 23:23:20 -06:00
ocornut
84987ac3e0
ImFont::RenderText() better vertical clipping for large amount of text (for #200 )
2015-06-18 23:08:42 -06:00
ocornut
324b1c2a28
InputTextMultiline(): made ctrl+up/down closer to windows behavior ( #200 )
2015-06-18 22:35:08 -06:00
ocornut
c4720ec90f
InputTextMultiline() fixed a frame of lag in handling vertical scrolling ( #200 )
2015-06-18 21:20:15 -06:00
ocornut
cd27f8a8e6
InputText(): adjusting selection block height differently for single and multi-line ( #200 )
2015-06-18 21:01:56 -06:00
ocornut
b524c59c70
InputText(): removed a call to strlen() in the active edit path ( #200 )
2015-06-18 20:49:20 -06:00
ocornut
2b68a5c0cf
InputTextMultine() optimised height calculation for inactive multi-line edit box ( #200 )
2015-06-18 19:09:04 -06:00
ocornut
86666489df
ImFont: CalcTextSizeA() fixed font scaling with fallback character.
2015-06-18 18:31:49 -06:00
ocornut
c6d77f3bf5
InputText: fixed handling of scaled font. re-organized bits of code toward merging all sizes calculations ( #200 )
2015-06-18 18:31:13 -06:00
ocornut
10b4fa44c1
Fixed framerate counter averaging buffer size (shouldn't have been included in previous commit)
2015-06-18 17:45:11 -06:00
ocornut
26d2b361d1
InputText(): removed extraneous CalcTextSizeW call for tracking cursor/scrolling, remove spike ( #200 )
2015-06-18 17:40:51 -06:00
ocornut
5f362cabe9
InputText(): char width calculation calls font->GetCharAdvance() directly ( #200 )
2015-06-18 17:11:20 -06:00
ocornut
60079988bd
ImFont::RenderText() faster handling of rendering above clipping rect (useful for #200 )
2015-06-18 12:41:48 -06:00
ocornut
846cfc74a2
InputText() clear selection when using undo/redo ( #200 )
2015-06-18 12:32:55 -06:00
ocornut
d30e8f38b7
InputText() tidying up ( #200 )
2015-06-18 12:29:43 -06:00
ocornut
8fbb4a566a
InputTextMultiline() preserve activeid/cursor/selection when using scrollbar + tidying up ( #200 )
2015-06-18 11:57:43 -06:00
ocornut
9180126db6
Speeding up some wchar<>UTF8 functions and some specialization for Ascii. (testing 500 KB text for #200 )
2015-06-18 11:30:10 -06:00
ocornut
c06373de93
Cleanup
2015-06-18 10:40:11 -06:00
ocornut
d0ea5942a9
InputTextMultiline() can clip + BeginChildFrame() returns bool. ( #200 )
2015-06-18 08:49:57 -06:00
ocornut
9c399ee3be
Demo for InputTextMultiline() ( #200 )
2015-06-17 18:36:06 -06:00
ocornut
b0e8643523
Demo for InputTextMultiline() ( #200 )
2015-06-17 18:31:15 -06:00
ocornut
490e9e42ff
InputText(): shallow tweaks ( #200 )
2015-06-17 18:14:25 -06:00
ocornut
5e323561be
InputTextMultiline() fixes, vertical scrolling, optimizations ( #200 )
...
Using a child window for multi-line text.
2015-06-17 17:07:49 -06:00
ocornut
3df91b52ea
Increased key repeat rate for non-character input key repeat.
...
Dodgy - we should have a match here for character input and
non-character input (e.g. holding 'a' vs holding 'backspace' should be
same rate), but for the earlier we don't have the info?
2015-06-17 16:02:50 -06:00
ocornut
7dc5228235
InputText: doesn't reset scrolling when active text input becomes bigger than its content. ( #200 )
...
Mostly because it's expensive.
2015-06-17 15:49:18 -06:00
ocornut
f75b8c72cf
InputTextMultiline(): vertical scrolling wip, selection rendering fix ( #200 )
2015-06-16 21:53:04 -06:00
ocornut
417a7bc29b
InputTextMultiline(): multi-line selection draw fix ( #200 )
2015-06-16 21:19:47 -06:00
ocornut
f1dfc4d7c4
InputTextMultiline(): multi-line selection draw fix ( #200 )
2015-06-16 21:17:02 -06:00
ocornut
917a1fdbf7
InputText() fixing cancel ( #200 )
2015-06-16 21:08:54 -06:00
ocornut
73491e5adc
InputText() lifted 1024 characters limit ( #200 )
...
Bit messy & not happy with using ImVector<char>
2015-06-16 21:04:27 -06:00
ocornut
0795a60c6b
InputText() fixed multi-line selection clipping. ( #200 )
2015-06-16 20:35:46 -06:00
ocornut
ec7c1834b3
InputTextMultiline() tabbing to a multi-line edit doesn't select all (unless ImGuiInputTextFlags_AutoSelectAll is set), somehow arbitrary (#
...
Seems reasonable
2015-06-16 20:25:08 -06:00
ocornut
6d31c498c0
InputText: multi-line selection, better scrolling, cleaning up ( #200 )
...
Not horizontally scrolling on char boundaries anymore
2015-06-16 20:14:54 -06:00
ocornut
d06ad43dca
ImFont::RenderText() additional early out (typically performed at TextUnformatted() level for large chunks but this is also useful) ( #200 )
2015-06-16 17:50:55 -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
ocornut
a248575dea
Text rendering can be finely clipped cpu-side on top and left axises (for #200 )
2015-06-16 17:21:07 -06:00
ocornut
9765559a28
Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit
...
Conflicts:
imgui.cpp
2015-06-16 15:59:28 -06:00
ocornut
34986771b4
Moved InputFloat() InputInt() below InputText() and not in the middle of internal bits
2015-06-16 15:57:04 -06:00
ocornut
0df7b472c2
InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling
2015-06-16 15:46:45 -06:00
ocornut
b360c83e92
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-06-14 20:29:10 -06:00
ocornut
7d860a0181
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-06-14 20:28:19 -06:00
ocornut
6eb1fec7a9
ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent.
2015-06-14 17:30:06 -06:00
ocornut
b503e5ee5b
ImageButton() changed default bg_col parameter from (0,0,0,1) black to (0,0,0,0) tranparent + drawing frame even when no padding ( #243 )
2015-06-14 16:18:22 -06:00
ocornut
4f0fa58ff2
Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125
2015-06-14 15:19:47 -06:00
ocornut
c82e72eecb
Selectable() parameter comment
2015-06-14 15:14:33 -06:00
ocornut
cf481e1a7b
Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns ( #125 )
2015-06-14 12:41:40 -06:00
ocornut
2bcafc861e
SelectableEx - replaced unnecessary extra size_draw parameter by a flag.
2015-06-13 14:20:02 -06:00
ocornut
96496ced5f
Metrics windows display storage size
2015-06-11 16:04:06 -06:00
ocornut
039418f393
ColorButton(), ColorEdit4(): colored square stays square, used vertical padding on both axis.
2015-06-09 14:39:27 -06:00
ocornut
6bb06fdb81
Selectable, MenuItem: don't use frame rounding for hovering/selection.
2015-06-09 14:32:37 -06:00
ocornut
3fd4441f70
SetScrollPosHere() fixed imprecisions
2015-06-09 13:14:22 -06:00
ocornut
3ca54ad369
SetScrollPosHere() takes account of item height + more accurate centering
2015-06-09 12:57:27 -06:00
ocornut
e8422f7aa0
SetScrollPosHere() rewrote to that window size is not required at the time of calling, can be used on frame 0 of an auto-resizing window
2015-06-09 12:49:13 -06:00
ocornut
8c86322068
Combo() now using the popup facility. More consistent + when combo open hovering other widgets is disabled. ( #241 )
2015-06-09 12:35:55 -06:00
ocornut
6f1dd7a688
Allow Set*WindowSize() calls to be used with popups (fix for using e.g. scroll function on the first frame)
2015-06-09 12:32:19 -06:00
ocornut
6807546caf
Allow Set*WindowSize() calls to be used with popups.
2015-06-09 11:35:29 -06:00
ocornut
4536668482
Fixed issue with activating a Combo() not taking active id ( #241 )
2015-06-09 10:09:12 -06:00
ocornut
20088303e9
ImFont: ignoring \r
2015-06-04 12:26:23 +01:00
ocornut
d31cf1af5d
Merge branch 'master' of https://github.com/ocornut/imgui
2015-06-03 15:31:13 +01:00
ocornut
eb75ffdc5d
DragFloat(), SliderFloat() Fixed rounding of negative which sometimes made the negative lower range unreachable.
2015-06-03 15:31:08 +01:00
omar
e57d460e31
Update README.md
2015-06-03 12:48:55 +01:00
ocornut
0e04dfbad7
Added IsWindowHovered() helper.
2015-06-02 20:57:29 +01:00
ocornut
9928d19af1
Version 1.41 WIP
2015-06-02 14:41:14 +01:00
ocornut
82d4180f39
Bits of TODO list
2015-05-31 21:15:35 +01:00
ocornut
931b8dcdaf
Version 1.40
2015-05-31 19:31:02 +01:00
ocornut
c603534d38
Version 1.40
2015-05-31 19:24:32 +01:00
ocornut
a76eea85c8
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-05-31 16:59:01 +01:00
ocornut
ade7661b3f
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-05-31 16:57:43 +01:00
ocornut
8738147aee
Windows: pragma link with user32.lib if we are using native clipboard function (unless IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS) #238
2015-05-31 15:55:32 +01:00
omar
b148f70f83
Update README.md - new demo binaries
2015-05-31 14:51:35 +01:00
ocornut
1c2dac2a90
Version increased to 1.40 WIP makes more sense than 1.39 (changelog is huge)
2015-05-31 14:46:28 +01:00
ocornut
b5b165b989
Web: Added screenshots
2015-05-31 14:44:47 +01:00
ocornut
04e91500c5
Comments
2015-05-31 14:03:07 +01:00
ocornut
374d160234
BeginPopupContextWindow() in_empty_space_only -> !also_over_items ( #126 )+ comments
...
Sorry if you used this parameter already.
2015-05-31 12:55:12 +01:00
ocornut
bda0269133
ListBox() uses ImGuiListClipper helper, faster for large lists, assume evenly sized items.
2015-05-31 12:35:21 +01:00
ocornut
eb4ffd5dbd
Added ImGuiListClipper helper to avoid using CalcListClipping() directly.
2015-05-31 12:33:24 +01:00
ocornut
446d8abfb0
ListBoxHeader() can return false. Also made ListBox() only use public API.
2015-05-31 11:54:00 +01:00
ocornut
df37df821e
RetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline indirection.
2015-05-31 11:52:57 +01:00
ocornut
0539be7067
Added IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2015-05-31 11:17:58 +01:00
ocornut
475498f2eb
Comments, moved Sliders below Drag & Input in imgui.h
2015-05-31 11:12:29 +01:00
ocornut
03ff2faacb
Comments
2015-05-31 11:01:22 +01:00
ocornut
c4cb768432
Comments
2015-05-31 10:53:42 +01:00
ocornut
01f74781b0
Merge branch 'master' of https://github.com/ocornut/imgui
2015-05-31 09:12:24 +01:00
ocornut
9417df2a26
Renamed IsRectClipped to IsRectVisible for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete)
2015-05-31 09:12:07 +01:00
omar
abd0e85fc6
Update README.md - supporters
2015-05-29 15:42:15 +01:00
ocornut
5ea23977f7
Fixed uninitialized fields in constructor - wouldn't have caused a problem (thanks Coverity!)
2015-05-29 14:54:33 +01:00
ocornut
f1f3424cdd
Popups WantCaptureMouse active when popups/menus are active + using tracked mouse button ownership when mouse down ( #126 )
2015-05-29 11:42:35 +01:00
ocornut
73d1126bf4
Examples: OCD tweaks, a sign that we are near the release!
2015-05-29 11:15:24 +01:00
ocornut
448b262b37
Examples: Comments.
2015-05-29 11:11:50 +01:00
ocornut
83770e5e40
Examples: Tweaks. Usnig sprintf() in user-copiable code.
2015-05-29 11:05:17 +01:00
ocornut
0db6bac590
Examples: Tweaks, demo code creating graph data actually creates data at the correct rate.
2015-05-29 11:01:53 +01:00
ocornut
9ace617e7e
Examples: Tiding up. Moved Dragging example higher up.
2015-05-29 10:52:45 +01:00
ocornut
616a7e6c61
Examples: Using a helper function for ? markers
2015-05-29 10:44:30 +01:00
ocornut
d86785ac98
Examples: Fixed Simple Layout example always showing. Using BeginPopupContextItem().
2015-05-29 10:36:33 +01:00
ocornut
4144c59ce4
Added Simple Layout example applet
2015-05-29 10:29:26 +01:00
ocornut
15a26a479b
Fixed auto-filling child window using WindowMinSize at their minimum size, irrelevant. Using an arbitrary small number instead.
2015-05-29 10:24:03 +01:00
ocornut
f0781d3a24
Added GetItemsLineHeightWithSpacing() helper.
2015-05-29 09:00:34 +01:00
ocornut
aaefe462bb
Popups: calling OpenPopup() on already open popup doesn't close it's child ( #126 )
...
Fixed previous commit.
2015-05-28 23:47:01 +01:00
ocornut
78dc54ab3d
Popups: calling OpenPopup() on already open popup doesn't close it's child ( #126 )
...
It think it makes more sense? Maybe?
Note that calling OpenPopup() every frame probably doesn't make sense.
2015-05-28 23:37:11 +01:00
ocornut
7847100ad8
Tweak BeginMenu() code
2015-05-28 23:14:25 +01:00
ocornut
733e079081
Moved CloseInactivePopups() and tweaked.
2015-05-28 23:04:29 +01:00
ocornut
95e2afcad6
Updated to stb_truetype 1.05
2015-05-28 09:38:00 +01:00
omar
46a27cdb6b
Merge pull request #236 from bkaradzic/master
...
Define STBTT_DEF extern when STBTT not compiled with ImGui.
2015-05-28 08:19:14 +01:00
Branimir Karadžić
123fd73c8c
Merge remote-tracking branch 'upstream/master'
2015-05-27 22:01:37 -07:00
Branimir Karadžić
cd9244ab15
Define STBTT_DEF extern when STBTT not compiled with ImGui.
2015-05-27 16:12:52 -07:00
ocornut
dcc7df2b21
Added BeginPopupContextVoid() helper for completeness ( #126 )
2015-05-27 23:28:53 +01:00
ocornut
235cca4f97
Fix to allow opening popup from a left-click on void or another window (because left-click would normally override focus immediately) ( #126 )
...
Neither appears to be really useful frankly.
2015-05-27 23:24:39 +01:00
ocornut
1cb6a294b0
BeginPopupContextWindow() rearranged and clarified parameters ( #126 )
2015-05-27 23:07:24 +01:00
ocornut
b0a9bbf6f6
Popup taking focus deactivate focused widget of other window ( #126 )
...
e.g. focus InputText(), open contextual popup, input text used to stay
focused
2015-05-27 22:58:49 +01:00
ocornut
f8b7d5c76d
Tracking ActiveIdWindow along with ActiveId
2015-05-27 22:53:43 +01:00
ocornut
938528e5ee
Added BeginPopupContextItem() / BeginPopupContextWindow() ( #126 )
2015-05-27 22:36:23 +01:00
ocornut
5b0861768e
Fixed GetId()/BeginPopup() accessing current window in "append" mode
2015-05-27 22:26:03 +01:00
ocornut
8c4c421f74
Added IsAnyItemHovered() public helper.
2015-05-27 22:02:12 +01:00
ocornut
70f2ff0e5a
No minimum size for popups
2015-05-27 21:59:02 +01:00
ocornut
99ff45ad2e
Tweak context menu example
2015-05-27 21:42:16 +01:00
ocornut
90db64d4e3
Added context menu example on a DragFloat widget
2015-05-27 21:39:41 +01:00
ocornut
487500d291
Tweaks
2015-05-27 16:03:44 +01:00
ocornut
7d28fe5915
WIP Menus: Reverted f26de46350 for now ( #126 )
2015-05-27 15:51:50 +01:00
ocornut
d05c1d58c3
Oops
2015-05-27 15:44:07 +01:00
ocornut
405785ea62
ItemWidthStack can be empty, to remove one allocation per window
2015-05-27 15:42:29 +01:00
ocornut
0a7024c198
Store common stacked settings contiguously in memory to reduce cache misses & unnecessary heap allocations
2015-05-27 15:35:49 +01:00
ocornut
3d36c81241
Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() !
2015-05-27 15:22:09 +01:00
ocornut
d69f2f57ee
Added configurable io.KeyRepeatDelay, io.KeyRepeatRate
2015-05-27 15:17:44 +01:00
ocornut
904e187f70
Simplified some widget code, moving alignment to RenderTextClipped()
2015-05-27 14:39:41 +01:00
ocornut
3c264827fd
Reordering parameters of internal RenderTextClipped()
2015-05-27 14:24:52 +01:00
ocornut
f841097e99
Button centering left to RenderTextClipped function.
2015-05-27 14:20:50 +01:00
ocornut
f26de46350
Button() closes active popup ( #126 ) unsure about that
2015-05-27 09:28:44 +01:00
ocornut
e6ac9e88aa
Refactor Button() and SmallButton() into a shared function ButtonEx()
2015-05-27 09:22:30 +01:00
ocornut
b8ee48a74b
OpenPopup() Comments
2015-05-27 09:18:04 +01:00
ocornut
843219daec
Spacing + untabify
2015-05-26 22:14:07 +01:00
ocornut
7b8b5754bc
EndGroup() carries on the text base offset from the last line of the group (sort of incorrect but better than nothing)
2015-05-26 22:13:07 +01:00
ocornut
6f32684f15
Examples: various usage comments.
2015-05-26 21:36:44 +01:00
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
90cf77b191
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-26 18:03:46 +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
fdce095101
Comments
2015-05-26 17:27:35 +01:00
ocornut
d009a85de4
WIP Menus: Implement amazon's dropdown-like triangle test for navigating sub-menus ( #126 )
2015-05-26 17:09:21 +01:00
ocornut
63a39dd08e
WIP Menus: Recursive menu demo ( #126 ). Actually useful to test sub-menu positioning.
2015-05-26 16:14:51 +01:00
ocornut
cdb5e16f70
SelectableEx: use flags internally (similar to ButtonBehavior)
2015-05-26 16:12:40 +01:00
ocornut
4eeba016f6
WIP Menus: Closing sub-menu when hovering something else in the same parent window ( #126 )
...
Immediate open/close is error-prone
2015-05-26 15:01:04 +01:00
ocornut
83b10f77a9
Comments
2015-05-25 23:47:59 +01:00
ocornut
fd0108dbef
Comments
2015-05-25 23:37:08 +01:00
ocornut
98540370a0
WIP Menus: Layout in menu-bar tweaks to lay better when mixed widgets ( #126 )
2015-05-25 23:15:00 +01:00
ocornut
bb8cdcb916
WIP Menus: Layout in menu-bar more standard, allows mixing different widgets in menubar. ( #126 )
...
Still some minor spacing bugs.
2015-05-25 23:08:22 +01:00
ocornut
83cb040d20
Selectable: text baseline alignment for line that aren't of text height.
2015-05-25 23:03:16 +01:00
Cedric Guillemet
2acdafe4f2
imgui_impl_sdl and main sample
2015-05-25 09:40:58 +02:00
ocornut
44ed5640d3
WIP Menus: Sub-menu overlapping amount not hardcoded ( #126 )
2015-05-24 23:58:40 +01:00
ocornut
0836f69d9b
WIP Menus: Fixed style.WindowPadding == 0 leading to zero-sized initial clipping rectangle leading to self-collapsing childs ( #126 )
2015-05-24 23:56:29 +01:00
ocornut
6c749934ec
Combo: empty label doesn't add ItemInnerSpacing alignment, matching other widgets
2015-05-24 23:45:44 +01:00
ocornut
9abcbf73cb
WIP Menus: Sub-menus appears over the parent-menu scrollbar if there is one (unsure about that) ( #126 )
2015-05-24 23:37:47 +01:00
ocornut
63aa035f59
WIP Menus: Fixed estimation of scrollbar width (broke in 292f08b11e) ( #126 )
2015-05-24 23:25:57 +01:00
ocornut
8c1d7daef8
WIP Menus: Fixed repositioning of menus when there's no room in the 4 quadrants., we still keep them within the visible display area ( #126 )
...
vs popup which prefer to stay away from the mouse cursor
2015-05-24 23:17:06 +01:00
ocornut
1ab1712849
WIP Menus: Clicking the label of an already open sub-menu doesn't close it unless from a menu-bar (match Windows behavior) ( #126 )
...
Argh,
2015-05-24 22:33:04 +01:00
ocornut
48ede93a58
WIP Menus: Fixed closing popup on menu item activation when a child menu is open from the popup ( #126 )
2015-05-24 22:30:48 +01:00
ocornut
3498617a3c
Comments.
2015-05-24 22:16:34 +01:00
ocornut
53892ab893
WIP Menus: Fixed manually closing submenu affecting position of the following window ( #126 )
2015-05-24 21:20:10 +01:00
ocornut
292f08b11e
WIP Menus: Fixed some alignment issues with non standard styles. Tweaked menu-bar color ( #126 )
2015-05-24 21:11:11 +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
e6b1e39847
WIP Menus: don't clamp windows within display when a position has been explicitly set by user. Menu item spacing uses ItemSpacing. ( #126 )
2015-05-23 13:43:13 +01:00
ocornut
e7097d6176
WIP Menus: menus now affected by WindowMinSize ( #126 )
2015-05-23 13:03:09 +01:00
ocornut
e3f2ad728a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
2015-05-21 22:57:29 +01:00
ocornut
cc3ed515ca
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-05-21 22:52:46 +01:00
ocornut
882b4a5eb4
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.cpp
2015-05-21 22:51:21 +01:00
ocornut
7fbe6574c6
Removed unnecessary PushTextureId/PushClipRect/PopClipRect/PopTextureId on multiple Begin/End pairs
2015-05-21 22:45:32 +01:00
ocornut
8a6d543bc9
ImDrawList: merge draw command better, cases of multiple Begin/End gets merged properly
2015-05-21 22:43:28 +01:00
ocornut
6a1eba2d0a
Fixed appending multiple times to an existing child via multiple calls to same BeginChild/EndChild
2015-05-21 22:21:00 +01:00
ocornut
14ab9708be
Removed a few empty lines
2015-05-20 10:31:05 +01:00
ocornut
df276b82da
Updated FAQ for usage of ## to display empty label
2015-05-19 23:33:55 +01:00
omar
30a0193d73
Merge pull request #229 from gordonmcshane/osx-example-fix
...
Examples: OpenGL3: Fix for OSX requiring forward compatibility flag (see #229 )
2015-05-19 10:36:23 +01:00
ocornut
e43c5cd3d3
InputText: Fixed cursor generating a zero-width wireframe rectangle turning into a division by zero.
2015-05-18 23:42:12 +01:00
ocornut
92ded00fd9
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
2015-05-18 23:32:32 +01:00
Gordon McShane
6ee65fc5af
Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
2015-05-18 18:26:16 -04:00
ocornut
da53caf310
Moved ImVector<> after the main block ( #219 )
2015-05-18 22:33:43 +01:00
ocornut
b6f3c97e3b
Examples: DirectX11: explicitly set rasterizer state.
2015-05-18 21:38:17 +01:00
ocornut
0cdd050cd7
WIP Menus: fixed recycling menu level during the same frame ( #126 )
...
We could also enforce "clearing" the window and recycle immediate which
sort of work, but it would be a less tested code path.
2015-05-18 21:26:46 +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
9bdacaf08d
WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar ( #126 )
2015-05-18 19:12:36 +01:00
ocornut
75ec4841df
WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site ( #126 )
2015-05-18 18:44:15 +01:00
ocornut
e674df8101
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-18 16:45:55 +01:00
ocornut
097fe51f97
Hovering require to hover same child window. Reverted 860cf578f5 (December 3), replaced by a flag resize grip.
...
Might break something if you have childs overlapping non-childs.
2015-05-18 16:42:55 +01:00
ocornut
060f879816
Tweak internal ButtonBehavior() to ease passing extra options
2015-05-18 16:39:37 +01:00
ocornut
7184de24b8
WIP Menus: scrolling section of the window is clipped by the menu bar ( #126 )
2015-05-18 15:54:56 +01:00
ocornut
0e8c2f9d41
Comments
2015-05-18 14:10:59 +01:00
ocornut
a17c930d1f
WIP Menus: Added example menu, move app examples to a sub-menu ( #126 )
...
NB: menus do not react on click yet, with popup-style blocking of other
inputs yet
2015-05-17 23:19:05 +01:00
ocornut
09abf11e56
WIP Menus: BeginMenuBar() return false on window without a menu bar ( #126 )
2015-05-17 23:13:53 +01:00
ocornut
4bd43bdb35
Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu
2015-05-17 22:28:57 +01:00
ocornut
7f3f3891c0
WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted ( #126 )
2015-05-17 22:15:40 +01:00
ocornut
88d7b3de23
WIP Menus: fixed hovering handling of menus from menu bars ( #126 )
2015-05-17 17:21:49 +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
6251d37987
WIP Menus: further fixes for resizing ( #126 )
2015-05-17 15:48:56 +01:00
ocornut
f44526cc45
Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window
2015-05-17 13:09:46 +01:00
ocornut
e912bcb36d
Comments
2015-05-17 12:10:57 +01:00
ocornut
ecda785cbc
Popups: fix to allow child popups to be opened from a normal window without an intermediate popup window.
2015-05-15 23:57:43 +01:00
ocornut
4250357ed2
Selectable: using window->WindowPadding() to work within non-padded child windows
2015-05-15 22:39:52 +01:00
ocornut
79a95256e8
Window: fixed auto-fit calculation mismatch of whether a scrollbar will be added by maximum height clamping.
...
Also honor NoScrollBar in the case of height clamping, not adding extra
horizontal space.
2015-05-15 22:36:31 +01:00
ocornut
3115e546aa
Style editor: fixed slider for indent spacing.
2015-05-15 21:55:54 +01:00
ocornut
c1b55991c0
Window: fixed child window sizing lag + minimum size clamping lag
2015-05-15 21:40:45 +01:00
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
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
13c3f11c66
Comments ( #209 )
2015-05-07 11:36:16 +01:00
ocornut
fbbe7fee53
Fix "Debug" window stealing focus/popup #208 #209 @thevaber
2015-05-07 11:24:51 +01:00
ocornut
25d8c1af91
Removed inline marker #210
2015-05-07 10:48:05 +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
b1b23d6ca9
Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that)
2015-05-03 13:52:53 +01:00
ocornut
0ca7926b94
Popup auto-border doesn't spread to its childs #197
2015-05-03 13:04:43 +01:00
ocornut
a3a10d4a3c
Popup have borders by default #197 attenuated border alpha in default theme
2015-05-03 12:17:53 +01:00
ocornut
47e875314b
Plot: overlay label clipped within frame when bigger than frame
2015-05-03 11:32:39 +01:00
ocornut
f00662a5ad
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-05-02 22:20:48 +01:00
ocornut
08fd6a7e7d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-05-02 22:20:14 +01:00
ocornut
d84b5737a6
Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size.
...
Big change, needed reorder of Begin(). May trigger new bugs.
2015-05-02 18:22:46 +01:00
ocornut
99e315d2b2
Fix for width of child windows with scrollbar (broken 376a6a5af0)
2015-05-02 18:14:24 +01:00
ocornut
221f36e116
Comments, tweaks, metrics window tweak
2015-05-02 17:54:25 +01:00
ocornut
a3560b274e
Tidying up Begin(): using local copy of 'flags' for brevity
2015-05-02 17:45:54 +01:00
ocornut
6ca4b31bf8
Fixed popup resizing (broken 376a6a5af0)
2015-05-02 15:54:35 +01:00
ocornut
a906738ba7
Renamed Visible->Active internally
2015-05-02 13:20:50 +01:00
ocornut
1b5795c96d
InputText: fixed incorrect edit state after text buffer is modified by user through callback #206
2015-05-02 12:45:53 +01:00
ocornut
81bf614821
Fix window size after collapsing (broken 376a6a5af0)
2015-05-02 12:35:34 +01:00
ocornut
7fac4013a4
Build fix
2015-05-02 12:22:52 +01:00
ocornut
4e292bf67d
Tidying up Begin(): separated blocks needed for auto-resize so it can be moved above position calculation later
2015-05-02 12:20:06 +01:00
ocornut
376a6a5af0
Tidying up Begin() separated blocks needed for auto-resize so it can be moved above position calculation later
...
Being cautious again. Hopefully didn't break anything.
2015-05-02 12:08:24 +01:00
ocornut
46f55fe6f6
Tidying up Begin()
2015-05-02 10:46:24 +01:00
ocornut
3f7f256752
Tidying up. Re-arranged the (first_begin_of_the_frame) blocks in Begin() for further changes.
...
Being cautious.
2015-05-02 10:32:32 +01:00
ocornut
19f7bf90f8
Examples: AutoResize demo doesn't use TextWrapped()
2015-05-01 21:01:54 +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
ad7f600e0d
Examples: DirectX9/11: hide os curosr if ImGui is drawing it ( #155 )
2015-05-01 11:25:15 +02: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
2440a30444
Columns() distinguish columns-set ID from other widgets as a convenience, added asserts, added more sailors
2015-04-28 18:09:38 +02:00
ocornut
bd23c11a93
Separator() within group start on group horizontal offset #205
2015-04-27 22:19:14 +02:00
ocornut
1d90f099bd
Tidying up
...
We still have an issue with ImVec4 vs ImRect
2015-04-26 13:17:56 +02:00
ocornut
6844952d56
Fixed build with Visual Studio 2008 or earlier (via PR #203 )
2015-04-24 09:22:29 +02:00
ocornut
18a00c7060
Examples: DirectX9/11: Fixed key mapping for down arrow.
2015-04-24 09:18:56 +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
37d8d78fc2
Selectable() render into AutoFitPadding only when full-fitting (fix aac99819d6)
2015-04-19 23:37:50 +01:00
ocornut
064b94721e
Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4.
2015-04-19 23:28:57 +01:00
ocornut
94c4e9564d
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-04-19 23:00:14 +01:00
ocornut
86d1abf3f6
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-19 22:59:53 +01:00
ocornut
05ee36baab
Version number 1.38
2015-04-19 22:59:27 +01:00
ocornut
85e18c72d2
ShowTestWindow(): drag example + tooltip.
2015-04-19 22:57:39 +01:00
ocornut
731b003c9d
Slider internals: removed unnecessary slider_bb parameter
2015-04-18 19:34:05 +01:00
ocornut
acbd58627f
ShowTestWindow(): added a custom label in the format for one of the slider example.
2015-04-18 17:35:40 +01:00
ocornut
c46d5634d4
Columns: mouse dragging uses absolute mouse coords. Fixed dragging left-most column of an auto-resizable window. #125
2015-04-18 13:46:28 +01:00
ocornut
c82f909be1
Active column (when dragged) not clipped so it can release its active state (extends 16ddd796f3)
2015-04-18 12:11:59 +01:00
ocornut
26e469af22
Documentation
2015-04-18 09:19:41 +01:00
ocornut
04a4433706
Update imconfig.h documentation
2015-04-18 09:16:32 +01:00
ocornut
02de9bd859
DragFloat, DragInt: if step/speed is zero defaults to 1% of range #180
2015-04-17 10:01:39 +01:00
ocornut
4f1acf0d4a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-04-17 08:42:36 +01:00
ocornut
1847270a5f
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-17 08:41:16 +01:00
omar
6408ac482c
Merge pull request #199 from bkaradzic/master
...
Fixed C4267 size_t to unsigned int conversion warning.
2015-04-17 08:09:07 +01:00
Branimir Karadžić
6920e70e2e
Fixed C4267.
2015-04-16 15:52:35 -07:00
ocornut
7fde17e15a
ShowMetricsWindow(): renaming locals (not sure about the "shadows a local variable" warning?)
2015-04-16 23:30:48 +01:00
ocornut
0d4f29a317
Merge branch 'bkaradzic-master'
2015-04-16 23:28:58 +01:00
Branimir Karadžić
508d05414a
Fixed warning: missing initializer for member.
2015-04-16 14:45:42 -07:00
Branimir Karadžić
b7b3df3c81
Fixed: warning: declaration shadows a local variable
2015-04-16 14:42:17 -07:00
Branimir Karadžić
d24474ea82
Fixed: warning: missing field 'w' initializer [-Wmissing-field-initializers]
2015-04-16 14:39:04 -07:00
ocornut
64db50ba46
TODO list
2015-04-16 10:58:30 +01:00
ocornut
aca85dbea4
Fixed hovering over a popup's child (popups disable hovering on other windows but not their childs) #197
2015-04-16 10:54:56 +01:00
ocornut
f400ea4ec8
Examples: OpenGL3: backup/restore current program and texture #195
2015-04-15 10:14:51 +01:00
omar
17b63d846f
Merge pull request #194 from Roflraging/master
...
Examples: GLFW Set modifier key state by inspecting imgui's io.KeysDown array (see #183 )
2015-04-14 20:33:12 +01:00
Dale Kim
ac518a1d3e
Set modifier key state by inspecting imgui's io.KeysDown array.
2015-04-14 14:09:26 -05:00
ocornut
de3a154f38
Tweak date/credits
2015-04-14 12:00:12 +01:00
ocornut
43cb4038c6
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
2015-04-14 09:51:28 +01:00
ocornut
0bb89ccee2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-04-14 09:49:04 +01:00
ocornut
71429d306e
Examples: Simplified GLFW keyboard callbacks
2015-04-14 09:45:27 +01:00
ocornut
c735d3066b
Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
2015-04-14 09:37:10 +01:00
Dale Kim
fe15756129
Simplified glfw keyboard callbacks.
2015-04-13 20:04:53 -05:00
omar
88bc8efab0
Merge pull request #193 from Extrawurst/patch-3
...
Fix outdated documentation
2015-04-14 00:22:32 +01:00
Stephan Dilly
b28ec1f3b1
fix outdated documentation
2015-04-14 00:40:46 +02:00
ocornut
dd36e8bf2b
Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete).
2015-04-13 22:04:28 +01:00
ocornut
d11b4160aa
Added IsItemVisible(). Made IsClipped() also return false when log is enabled.
2015-04-13 21:52:38 +01:00
ocornut
16ddd796f3
Active widgets is not clipped, so it can always release its active state (mentioned in #143 )
...
Otherwise a change in layout moving active widget to a clipped region
may lock the active id.
2015-04-13 20:59:44 +01:00
ocornut
9918ec31d6
Added ResetMouseDragDelta() for iterative dragging operations
2015-04-13 19:54:40 +01:00
ocornut
a143e2e772
Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies
2015-04-13 14:45:27 +01:00
ocornut
750b6c9224
DragFloat() fixed clamping #180
2015-04-13 00:07:41 +01:00
ocornut
6ed06a8dc8
DragFloat() added power parameter for logarithmic drag on both side of zero #180
2015-04-13 00:03:57 +01:00
ocornut
f5ad362912
DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
2015-04-12 19:15:55 +01:00
ocornut
0dc3d07e7f
DragInt() step given as float to allow finer control of speed #180
2015-04-12 19:08:56 +01:00
ocornut
62abde5b37
DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
2015-04-12 19:07:48 +01:00
ocornut
b308d2728b
Remove stray tabs
2015-04-12 10:45:00 +01:00
ocornut
adae98664e
Comment on the newly added binary_to_compressed_c.cpp helper program
2015-04-12 10:31:10 +01:00
ocornut
88725be381
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-04-11 18:13:43 +01:00
ocornut
7ca21a1bc2
Fixed prototypes
2015-04-11 18:12:11 +01:00
ocornut
ac740170b9
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
2015-04-11 18:00:09 +01:00
ocornut
bff9a6b6e3
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
2015-04-11 17:52:51 +01:00
ocornut
d809abbe1c
Examples: DirectX11: tidying up.
2015-04-09 23:32:36 +01:00
ocornut
c3a71f5472
AA branch: Minor optimisation merge + thickness for non-aa strokes.
2015-04-09 23:00:55 +01:00
ocornut
dbc9b2ec9b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-04-09 22:56:13 +01:00
ocornut
6bdb8719e2
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-04-09 22:50:18 +01:00
ocornut
a48130b682
ImDrawList: Minor optimisation.
2015-04-09 22:49:18 +01:00
ocornut
e0cd947904
AA branch: Fixes.
2015-04-09 22:40:50 +01:00
ocornut
1e69175403
AA branch: Test disabling aa at runtime for stroke and fill.
2015-04-09 22:31:26 +01:00
ocornut
431e391ccd
AA branch: fixed circles.
2015-04-09 21:51:33 +01:00
ocornut
dd893ac4f5
Warning fix.
2015-04-09 21:43:42 +01:00
ocornut
14ddb81f7a
AA branch: remove code unnecessary for this branch.
2015-04-09 21:39:56 +01:00
ocornut
39445cf23a
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-04-09 21:38:30 +01:00
ocornut
7ab49f80ca
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
2015-04-09 21:22:06 +01:00
ocornut
4f51b77937
Examples: OpenGL3: Tweaks (argh, github ui)
2015-04-09 21:19:21 +01:00
ocornut
90766141b3
Examples: OpenGL3: Tweaks.
2015-04-09 21:18:43 +01:00
ocornut
37f1715bfa
Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
2015-04-09 21:14:52 +01:00
ocornut
1746b04065
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
2015-04-09 21:05:35 +01:00
ocornut
500a8a0e02
ImDrawList: bits of renaming.
2015-04-09 21:00:45 +01:00
ocornut
4fa3eee84e
Renamed io.MetricsVertices to io.MetricsRenderVertices
2015-04-09 19:47:41 +01:00
ocornut
aa1a96f907
ImDrawList: inline AddVtx() calls for profit in highly debug builds
2015-04-09 18:34:31 +01:00
ocornut
334fba2f56
Spacing
2015-04-09 17:33:17 +01:00
ocornut
707df6c7b7
ImDrawList: internal refactoring toward a following commit for indexed rendering.
2015-04-09 17:32:03 +01:00
ocornut
742808d835
Tweaks.
2015-04-09 17:24:09 +01:00
ocornut
15f82e0deb
Fix rounded frames to follow previous change
2015-04-09 17:20:57 +01:00
ocornut
aa2935968e
Renamed AddArcFast() parameter 'tris' to 'filled'
2015-04-09 16:47:20 +01:00
ocornut
f38cca09cf
Merge branch 'master' of https://github.com/ocornut/imgui
2015-04-09 16:45:21 +01:00
ocornut
0fc1f5b17f
Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
2015-04-09 16:45:14 +01:00
omar
ae1166a783
Merge pull request #191 from Extrawurst/patch-2
...
Fixed unused variable warning.
2015-04-09 15:59:43 +01:00
Stephan Dilly
2bb6e31520
fix unused variable warning by clang
2015-04-09 16:50:54 +02:00
ocornut
200d3482dc
Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16
2015-04-09 00:49:21 +01:00
omar
71cfa264d7
Merge pull request #188 from Extrawurst/patch-1
...
Fix initialising ints with float literals
2015-04-08 22:58:34 +01:00
Stephan Dilly
5ba77928ba
fix initialising ints with float literals
2015-04-08 22:56:25 +02:00
ocornut
13fab08cdb
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-08 20:37:18 +01:00
omar
b9dd7c65ab
Update README.md
2015-04-07 20:09:59 +01:00
ocornut
241ccb46d5
Update README.txt + screenshot
2015-04-07 19:55:32 +01:00
ocornut
3c6257b8b9
Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52)
2015-04-07 14:04:43 +01:00
ocornut
6e99688fa7
Fixed user-facing version of IsItemHovered() ignoring overlapping windows
2015-04-07 14:03:17 +01:00
ocornut
323ae8326e
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-07 13:51:01 +01:00
ocornut
d692286862
Added ShowMetricsWindow()
2015-04-07 13:42:35 +01:00
ocornut
8211081c54
Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing.
2015-04-07 13:37:30 +01:00
ocornut
33ef3992f7
Added IO.MetricsVertices counter
2015-04-07 13:36:11 +01:00
ocornut
d9ff617ff8
Examples: Formatting #187
2015-04-07 12:56:52 +01:00
omar
7c9739c67f
Merge pull request #187 from heroboy/patch-1
...
Examples: DirectX9: Set shaders to NULL to enforce using fixed pipeline.
2015-04-07 12:55:12 +01:00
heroboy
e09e2cbd28
set pixel shader and vertex shader to NULL
...
Previous graphic render may use shaders,so set pixel shader and vertex shader to NULL to force use fixed pipeline.
2015-04-07 19:36:58 +08:00
ocornut
6e4d3dac1a
Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc
2015-04-07 11:54:53 +01:00
omar
a8a5ba9d1e
Update README.txt
2015-04-07 11:15:18 +01:00
omar
46769406dc
Update README.txt
2015-04-07 10:59:49 +01:00
ocornut
c38c54af52
Clicking on void loses keyboard-focus so application can use TAB back
2015-04-06 11:25:07 +01:00
ocornut
fe64da6197
Allow SetWindowFocus(NULL) to remove focus
2015-04-06 11:19:31 +01:00
ocornut
73e2d56acc
Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
2015-04-06 10:45:10 +01:00
ocornut
f5310a2f2d
Comments
2015-04-04 19:03:39 +01:00
ocornut
28a45877aa
DragFloat() comment examples, not ready for prime-time #180
2015-04-03 16:21:24 +01:00
ocornut
c93f34238e
DragFloat() examples #180
2015-04-03 15:18:12 +01:00
ocornut
962aa4c396
DragFloat() double-clicking turns into an input box (along with Ctrl+clicking) #180
2015-04-03 15:15:12 +01:00
ocornut
916a8955ec
DragFloat(): passing min>=max (e.g. 0.0f) for range makes the drag unbound #180 , removed extra APIs
2015-04-03 15:13:59 +01:00
ocornut
61d886e14b
SliderFloat() removed support for unbound/infinite slider, inconsistent. Use InputFloat()/DragFloat()
2015-04-03 15:10:07 +01:00
Dale Kim
4b7be31197
Fixed modifier key state setting in GLFW callbacks.
2015-04-03 09:01:48 -05:00
ocornut
aac99819d6
Selectable() render into AutoFitPadding but do not extend it, fixing small visual gap
...
Followup 2e26196aba / #1
2015-04-03 14:40:15 +01:00
ocornut
f3967f1183
Combo() adding frame padding inside the combo box.
2015-04-03 14:32:46 +01:00
ocornut
dc52938627
InputInt2(), InputInt3(), InputInt4(): fixed label vertical alignment
2015-04-03 14:22:00 +01:00
ocornut
f7e35ce120
ShowTestWindow() renamed sliders examples to say "slider"
2015-04-03 14:20:04 +01:00
ocornut
1247ce251f
Added DragFloat(), DragInt() work in progress #180
2015-04-03 14:07:52 +01:00
ocornut
d25578efd8
Examples: initializing float + missing comment.
2015-04-03 12:11:41 +01:00
ocornut
6aed651f77
ColorEdit4(): tweak code to be a little less ugly (still not a beauty contest winner..)
2015-04-03 11:49:02 +01:00
ocornut
2d157d3af0
ColorEdit4(): hide components prefix if there's no space for them.
2015-04-03 11:25:44 +01:00
ocornut
e6792f84d4
Comments and organization of imgui.h
2015-04-03 10:22:18 +01:00
ocornut
153db91917
Slider: don't call RenderText() on empty label.
2015-04-02 22:39:37 +01:00
ocornut
74f2e53b3b
Slider: fix in the unlikely case that style.GrabMinSize is larger than a slider.
2015-04-02 22:38:37 +01:00
ocornut
31fd72bde1
Internal renaming
2015-04-02 21:21:35 +01:00
ocornut
503b8c20de
Delete font clear pointer in ImGui state to get a clear crasah instead of a dangling pointer. #181
2015-04-02 17:48:22 +01:00
ocornut
b61b311772
Fixed Begin() returning true on collapsed windows that loaded settings #176
2015-04-02 10:56:59 +01:00
ocornut
e03d2b2900
ImVec2/ImVec4 no-parameters constructs init to 0.0f. Saner. Couldn't measure perf differences in a simple stress test compiled in Debug mode
2015-04-01 15:57:09 +01:00
omar
fc1b0b090c
Update README.md
...
Coverity badge
2015-04-01 15:26:36 +01:00
ocornut
a4cf50affe
Fix uninitialized fields - MouseCursor set by first call to NewFrame()
2015-04-01 15:08:42 +01:00
ocornut
c0699958ce
Fix for Coverity static analysis
2015-04-01 15:05:06 +01:00
ocornut
eb3e640fa6
Fixed style.DisplaySafeAreaPadding handling from being applied on window that never were auto-fit
2015-03-31 00:41:15 +01:00
ocornut
468fcd7b30
Fixed mouse wheel scrolling (broken 2 commits ago 9d16b85ed2)
2015-03-31 00:15:23 +01:00
ocornut
6ba7a74191
AA branch: fix.
2015-03-30 23:57:29 +01:00
ocornut
bb385fabd4
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-30 23:55:40 +01:00
ocornut
0a31531f44
Warning fix in demo code
2015-03-30 21:16:24 +01:00
ocornut
9d16b85ed2
Caching current Font, FontSize into state for quicker/simpler access.
2015-03-29 19:45:03 +01:00
ocornut
e16f2e898a
Version number 1.38 WIP
2015-03-29 10:09:14 +01:00
ocornut
3abfb85613
Comments on font loading, fixed commented out paths and added DroidSans in the list
2015-03-28 11:48:42 +00:00
ocornut
ff35d24bcc
Comments
2015-03-27 19:34:01 +00:00
ocornut
4ee5a792ff
Fixed new collapsed auto-resizing window with saved .ini settings not calculating their initial width #176
2015-03-27 15:18:45 +00:00
ocornut
26991bb2ec
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-03-26 22:09:35 +00:00
ocornut
2e26196aba
Selectable() fixed misuage of GetContentRegionMax().x
2015-03-26 21:13:03 +00:00
ocornut
a1582874d3
Changed new ImDrawList::AddLine() half_thickness to hickness, just in time for release
2015-03-26 20:24:55 +00:00
ocornut
729e524955
Version number 1.37
2015-03-26 20:16:53 +00:00
ocornut
bcd85e7cd6
Auto contents size aware of enforced vertical scrollbar if window is large than display height.
2015-03-26 20:14:15 +00:00
ocornut
e1de4908f6
Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up.
2015-03-26 19:18:06 +00:00
ocornut
4b7818dfc2
Bounding box tests exclude higher bound, so touching items (zero spacing) don't report double hover when cursor is on edge
2015-03-26 19:05:47 +00:00
ocornut
c6112550eb
Added Haddock in the (popup) Aquarium
2015-03-26 19:02:54 +00:00
ocornut
f5ba64d8cd
Sorting of windows for render doesn't do 3 pass stupidly. Made code a little closer to what it should become with a layering system
2015-03-26 18:51:45 +00:00
ocornut
93c9777165
Fix for using tooltips within popup #126 - will need to rewrite the sorting/layering system shortly.
2015-03-26 18:17:55 +00:00
ocornut
a3086f40fe
Renamed internal RenderSortedWindows -> WindowsSortBuffer + cleanup popup closing code
2015-03-26 18:01:40 +00:00
ocornut
fc25d71f84
Refactored duplicated code into an inline function & made more readable
2015-03-26 17:45:11 +00:00
ocornut
a4dc775339
Fixed hovering bug introduced in ac2da570 when popup is inactive #126
2015-03-26 17:35:52 +00:00
ocornut
5fe4ae62cb
Popup: clicking on empty space also close popup #126
2015-03-26 17:24:05 +00:00
ocornut
ac2da570f5
When a popup window is open it inhibit hovering on other windows #126
2015-03-26 17:17:42 +00:00
ocornut
de7552047b
Simplified example
2015-03-26 17:11:14 +00:00
ocornut
91f8eb7b92
Added early version of BeginPopup/EndPopup() #126
2015-03-26 17:09:17 +00:00
ocornut
d3e8e15e41
Added popup demo code (commented out because I expect to make popup menu proper citizens by next version)
2015-03-26 16:45:44 +00:00
ocornut
7e334013a0
Selectable(const char*, bool) version has bool defaulting to false
2015-03-26 16:42:46 +00:00
ocornut
325e292427
Selectable(): not specifying a width default to using max of label width and remaining width
2015-03-26 16:41:52 +00:00
ocornut
3268646180
Fixed clipping rectangle's own clipping #177
2015-03-26 16:28:41 +00:00
ocornut
743c815821
Renamed IsItemHoveredRectOnly -> IsItemHoveredRect (introduced after previous release)
2015-03-26 16:18:01 +00:00
ocornut
8b7668d24f
Avoid negative clipping rectangle when collapsing windows, ImDrawList could still submit data #177
2015-03-26 16:03:30 +00:00
ocornut
b04ee7e040
Added a more convenient three parameters version of Begin() which Flags more accessible.
2015-03-23 22:50:17 +00:00
ocornut
9d4ba2e27d
Using SetNextWindowSize() in examples to encourage its use
2015-03-23 22:45:05 +00:00
ocornut
c9430bb807
Fixed new windows auto-fitting bigger than their .ini saved size
2015-03-22 17:22:39 +00:00
ocornut
e176a8b93f
OCD normalising function comments not ending with a comma
2015-03-22 16:26:48 +00:00
ocornut
b578e86971
Fixed SetWindowPos/SetNextWindowPos affectiving size computation ( #175 )
2015-03-22 16:08:42 +00:00
ocornut
5737a79c8d
Fixed new window from having an incorrect content size on their first frame ( #175 )
2015-03-22 15:58:44 +00:00
ocornut
7e8f1f1062
Collapsed windows run initial auto-fit to resize the title bar #175
...
Maybe have side-effects on window contents? Unsure at this point.
2015-03-22 15:34:41 +00:00
ocornut
ed94edfd8e
Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
2015-03-22 14:14:23 +00:00
omar
136dbdfd95
Merge pull request #174 from adamdmoss/glfwcursor
...
Examples: OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
2015-03-22 14:10:27 +00:00
Adam D. Moss
c1766c95ed
OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
2015-03-22 13:49:36 +00:00
ocornut
efd927e300
ShowTestWindow: missing TreePop() call in Mouse Cursor section.
2015-03-22 00:00:49 +00:00
omar
fde991fbbb
Update README.md
2015-03-21 23:56:23 +00:00
omar
dec73a8a8a
Update README.md - demo binaries
2015-03-21 23:51:57 +00:00
ocornut
99314dad73
Updated FAQ
2015-03-21 23:14:21 +00:00
ocornut
072c57b0ca
Setting io.LogFilename to NULL disable default LogToFile() (part of #175 )
2015-03-21 19:30:46 +00:00
ocornut
85f432dc8d
Commented standard library include with the functions we use. Using ImFormatString in place of sprintf (part of #172 )
2015-03-21 19:27:29 +00:00
ocornut
7c8946b9b7
Hovering a column set the resize <> mouse cursor #155
2015-03-21 17:48:03 +00:00
ocornut
b024ff85f7
Fixed comment
2015-03-21 15:15:16 +00:00
ocornut
dee2790133
Mouse cursor offset tweak #155
2015-03-21 15:12:47 +00:00
ocornut
9363e6c154
Prepacking mouse cursors to save on source code size, generally simpler #155
2015-03-21 15:09:01 +00:00
ocornut
810fcd8bcb
Added mouse cursor types handling + embed mouse cursor data #155
2015-03-21 13:59:19 +00:00
ocornut
ff1040a38d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-21 10:55:31 +00:00
ocornut
7f49ac0407
Disabled -Wmissing-noreturn warning for Clang a bit reluctantly - will put back when removing GetDefaultFontData() #173
2015-03-21 10:14:10 +00:00
ocornut
bae32567c3
Fixed unused parameter warning with empty IME handler #173
2015-03-21 10:04:10 +00:00
ocornut
8f90238e53
Fixed IMGUI_DISABLE_TEST_WINDOWS #169
...
Fixed warning
2015-03-21 10:03:03 +00:00
ocornut
d77082af00
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-21 00:54:31 +00:00
ocornut
92a22ab35f
Shutdown() freeing a few extra vectors so they don't have to freed by destruction #169
2015-03-21 00:41:34 +00:00
ocornut
c0eab2a164
Moved draw list for io.MouseDrawCursor to state ( #169 )
2015-03-21 00:22:36 +00:00
ocornut
c18a409a97
Auto-filling child window feed their content size to parent - hopefully fix more problem than it causes? #170
2015-03-20 23:34:03 +00:00
ocornut
f32d92f842
Merge branch 'mmozeiko-allow-to-disable-test-window'
2015-03-20 22:53:06 +00:00
ocornut
6699ccfd1f
Tweaked IMGUI_DISABLE_TEST_WINDOWS so it doesn't show in ImGui.h
2015-03-20 22:52:32 +00:00
ocornut
5600ef9701
Merge branch 'allow-to-disable-test-window' of https://github.com/mmozeiko/imgui into mmozeiko-allow-to-disable-test-window
2015-03-20 22:50:07 +00:00
ocornut
5f914c9cbe
Comment
2015-03-20 21:06:45 +00:00
ocornut
60f3cfbe98
Fixed MouseDrawCursor feature submitting an empty trailing command in the draw list
...
+ Merged 4 draw calls into one, should be merged at lower level.
2015-03-20 20:50:55 +00:00
unknown
2142181c51
Allow to disable help and test window functionality
2015-03-20 12:08:00 -07:00
ocornut
efeeba99ca
Tweak stb_textedit integration to be lenient if another user are leaking their STB_TEXTEDIT definitions/symbols
2015-03-20 14:03:23 +00:00
ocornut
876a755bac
Removed unnecessary assert (will crash well enough without) + comment
2015-03-20 11:22:26 +00:00
ocornut
4cd438f663
Added IsMouseDragging(), GetMouseDragDelta() given button and lock threshold. added io.MouseDragThreshold setting. ( #167 )
...
Removed GetItemActiveDragDelta()
2015-03-20 11:13:18 +00:00
ocornut
c070314621
Reverted 11025b3160, 129339adb0 it breaks collapsing implicit debug window
2015-03-20 10:54:21 +00:00
ocornut
2d81a73f85
Double-clicking on resize grip doesn't keep grip active if mouse button is kept held.
2015-03-20 10:51:33 +00:00
ocornut
2d29907611
Added GetMouseDragDelta() helper. No unlock threshold yet ( #167 )
2015-03-20 10:49:17 +00:00
ocornut
a71fc8e6a5
Fixed MouseClickedPos not updated on double-click update ( fix #167 )
2015-03-20 10:46:07 +00:00
omar
3b3a32cbd6
Merge pull request #168 from mmozeiko/fixassert
...
Replace assert() with IM_ASSERT in some functions copied from stb.h
2015-03-20 08:37:13 +00:00
Martins Mozeiko
8a553cdcbe
Replace assert with IM_ASSERT in few places.
2015-03-19 19:36:17 -07:00
ocornut
282532a92a
AA Branch: notes.
2015-03-19 17:04:50 +00:00
ocornut
138e292c4b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-03-19 17:01:54 +00:00
ocornut
ff5378bd66
InputText() last active preserve scrolling position. Reset scroll if widget size becomes bigger than contents.
2015-03-19 16:45:37 +00:00
ocornut
d1aca79f4e
InputText() update its width in case of resize initiated programmatically
2015-03-19 16:40:59 +00:00
ocornut
693bd56db2
InputText() removed the odd ~ characters when clipping. Tweaks and fixes of clipping.
2015-03-19 16:04:22 +00:00
ocornut
6e5130ddf4
ShowTestWindow: Added Wdigets Alignment demo under Layout section
2015-03-19 15:10:43 +00:00
ocornut
129339adb0
Removed 'Accessed' flag from ImGuiWindow so GetCurrentWindow() compiles to a simpler accessor
2015-03-19 15:03:10 +00:00
ocornut
11025b3160
Implicit "Debug" window hide itself based on cursor extend instead of the 'Accessed' flag.
2015-03-19 15:01:07 +00:00
ocornut
d953f8d99a
ShowTestWindow: Graph checkbox under the label, also demo using BeginGroup/EndGroup()
2015-03-19 14:49:58 +00:00
ocornut
2f0fb2bc34
IsItemhovered() include label and behave consistently ( #145 )
2015-03-19 14:48:36 +00:00
ocornut
314b87dfaf
InputFloat(): fixed label alignment if total widget width forcefully bigger than space available
2015-03-19 14:15:51 +00:00
omar
c151f35751
Merge pull request #166 from jsimmons/master
...
Remove spurious assert
2015-03-19 11:46:31 +00:00
Josh Simmons
6425b8c1cf
Remove spurious assert
...
Remove nop assert that causes warnings on Clang.
2015-03-19 22:42:17 +11:00
ocornut
2a04c2a7bb
Fix warnings
2015-03-19 09:33:43 +00:00
ocornut
13caf21018
Use fabs() instead of abs() to ensure we use floating point. #164
2015-03-19 09:06:34 +00:00
ocornut
7a2da7cd02
Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens)
2015-03-18 22:35:51 +00:00
ocornut
62e8661a37
Fixed assignment order in Begin() making auto-fit size effectively lag by one frame
...
Also disabling "clamp into view" while windows are auto-fitting
2015-03-18 22:35:50 +00:00
omar
9a6aebeb96
Merge pull request #163 from biller23/patch-1
...
Examples: typo in ImGui_ImplGlFwGL3_KeyCallback() forward-declaration.
2015-03-18 20:26:03 +00:00
biller23
2f4271a2b3
typo ImGui_ImplGlfwGL3_KeyCallback()
2015-03-18 21:02:29 +01:00
ocornut
d45d1d1bca
Documentation tweaks and fixes
2015-03-18 19:00:03 +00:00
ocornut
ed0f0dbe87
ImDrawList::AddText() takes a const ImFont*
2015-03-18 14:58:17 +00:00
omar
4e245f0bfb
Update README.md
...
Link to Synergy sources
2015-03-18 14:06:39 +00:00
ocornut
bc88ed0cb9
Fixed bounding measurement of empty groups ( fix #162 )
2015-03-18 13:21:32 +00:00
ocornut
e14c7e5510
ShowTestWindow(): Added simple dragging widget example.
2015-03-18 13:15:11 +00:00
ocornut
dcaafffe0e
Added CalcItemRectClosestPoint() helper.
2015-03-18 13:07:37 +00:00
ocornut
9f1b407def
ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper.
2015-03-18 12:54:44 +00:00
ocornut
7d26e85b05
IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly().
2015-03-18 12:10:26 +00:00
omar
6f150d8800
Merge pull request #161 from adamdmoss/boxmax
...
GetItemBoxMax: fix obsolete function copy-n-paste bug
2015-03-18 11:30:32 +00:00
Adam D. Moss
1de735ba7c
GetItemBoxMax: fix obsolete function copy-n-paste bug
2015-03-18 11:27:37 +00:00
ocornut
e10d648a28
Added ImGui::GetItemActiveDragDelta() helpers for drag operations
2015-03-18 10:41:46 +00:00
ocornut
215b0065e3
Version number 1.37 WIP
2015-03-18 10:24:56 +00:00
ocornut
7665b8e5e7
Version number
2015-03-18 09:39:38 +00:00
ocornut
d8026e4d84
Added VSliderInt()
2015-03-18 09:39:09 +00:00
ocornut
2a9a2918f8
ShowTestWindow(): more examples of SameLine() usage
2015-03-18 00:07:21 +00:00
ocornut
9c489a081c
ShowTestWindow(): added vertical sliders examples, tweaks.
2015-03-17 23:58:22 +00:00
ocornut
be83c07957
Changed mentions of 'box' to be 'rect'
2015-03-17 23:41:20 +00:00
ocornut
7e6112bf26
Changed remaining mentions of 'aabb' to be 'rect'
2015-03-17 23:37:17 +00:00
ocornut
302316c6cf
Renamed internal type ImGuiAabb to ImRect
2015-03-17 23:35:12 +00:00
ocornut
7e297945c3
Added BeginGroup() / EndGroup() layout tools ( #160 )
2015-03-17 23:28:57 +00:00
ocornut
da4bfe3289
Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering
2015-03-17 22:36:54 +00:00
ocornut
2e63bf1d16
Button() doesn't add frame padding an explicit size
2015-03-17 22:27:00 +00:00
ocornut
30bc952ac3
Maintaining DC.CursorMaxPos instead of SizeContentsCurrent, simpler, faster and easier to understand.
2015-03-17 22:03:02 +00:00
ocornut
fd7f50d269
Various fixes related to vertical alignment of text after widget of various sizes. Added demos. Toward #160
...
Also fixed LabelText() height.
2015-03-17 20:17:53 +00:00
ocornut
3bd5597cee
Moved text vertical centering out of ItemSize() for the moment, in TextUnformatted() it's only user
2015-03-17 17:17:00 +00:00
ocornut
bbaf7e2eee
Internal tweaks
2015-03-17 16:40:47 +00:00
ocornut
fe2809fecc
Changed default Border and Column border colors to be most subtle, less MS-DOS
2015-03-17 16:16:15 +00:00
ocornut
7e00a41f1b
Speculative warning fix
2015-03-16 18:04:51 +00:00
ocornut
cb285c4d35
Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
2015-03-16 11:53:36 +00:00
ocornut
04358c301e
Removed extraneous spaces
2015-03-16 11:49:18 +00:00
omar
d4c0ecea0e
Merge pull request #159 from adamdmoss/master
...
Examples: OpenGL: if content window doesn't have focus, tell ImGui we don't have a mouse position.
2015-03-16 11:46:29 +00:00
Adam D. Moss
f2ff88b03a
opengl3+opengl example: if content window doesn't have focus, tell ImGui we don't have a mouse position. e.g. avoids tooltips popping up in imgui app when you're interacting with a different app window that overlaps it.
2015-03-16 10:47:14 +00:00
ocornut
ea720963cf
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-16 10:21:25 +00:00
ocornut
d3e444dfd9
Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code.
2015-03-16 10:02:10 +00:00
ocornut
f4970d0e00
Moved static buffers into state
...
No recursion in any of those functions. Tho keeping a lock api may be
preferable?
2015-03-16 09:54:28 +00:00
ocornut
733eedc477
Moved static buffer into state
2015-03-16 09:45:32 +00:00
ocornut
d08ce58876
TreeNodeV() early out if SkipItems is set (avoid formatting string only to be discarded later)
2015-03-16 00:46:03 +00:00
ocornut
0fc9168439
Added InputInt2(), InputInt3(), InputInt4()
2015-03-15 11:30:00 +00:00
ocornut
9c6c8a1ab9
ShowTestWindow() using Unindent() / Indent() instead of an explicit TreePop
2015-03-15 11:21:59 +00:00
ocornut
44826972c0
Added Indent(), Unindent()
2015-03-15 11:19:10 +00:00
ocornut
edde703f8f
Renamed style.TreeNodeSpacing to style.IndentSpacing, ImGuiStyleVar_TreeNodeSpacing to ImGuiStyleVar_IndentSpacing
2015-03-15 11:10:48 +00:00
ocornut
304d19a0d8
ShowTestWindow() added multi-components sliders in a sub-node
...
+ right align all widgets
2015-03-15 11:03:55 +00:00
ocornut
b443c7ebe9
Tweak VSliderFloat()
...
Not really happy about them
2015-03-15 10:38:19 +00:00
ocornut
1ac4f33736
Added VSliderFloat()
2015-03-15 01:58:14 +00:00
ocornut
7019cb10f7
"behaviour" -> "behavior" to behave like the greatest number
2015-03-15 01:48:59 +00:00
ocornut
c1547dd79e
Internal SliderBehaviour() function now supports vertical sliders
2015-03-15 01:47:12 +00:00
ocornut
ce8150ce69
Slider fix hovering bounding test excluding padding between outer frame and grab
2015-03-15 01:36:29 +00:00
ocornut
6da83cd5b7
Plot: size provided to PlotHistogram(), PlotLines() include the padding (sorry users).
2015-03-15 01:27:37 +00:00
ocornut
98eeeab025
Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar()
2015-03-15 01:23:56 +00:00
ocornut
1ef789bb68
Slider code tweaks, split into a SliderBehaviour() function
2015-03-14 23:55:07 +00:00
ocornut
ce87c69c38
Passing ImGuiID by copy (32-bits)
2015-03-14 23:44:32 +00:00
ocornut
93befadc0b
Slider code tweaks
2015-03-14 23:33:12 +00:00
ocornut
06fbeed41a
Examples: Fixed Makefile
2015-03-14 11:29:09 +00:00
ocornut
55edd522c2
Examples: Fixed Makefile
2015-03-14 11:24:53 +00:00
ocornut
e97d02a294
Examples: Fixed Clang warnings in DirectX examples
2015-03-14 10:49:26 +00:00
ocornut
7c9bd71512
Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
2015-03-14 10:41:42 +00:00
ocornut
2b0acc128c
Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples
2015-03-14 10:32:29 +00:00
ocornut
60591dd7c6
Fixed warning and split bit of SliderFloat() into a private ParseFormat() function
2015-03-14 10:30:07 +00:00
ocornut
8e0f04638d
Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK
2015-03-14 10:24:35 +00:00
ocornut
e2c4ba21bc
Examples: Added 64-bit projects for MSVC
2015-03-14 10:09:53 +00:00
ocornut
ef957b7878
Examples: Moved GLFW/GL3W to a common libs/ folder
2015-03-14 10:04:30 +00:00
ocornut
834085c90c
Examples: Updated to GLFW 3.1
2015-03-14 10:00:11 +00:00
ocornut
72855becab
Slider code syntax tweaks
2015-03-14 09:36:15 +00:00
ocornut
eff466d77d
Fixed parsing of decimal precision back from format string when using %%
2015-03-13 13:38:58 +00:00
ocornut
110d96034b
SliderFloat() fast-path when power=1.0f (no powf() calls) also makes code easier to read
2015-03-13 13:28:30 +00:00
ocornut
aaca73de15
Refactor SliderFloat() internals into a helper SliderFloatAsInputText() + some comments
2015-03-13 13:23:03 +00:00
ocornut
4d78c5c9ab
Comments and reduced ImGuiTextEditState.InitialText[] to 3 KB (assuming average use case of UTF-8 uses 3 bytes charracters)
2015-03-13 13:15:01 +00:00
ocornut
ceb4da2038
Comments
2015-03-13 13:04:10 +00:00
ocornut
55093ea8fe
Separator() logs itself as text
2015-03-13 12:44:04 +00:00
ocornut
153454a0fb
Example console keeps focus on input box at all times
2015-03-13 12:28:23 +00:00
ocornut
1c1a55f6b1
Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused()
2015-03-13 12:25:43 +00:00
ocornut
e2734d23ef
Child window don't take focus when they first appear (focus left to parent)
2015-03-13 11:16:11 +00:00
ocornut
0911526424
Added io.KeyAlt + support in examples apps
...
Currently unused but supported by sample so that more people will have
it set up when menus needs them
2015-03-13 09:49:38 +00:00
ocornut
58dc3f97c5
WIP marker in uppercase.. ( #127 )
2015-03-11 16:45:58 +00:00
ocornut
5d1c381509
Update version number, added IMGUI_VERSION, ImGui::GetVersion() ( #127 )
2015-03-11 16:44:54 +00:00
ocornut
4b1a18c2c9
Fixed more warnings from @bkaradzic
2015-03-09 18:36:03 +00:00
ocornut
dac9266f6f
Fixed warnings
2015-03-09 18:26:48 +00:00
ocornut
378eee490b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-09 18:06:39 +00:00
ocornut
d440a13b7e
Version number
2015-03-09 17:30:22 +00:00
ocornut
d5b7b8398f
Examples: reference implementations honors drawlist user callbacks.
2015-03-09 15:26:58 +00:00
ocornut
db5fc8a265
Examples: README direct the user to the opengl_example
2015-03-09 15:09:24 +00:00
ocornut
5879f3f5ac
Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
2015-03-09 15:02:22 +00:00
ocornut
f9c833b4a5
Examples: DirectX9 example cleanup to match DirectX11 structure.
2015-03-09 14:55:46 +00:00
ocornut
66a5837ba8
Examples: DirectX11 example application handles window resizing.
2015-03-09 14:51:10 +00:00
ocornut
866fa95aaa
Examples: DirectX9 example application handle window resizing.
2015-03-09 14:13:29 +00:00
ocornut
25765e4bfc
Examples: Fixed readme file.
2015-03-09 13:49:52 +00:00
ocornut
b4165c43ff
Examples: Refactored directx11_example to be easier to copy & paste into user application.
2015-03-09 13:45:23 +00:00
ocornut
567184dc9f
Examples: Clang warning fix.
2015-03-09 13:38:23 +00:00
ocornut
3f86554457
Examples: Makefile fixes.
2015-03-09 13:22:32 +00:00
ocornut
2dd92e3eed
Examples: Clang/Linux warning fixes.
2015-03-09 13:08:27 +00:00
ocornut
a3f3793cb6
Examples: Tweaks.
2015-03-09 13:05:18 +00:00
ocornut
7397425097
Examples: Refactored directx9_example to be eaasier to copy & paste into user application.
2015-03-09 13:03:46 +00:00
ocornut
b87ec205a9
Examples: shallow tweaks to match upcoming other examples.
2015-03-09 13:02:32 +00:00
ocornut
b227b0f8cd
Examples: Rename globals again
2015-03-09 12:16:29 +00:00
ocornut
4f27bd6ed3
Examples: Moved gl3w to opengl3_example directory + fixed msvc project paths
2015-03-09 12:11:24 +00:00
ocornut
4da432bd7b
Examples: Makefile
2015-03-09 12:03:09 +00:00
ocornut
99ed567577
Examples: Rename global to be more consistent
2015-03-09 12:02:34 +00:00
ocornut
d829852391
Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
2015-03-09 11:59:23 +00:00
ocornut
545a57d253
Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.
...
Other examples will follow.
2015-03-09 11:25:15 +00:00
ocornut
91b4b8a0fc
InputText() handles buffer limit correctly for multi-byte UTF-8 characters ( fix #158 )
...
We now maintain the buffer len for both UTF-8 and wchar
2015-03-08 20:21:19 +00:00
ocornut
6cd3ed58ce
Fixed UTF-8 decoding errors leading into infnite loops ( #158 )
2015-03-08 17:55:56 +00:00
ocornut
0eeb6228b9
Default clipboard handlers for Windows handle UTF-8 (the glfw ones already did that)
2015-03-08 17:23:24 +00:00
ocornut
6e12d31417
Scrollbar: moved from Begin() into its own Scrollbar() function + tidying up
2015-03-08 16:37:03 +00:00
ocornut
f021080851
Scrollbar: Clicking inside the grab box doesn't modify scroll. Subsequent movement always relative. ( #150 ).
...
Big change, rather thoroughly tested but hope I didn't break something.
2015-03-08 16:24:11 +00:00
ocornut
32312e538e
Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing.
2015-03-08 15:03:55 +00:00
ocornut
afc23a5617
Tidying up & Chinese glyph range includes missing punctuation.
2015-03-08 13:28:44 +00:00
ocornut
79ddddd910
Merge branch 'master' of https://github.com/ocornut/imgui
2015-03-08 13:26:14 +00:00
omar
830d9f4183
Merge pull request #157 from usagi/master
...
Fix the Japanese glyph range; include Punctuations
2015-03-08 13:26:02 +00:00
Usagi Ito
c9bfd71e1a
Fix the Japanese glyph range; include Punctuations
...
ref. #156 https://github.com/ocornut/imgui/issues/156
2015-03-08 22:23:52 +09:00
ocornut
a579d6f521
Scrollbar tidying up variable names
2015-03-08 12:39:50 +00:00
ocornut
d251204564
ShowTestWindow: fixed "undo" button of custom rendering applet + default size
2015-03-08 12:09:57 +00:00
ocornut
2af8e0238c
Added GetScrollPosY(), GetScrollMaxY() (mentioned in #150 )
2015-03-08 12:04:38 +00:00
ocornut
a5daea9408
Added style.GrabSizeMin
2015-03-08 11:43:57 +00:00
ocornut
849c72c5c3
Forward declare struct in imgui.cpp. Removed two forward declarations leaking in imgui.h
2015-03-08 11:32:39 +00:00
ocornut
ede45389f4
Scrollbar grab have a minimum size (mentioned in #150 )
2015-03-08 11:24:02 +00:00
ocornut
e843539aab
ShowTestWindow: example apps showing even if main window is collaposed.
2015-03-08 10:38:13 +00:00
ocornut
92c35e2772
Rename ImCrc32() -> ImHash()
2015-03-07 23:53:03 +00:00
ocornut
a691a245b7
GetID() doesn't need to account for empty IDStack
2015-03-07 23:52:26 +00:00
ocornut
62c900606d
Fixed .ini saving for windows using ### marker. FindWindowSettings() uses ID compares ( #107 )
2015-03-07 23:35:36 +00:00
ocornut
f9473b807b
Fixed comments
2015-03-07 22:49:16 +00:00
ocornut
3c225bbf88
Fixed typo in comments
2015-03-07 22:24:45 +00:00
ocornut
45a35c24c8
ShowTestWindow(): Added "Manipulating Window Title" example.
2015-03-07 22:20:34 +00:00
ocornut
a8c58c7a35
Minor tweaks.
2015-03-07 22:01:06 +00:00
ocornut
fbbde3a7c0
Updated documentation, better FAQ on ids and usage of "##" and "###" ( #107 )
2015-03-07 21:54:46 +00:00
ocornut
81a742bf54
Added "###" syntax to specify label that isn't part of the hashed ID ( #107 )
2015-03-07 21:53:33 +00:00
ocornut
3cac434737
Minor FindTextDisplayEnd() optimisation
2015-03-07 19:36:18 +00:00
ocornut
e01500f046
Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154
2015-03-07 12:18:01 +00:00
ocornut
6db6c0c8c0
Collapse triangle uses text color (not border color)
2015-03-07 00:35:47 +00:00
ocornut
8dd3f854fe
AA branch: fixed columns separators.
2015-03-07 00:32:52 +00:00
ocornut
470a8499fe
AA branch: fixed input cursor.
2015-03-07 00:28:10 +00:00
ocornut
af1f41dc6a
AA branch: disabled border shadow by default.
2015-03-07 00:26:53 +00:00
ocornut
f5c2f8c60d
AA branch: fixed separators, borders, input cursor. - not really sure about this.
2015-03-07 00:24:21 +00:00
ocornut
cf1554ebb5
AA branch: fixed frame rounding clamping glitch.
2015-03-07 00:06:48 +00:00
ocornut
2b032004a9
AA branch: Fixed resize grip to scale better with non-default window rounding settings.
2015-03-07 00:01:02 +00:00
ocornut
d69df3065f
AA primitives: using a single vector for storage and accessing via raw pointers.
2015-03-06 23:47:26 +00:00
ocornut
8ca3dc8e41
Merge: First pass on AA rendered primitives from https://github.com/memononen/imgui
2015-03-06 23:39:38 +00:00
ocornut
1f272785f1
ShowTestWindow() minor tweak
2015-03-06 22:43:42 +00:00
ocornut
4ab2db73e5
Fixed ListBox() label not included in declared size ( fix #151 ), fixed ListBoxHeader() incorrect handling of SkipItems, Added Exemple
2015-03-06 22:40:21 +00:00
ocornut
eaab61f08b
Fixed using IsItemHovered() after EndChild() ( #151 )
2015-03-06 22:05:01 +00:00
ocornut
9c486ce4f4
Minor tidying up (more consistently using 'label_size' as a variable name)
2015-03-06 21:58:12 +00:00
ocornut
bf88d6a329
Minor tweak
2015-03-06 21:52:48 +00:00
ocornut
be9fe9489c
Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP
...
Fixes pressing Enter in IME being caught by application right after
validating an IME input.
2015-03-06 21:39:55 +00:00
omar
315e9941f0
Update README.md
2015-03-06 21:14:40 +00:00
ocornut
e269125c3a
Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
...
User need to set io.ImeWindowHandle
2015-03-06 21:11:14 +00:00
ocornut
0ffd99d319
Font: fix for fallback character width.
2015-03-06 19:17:20 +00:00
ocornut
386cfada83
Examples: Windows examples don't link with imm32.lib by default.
2015-03-06 18:19:21 +00:00
ocornut
b361c44ef4
Handle double-width space (0x3000) in various places, for Japanese users.
2015-03-06 17:51:25 +00:00
ocornut
8691c5ca42
Version number + commented failing test case
2015-03-03 15:52:56 +00:00
ocornut
cfe6dac5a3
Fixed Combo() label not included in declared size ( fix #149 , relate to #145 )
2015-03-02 16:04:36 +00:00
ocornut
f4458f7571
Version number
2015-03-02 10:10:46 +00:00
ocornut
0faf0e6948
FindWindowByName() comparing hashes.
2015-03-02 10:04:35 +00:00
omar
4cdcbbff8c
Merge pull request #148 from Roflraging/master
...
Added missing implementation for ImGui::GetWindowCollapsed().
2015-03-01 20:05:20 +00:00
Dale Kim
85c71170af
Defined bool ImGui::GetWindowCollapsed().
2015-02-28 14:47:59 -06:00
ocornut
f18febca11
window->RootWindow persist across frames. Fix calling SetWindowFocus(const char* name) on a child window (last fix for #147 )
2015-02-28 10:29:00 +00:00
ocornut
4535644fcb
Clicking on empty space in a child window set keyboard focus on the child window and move parent to front ( #147 )
2015-02-28 10:25:04 +00:00
ocornut
9b6fa29022
Clicking on a widget in a child window focus the parent window ( #147 )
...
However SetWindowFocus() called on a child window prior to calling
Begin() on said child won;'t work yet.
2015-02-28 09:54:14 +00:00
ocornut
b911f96a56
Examples: Speculative Makefile fix. I should get a Linux box instead on relying on Jenkins, this is pretty embarrassing.
2015-02-27 11:19:50 +00:00
ocornut
dc7cdb3025
Examples: Fix Makefile
2015-02-27 11:07:23 +00:00
ocornut
6fecf90e32
Unused variables fixes.
2015-02-27 11:01:34 +00:00
ocornut
5aaf0cd2dc
Examples: Fix OpenGL3 example Makefile
2015-02-27 11:00:31 +00:00
ocornut
3ed38f3313
Replaced dependency on glew (inc. prebuilt one for Windows) by gl3w in source form
...
Expecting something to break now.
2015-02-27 10:53:17 +00:00
ocornut
00270b837f
Examples: Desperate attempts removing link warnings under Windows. Screw standard librairies.
2015-02-27 10:14:20 +00:00
ocornut
37d8d5c5be
Examples: OpenGL2 example doesn't need Glew
2015-02-27 10:05:06 +00:00
ocornut
40b04a3701
Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
2015-02-27 09:51:11 +00:00
ocornut
2177b11682
Added SetNextTreeNodeOpened() with optional condition flag in replacement of OpenNextNode()
2015-02-27 09:38:22 +00:00
ocornut
ea17240b96
Spacing
2015-02-27 09:16:12 +00:00
ocornut
d369e6b333
Fix
2015-02-27 09:13:23 +00:00
ocornut
ebe363c951
Added SetWindowPos(), SetWindowSize(), SetWindowCollaposed() given a wnidow name.
2015-02-27 09:07:25 +00:00
ocornut
6927d5872e
Merge branch 'master' of https://github.com/ocornut/imgui
2015-02-27 09:01:20 +00:00
ocornut
6d89285f59
Added SetWindowFocus(), SetWindowFocus(const char*), SetNextWindowFocus() ( #146 )
2015-02-27 09:01:12 +00:00
omar
0ece471a71
Update README.md
2015-02-26 19:15:04 +00:00
omar
1d7b0084cb
Update README.md
2015-02-26 19:14:37 +00:00
omar
819c114c34
Update README.md
2015-02-26 19:13:32 +00:00
ocornut
7591252607
Web: Japanese shot
2015-02-26 19:10:53 +00:00
ocornut
037ec09ffe
Fixed unpackaging of Japanese glyphs ranges
2015-02-26 19:06:54 +00:00
ocornut
168a811d11
Added codepoint U+3000 (Ideographic space) and Katakana Phonetic Extensions to GetGlyphRangesChinese/GetGlyphRangesJapanese
2015-02-26 19:00:39 +00:00
ocornut
441679d9d4
Fixed GetGlyphRangesJapanese() actually missing Katakanas glyphs.
2015-02-26 18:51:51 +00:00
ocornut
fe48562171
Comments for IMGUI_API
2015-02-25 23:10:17 +00:00
ocornut
8bcf2f25f2
Fixed IsItemHovered() behaving differently on Combo() (pointed out by #145 )
2015-02-25 12:28:28 +00:00
ocornut
3220471237
ColumnOffsets honor SetStateStorage() modifications
2015-02-24 23:29:15 +00:00
ocornut
9c4972ee9d
Examples: msvc: output .exe in project directory (not in solution directory).
2015-02-24 10:06:13 +00:00
ocornut
fc322fde0f
Examples: added README file
2015-02-24 09:59:56 +00:00
ocornut
546460cd26
Examples: Removed unused file
2015-02-24 09:49:26 +00:00
ocornut
c2a68bb413
Made some internal parameters names more consistent
2015-02-23 21:02:04 +00:00
ocornut
c51be42f28
Added Bullet() + usage examples
2015-02-23 20:59:22 +00:00
ocornut
0df8ff6931
Version number
2015-02-23 20:52:33 +00:00
omar
fd6d6692cf
Merge pull request #142 from Roflraging/master
...
Fix SetColumnOffset() subtracting a bool value instead of scrollbar width
2015-02-23 20:46:19 +00:00
Dale Kim
72d10d3baa
Fix SetColumnOffset() subtracting a bool value instead of scrollbar width.
2015-02-23 13:36:40 -06:00
ocornut
3f4924ee2b
Merge branch 'master' of https://github.com/ocornut/imgui
2015-02-22 18:16:29 +00:00
ocornut
e022e5cff6
Version number 1.33
2015-02-22 18:16:25 +00:00
omar
99ceadbf31
Update README.md
2015-02-22 17:55:45 +00:00
ocornut
cb3c1da77a
GetColumnOffset() / SetColumnOffset() fixes. (cf #125 )
...
Actually ignore window padding, and don't subtract
window->DC.ColumnsStartX like older version did.
2015-02-22 17:02:17 +00:00
ocornut
18a9c799aa
Tweaking Columns() examples.
2015-02-22 16:45:55 +00:00
ocornut
358d41ba8e
GetColumnOffset() / SetColumnOffset() takes account of window padding properly (cf. #125 )
2015-02-22 16:27:34 +00:00
ocornut
b9457a2c02
Reworked Columns() examples.
2015-02-22 16:26:37 +00:00
ocornut
5b59f228ed
Separator() within column correctly vertical offset all columns content (pointed out in #125 )
2015-02-22 14:43:52 +00:00
ocornut
2e9dea0619
Removed extraneous (1,1) padding on child window (pointed out in #125 )
2015-02-22 14:34:34 +00:00
ocornut
19079a58d9
Merge branch 'master' of https://github.com/ocornut/imgui
2015-02-22 13:45:15 +00:00
ocornut
0d63e0ce60
Examples: DirectX examples applications all have a Console for debugging.
2015-02-22 13:45:07 +00:00
omar
c060463981
Update README.me ( fix #139 )
2015-02-22 13:14:43 +00:00
ocornut
bab81318a9
Comments and changed ImVec2 parameters to const ImVec2&
2015-02-22 12:38:46 +00:00
ocornut
4229b7e60b
Fix hovering of child window extending past their parent not taking account of parent clipping rectangle ( Fix #137 )
2015-02-22 12:05:38 +00:00
ocornut
835a46effb
Comments
2015-02-21 16:50:34 +00:00
ocornut
00e281bef1
Version number
2015-02-21 16:39:21 +00:00
ocornut
0a1e67a787
InputText: cursor/selection/undo stack persist when using other widgets and getting back to same ( #134 )
...
Using SetKeyboardFocusHere() in particular on last used text edit revive
the cursor/selection.
2015-02-21 16:30:40 +00:00
ocornut
242a52abba
InputText: minor tidying up.
2015-02-21 16:05:59 +00:00
ocornut
2f9ef13be3
Comments
2015-02-21 13:36:24 +00:00
ocornut
185744e697
Having a InputText() active doesn't steal mouse inputs (relate to #134 )
2015-02-21 12:49:51 +00:00
ocornut
87a3522eb2
Clearing ImGuiState, may switch back to memset(0) but that would put a requirement on user defined ImVector<> to be zero-fill compat
2015-02-21 11:49:12 +00:00
ocornut
4deeaea93c
BeginChild() return a bool analoguous to Begin(). if true you can skip submitting content.
2015-02-21 10:30:05 +00:00
ocornut
8f75cffc09
Columns: doesn't incorrectly bail out when SkipItems is set ( fix #136 )
2015-02-21 10:27:13 +00:00
ocornut
0e159aa22e
BeginChild() variant goes after the main one
2015-02-21 10:10:21 +00:00
ocornut
2ae0e667d0
Child window explicitly inherit collapse state from parent.
2015-02-21 10:02:32 +00:00
ocornut
364d4a1ae6
Merge branch 'master' of https://github.com/ocornut/imgui
2015-02-18 17:17:14 +00:00
ocornut
f2752584e2
Added IsAnyItemActive()
2015-02-18 17:17:06 +00:00
omar
a0e93f410e
Update README.md
2015-02-18 11:47:50 +00:00
ocornut
c1f20f03c5
ImGuiTextFilter() can take a default filter string
2015-02-15 13:50:04 +00:00
ocornut
d58ded3acb
Sliders: value is clipped inside the frame when resizing sliders to be small.
2015-02-13 10:37:03 +00:00
ocornut
9542f52182
InputText: size for allowed input size smaller than necessary by 1 byte.
2015-02-13 09:39:50 +00:00
ocornut
1eef869669
Fix ImFont::BuildLookupTable() potential dangling pointer dereference ( fix #131 )
2015-02-13 08:56:06 +00:00
ocornut
941ef993d9
ImGuITextFilter::Draw() use regular width call.
2015-02-12 19:34:14 +00:00
ocornut
dbdbaec3eb
Version number + comment
2015-02-11 18:34:55 +00:00
ocornut
cb0a4db048
Calculate frame-rate for the user, as a purely luxurious feature
...
..and to reduce sample code size a little.
2015-02-11 18:28:17 +00:00
ocornut
d65e051a07
Minor formatting tweaks, comments
2015-02-11 18:14:39 +00:00
ocornut
a597664672
Added ImGuiInputTextFlags_CharsNoBlank stock filter. Tweak examples.
2015-02-11 18:01:32 +00:00
ocornut
2df4735904
ImGuiInputTextFlags_CallbackCharFilter can return 1 to filter character
2015-02-11 17:55:26 +00:00
ocornut
b73484a66b
Added ImGuiInputTextFlags_CharsUppercase stock filter
2015-02-11 17:46:16 +00:00
ocornut
9473cd491e
InputText(): added ImGuiInputTextFlags_CallbackCharFilter system for filtering/replacement. Callback now passed an "EventFlag" parameter.
2015-02-11 17:39:13 +00:00
ocornut
183a27fd70
CalcTextSize*() more optimisation, fast-path for ascii.
2015-02-11 12:31:04 +00:00
ocornut
ea94835834
CalcTextSize*() tweaks. ImTextCharFromUtf8() return 1 for a zero character now.
2015-02-11 12:23:38 +00:00
ocornut
1da8a52ce7
CalcTextSize*() functions which are often speed bottleneck for large contents are about 25% faster.
...
Caching character advance contiguously, pulled inline, no int->float
conversion.
2015-02-11 12:10:45 +00:00
ocornut
ca2de0b89b
Merge branch 'master' of https://github.com/ocornut/imgui
2015-02-11 11:50:34 +00:00
ocornut
c73d9cfebb
Columns offsets cached to avoid repeated binary search.
2015-02-11 11:50:24 +00:00
omar
5bd7c43a1f
Update README.md
...
Rewording
2015-02-11 00:38:26 +00:00
ocornut
6347179bb0
Added ListBox() ( #129 )
...
Along with ListBoxHeader(), ListBoxFooter() helpers.
2015-02-11 00:21:27 +00:00
ocornut
16925525c6
Selectable: fixed text clipping.
2015-02-10 22:56:28 +00:00
ocornut
c26af284db
Tweaks. Combo default height_in_items is -1 at compilation time to match incoming ListSelect() behavior
2015-02-10 22:48:46 +00:00
ocornut
801ed2c472
Allow passing -0.01f to PushItemWidth() for a perfect right-side alignment + fix CalcItemWidth()
2015-02-10 21:42:21 +00:00
ocornut
e7f51172c1
BeginChildFrame() / EndChildFrame() helpers.
2015-02-10 21:21:23 +00:00
ocornut
1e9f6cce7f
PushItemWidth() can take negative value to right-align items. Renamed GetItemWidth() to CalcItemWidth()
2015-02-10 21:07:26 +00:00
ocornut
5d31430785
Combo() uses Selectable()
2015-02-10 19:51:52 +00:00
ocornut
e5752f54b0
Selectable() variant: fixed missed return value
2015-02-10 19:47:35 +00:00
ocornut
8532da3f52
Added BeginChild() variant that takes an ImGuiID
2015-02-10 19:12:48 +00:00
ocornut
c6d42b1a54
Added Selectable() building block for various list boxes, combo boxes
2015-02-10 19:09:37 +00:00
ocornut
220d920581
Internal ButtonBehaviour() supports a pressed_on_click mode (unused yet) + Renamed internal Combo*getters to Items*getters
2015-02-10 17:45:45 +00:00
ocornut
46dfbb5fa8
Tweak default ImGuiCol_HeaderActive to be less bright
2015-02-10 17:43:58 +00:00
ocornut
da2f5d9c48
Added ImGuiCol_ChildWindowBg, ImGuiStyleVar_ChildWindowRounding for completeness and flexibility
...
Upcoming features using it.
2015-02-10 13:00:22 +00:00
omar
3ea90b1cd9
Update README.md
2015-02-10 12:38:34 +00:00
ocornut
4cb236fe46
ShowTestWindow() demonstrate tree nodes within columns.
2015-02-10 12:37:52 +00:00
ocornut
8e8cb7de3f
Fixed title bar text clipping issue ( fix #128 )
...
+ Update version number
2015-02-09 20:32:00 +00:00
ocornut
734cf47e71
Version number
2015-02-08 17:26:24 +00:00
ocornut
f387c3f22f
Combo box always appear above other child windows of a same parent
2015-02-08 17:21:51 +00:00
ocornut
c907108c23
SetNextWindowPos api before SetWindowPos api in .h + comments
2015-02-08 16:43:20 +00:00
ocornut
b5e7648e24
Title bar text uses cpu-clipping + comments
2015-02-08 16:39:34 +00:00
ocornut
f84166dda9
Use cpu-side clipping instead of a new draw call for isolated label-clipped-by-frame cases.
2015-02-08 16:32:51 +00:00
ocornut
cc340e0b81
Split RenderText into RenderTextWrapped for internal uses
...
Different text functions with different features (usually orthogonal set
of features)
2015-02-08 15:57:06 +00:00
ocornut
b8cd080cdb
LabelText: value is properly clipped ( fixes #23 )
2015-02-08 15:46:23 +00:00
ocornut
93917e76a6
Combo: value label is properly clipped inside the closed combo frame
2015-02-08 15:39:40 +00:00
ocornut
9596a2b4f1
ShowExampleAppLongText() demonstrate manual clipping.
2015-02-08 14:32:58 +00:00
ocornut
d5d8dedadd
Calling SetCursorPos() automatically extends the contents size
2015-02-08 14:20:00 +00:00
ocornut
9e3f8adfac
Added CalcListClipping() helper.
2015-02-08 13:44:09 +00:00
ocornut
29e0aad739
Renamed GetTextLineSpacing to GetTextLineHeightWithSpacing. Added GetCursorPosX/GetCursorPosY
2015-02-08 13:37:20 +00:00
ocornut
c116dad304
Fixed holdng scrollbar creating a small feedback loop with calculation of contents size
2015-02-08 13:29:55 +00:00
omar
2bce6bf085
Merge pull request #121 from thevaber/master
...
Added tint_col parameter to ImageButton
2015-02-04 23:18:57 +01:00
Václav Patejdl
d135d91e27
Added tint_col parameter to ImageButton
2015-02-04 19:19:43 +01:00
ocornut
209ab823d6
Cleanup of previous merge. Moved rarely used Get/Set InternalState functions to the bottom of the list to avoid being misleadnig.
2015-02-04 09:43:11 +01:00
ocornut
bab66cc490
Merge branch 'jtilander-master'
2015-02-04 09:30:53 +01:00
ocornut
e36fad65dd
Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
...
Conflicts:
imgui.cpp
2015-02-04 09:30:03 +01:00
ocornut
4e33787c2f
Comments
2015-02-04 09:01:00 +01:00
ocornut
311c0ca9e5
If mouse was first clicked outside of ImGui bounds we also cancel out hovering.
2015-02-03 10:35:43 +00:00
ocornut
c6de9502f8
Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window
2015-02-03 09:56:19 +00:00
ocornut
94c7eddb17
Comments
2015-02-02 19:50:28 +00:00
ocornut
5df28b101d
Added ImGuiWindowFlags_NoCollapse flag
2015-02-02 09:49:12 +00:00
ocornut
4169d2c8db
Fixed more pedantic warnings
2015-02-02 09:06:51 +00:00
ocornut
0a6577a6df
Fixed warnings
2015-02-02 08:51:45 +00:00
Jim Tilander
087ded0c71
If you install with brew, it also installs links into /usr/local -- and if the version changes having the extra link line here will cause warnings.
2015-02-01 11:02:33 -08:00
Jim Tilander
e6318abcee
Merged changes from original master
2015-02-01 09:09:03 -08:00
ocornut
cc3d41dbab
Version number 1.31 wip
2015-02-01 14:47:21 +00:00
ocornut
85763150e8
Fixed / removed unncessary allocation in Render()
2015-02-01 14:42:09 +00:00
ocornut
bde3f6b90d
Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame()
2015-02-01 14:39:13 +00:00
ocornut
56bf9ea067
Added comment on MemFreeFn as suggested by #119
2015-02-01 14:27:22 +00:00
ocornut
6777145853
InputText: Filtering private Unicode range 0xE000-0xF8FF seems like glfw on OSX uses those?
2015-02-01 14:08:37 +00:00
ocornut
1120f5d720
Merge branch 'master' of https://github.com/ocornut/imgui
2015-02-01 13:07:01 +00:00
ocornut
2dcbe83951
Added DroidSans.ttf font in repository
2015-02-01 13:06:56 +00:00
omar
59d564b322
Update README.md
2015-02-01 10:18:39 +00:00
ocornut
b623f97d9f
Examples: DirectX11: fixed build setting of Release mode.
2015-02-01 09:33:51 +00:00
ocornut
e636e0d2aa
Warning fixes ( fix #118 )
2015-02-01 09:33:51 +00:00
Jim Tilander
3478e3a708
Enabled us to create the internal state on client side allocated memory, e.g. a heap
2015-01-31 21:55:19 -08:00
Jim Tilander
1be4604027
Fixed pointer dereferencing error from merge
2015-01-31 20:35:42 -08:00
Jim Tilander
e9ff2f3d24
Merge branch 'master' of https://github.com/ocornut/imgui
2015-01-31 20:31:41 -08:00
Jim Tilander
8149bace7b
Added a way to replace the internal state pointer so that we can optionally share it between modules (e.g. multiple DLLs)
2015-01-31 20:28:24 -08:00
omar
c300a6e6c4
Update README.md
2015-02-01 00:46:40 +00:00
ocornut
8fb15e3d4b
Web: update picture.
2015-02-01 00:32:56 +00:00
Jim Tilander
98e71afa72
Removed the dependency on realloc functionality
2015-01-31 16:17:39 -08:00
omar
c343e95a0a
Update README.md
2015-02-01 00:15:18 +00:00
ocornut
bcb3753774
Web: Redone one screenshot so it fits in github website without resizing
2015-02-01 00:14:29 +00:00
ocornut
b69f82ee34
New set of pictures!
2015-02-01 00:01:01 +00:00
ocornut
49569a903c
Shortened text
2015-01-31 23:55:47 +00:00
ocornut
2f5c754ef1
InputText: process character input before Return because they may come together (IME batch)
2015-01-31 23:51:00 +00:00
ocornut
35c0842bcf
Examples: DirectX11: fixed handling of unicode character inputs.
2015-01-31 23:26:53 +00:00
ocornut
bebd2da1f1
Wrapping g.ActiveId assignment into a function for easy breakpoint.
2015-01-31 22:57:59 +00:00
ocornut
3f6091b26b
Pedantic grammar fix
2015-01-31 21:27:26 +00:00
ocornut
5834297928
Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size)
...
+ Delete unused code
2015-01-31 21:12:59 +00:00
ocornut
381c7428c1
Examples: changed default background color.
2015-01-31 20:08:43 +00:00
ocornut
a548c9b0d5
Version change
2015-01-31 19:10:04 +00:00
ocornut
ca10c49e27
Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor
2015-01-31 18:55:05 +00:00
ocornut
68bad703ee
ImColor::HSV() helper + color buttons demo
2015-01-31 17:15:07 +00:00
ocornut
8d1583d611
Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha.
2015-01-31 16:44:55 +00:00
ocornut
cb3b69c879
Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32
2015-01-31 16:36:12 +00:00
ocornut
3cf47988b0
Added ImageButton() using regular framing + override framing size ( #73 )
2015-01-31 16:21:12 +00:00
ocornut
2ecc285919
ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget))
2015-01-31 15:24:55 +00:00
ocornut
82666cdc57
ShowTestWindow() early out if window is collapsed. Drawing the 2 columns example differently.
2015-01-31 10:20:37 +00:00
ocornut
4437293b79
Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments
2015-01-31 09:51:25 +00:00
ocornut
64679a0b03
ImFontAtlas::Build() does a sanity memset on glyph rectangles.
2015-01-29 17:44:46 +01:00
ocornut
4c4bbcb451
Examples: fixed custom rendering example canvas size.
2015-01-29 15:04:56 +01:00
omar
229ba6ea18
Update README.md
2015-01-29 15:01:44 +01:00
ocornut
27161d2a98
Added io.DisplayVisibleMin / io.DisplayVisibleMax to allow for virtual / scrolling display.
...
+ remove duplicated "Setup outer clipping rectangle" block in Begin))
2015-01-29 14:20:25 +01:00
ocornut
962ef3924a
Added extra asserts and tweaked code in Begin()
2015-01-29 14:07:20 +01:00
ocornut
07f69966f8
ImDrawList::AddImage() color parameter defaults to white
2015-01-29 13:46:34 +01:00
ocornut
79042a3a3c
GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef
2015-01-29 10:22:32 +01:00
omar
5b180afc4e
Merge pull request #116 from emoon/master
...
Added Set/GetVoidPtr in ImGuiStorage
2015-01-29 10:10:48 +01:00
Daniel Collin
c9c41c3874
Added Set/GetVoidPtr in ImGuiStorage
2015-01-28 21:31:22 +01:00
ocornut
00842d18e4
Speculative GCC warning fix (again)
2015-01-24 11:30:40 +01:00
ocornut
4535f5f899
Fixed some warnings with Clang/GCC
2015-01-24 11:18:31 +01:00
ocornut
638babb0dd
Examples: added simple drawing app example for using ImDrawList and custom drawing
2015-01-23 01:38:04 +01:00
ocornut
32b8ad7381
Fixed mouse aiming within InputText() - broken during 01/18 merge
2015-01-23 00:02:44 +01:00
ocornut
7530f3c985
Added IsItemActive() - replace IsItemFocused()
...
ClipAdvance() --> ItemAdd() - nb: return value is inverted
2015-01-22 23:54:05 +01:00
ocornut
70188c5623
Added comments
2015-01-22 11:03:24 +01:00
ocornut
f1ccd32cb1
stb_truetype: implementation is now static + submitted PR to origin.
2015-01-21 23:45:21 +01:00
ocornut
26174cba85
Added InvisibleButton()
2015-01-21 23:03:25 +01:00
ocornut
dbffbacaf6
Added IMGUI_DISABLE_STB_***_IMPLEMENTATION
2015-01-21 11:59:11 +01:00
ocornut
26f93e6660
IMGUI_STB_NAMESPACE define Stb stuff in a namespace (trying stuff to reduce problems with multiple implementations)
2015-01-21 11:54:23 +01:00
ocornut
9524d76fe8
Documentation
2015-01-20 22:37:18 +01:00
ocornut
942e1ca811
Notes, todo items
2015-01-20 10:37:30 +01:00
ocornut
b24d4d0538
Ignore lists
2015-01-20 01:04:34 +01:00
ocornut
b0eac255ca
Warning fixes for 64-bit architectures
2015-01-20 01:01:25 +01:00
ocornut
53f4fd38e4
Merge branch 'master' of https://github.com/ocornut/imgui
2015-01-18 15:12:47 +00:00
ocornut
56ac857cac
Added stub for obsolete GetDefaultFontData() to help the user upgrading
2015-01-18 15:12:41 +00:00
omar
7ea9253c31
Update README.md
2015-01-18 12:56:59 +00:00
ocornut
a1c0c0e298
stb_truetype.h mod comment
2015-01-18 12:54:35 +00:00
omar
b87f9a19c8
Merge pull request #113 from ocornut/2015-01-truetype
...
Merge - TTF font loading, mulitple fonts, Image support
2015-01-18 12:27:32 +00:00
ocornut
7e2305eb36
Comments
2015-01-18 12:22:17 +00:00
ocornut
46fbff50cf
Documentation
2015-01-18 12:19:49 +00:00
ocornut
bfe894406d
ImFontAtlas: some more optimisations / cleanup.
2015-01-18 12:12:16 +00:00
ocornut
e685e49781
ImFontAtlas: reduced number of temporary allocation when building lots of input ranges
2015-01-18 11:55:58 +00:00
ocornut
edcf2d3bf6
Examples: more comments on loading fonts.
2015-01-18 11:38:14 +00:00
ocornut
8386e4fb7e
Fix handling of NULL GlyphRanges. Asserting on AddFontFromFileTTF() failure.
2015-01-18 11:36:23 +00:00
ocornut
ed23598e49
Font documentation
2015-01-18 11:24:06 +00:00
ocornut
ca81fd3a34
Removing the binary_to_c() comment, link to license for ProggyClean
2015-01-18 11:19:11 +00:00
ocornut
1916a0c78c
Renamed FontAtlas to Fonts. Further cleanup/comments.
2015-01-18 10:46:49 +00:00
ocornut
1f8d209202
Fixed more clang warnings + AddFontFromMemoryTTF() not honoring font_no parameter
2015-01-17 23:21:06 +00:00
ocornut
37dcf58e2f
Fixed clang warnings
2015-01-17 23:13:54 +00:00
ocornut
0dad59b032
Merge remote-tracking branch 'origin/master' into 2015-01-truetype
2015-01-17 22:57:35 +00:00
ocornut
e666920784
ImFont: small optimization to our (incorrect) handling of TAB
...
TAB is still handled as 4-spaces width (which is incorrect)
But CalcTextSize is simplified.
2015-01-17 22:53:54 +00:00
ocornut
5ad9a2f119
Comments on new API
2015-01-17 22:38:10 +00:00
ocornut
2c31599bcc
ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
2015-01-17 22:15:29 +00:00
ocornut
a3e368a477
Fixed alignment of ColorEdit4() label
2015-01-17 17:19:07 +00:00
ocornut
cb9a3235be
Removed PixelCenterOffset, uncesssary
2015-01-17 17:17:18 +00:00
ocornut
ad92018bc0
Fixed lower-right rounded triangle rendering precision.
...
PixelCenterOffset is handled very inconsistently, needs to be fixed.
2015-01-17 17:03:22 +00:00
ocornut
43c8b5e0d2
Examples: DirectX11: use linear sampler to be in sync with other examples.
2015-01-17 16:52:21 +00:00
ocornut
014f88b1fc
Font fixes for horizontal centering within frames
2015-01-17 15:44:25 +00:00
ocornut
edee014ab8
ImDrawList merging commands with same texture
2015-01-17 14:13:08 +00:00
ocornut
3e30ad3802
PushFont/PopFont changes texture at high-level in current draw list - faster
2015-01-17 14:00:43 +00:00
ocornut
7ebd7ef9ac
Added PushFont/PopFont API
2015-01-17 13:40:56 +00:00
ocornut
79d1a9d941
Commenting asserts.
2015-01-17 12:27:27 +00:00
ocornut
97fcee0d0d
Fix usage of multiple Begin/End pair for the same window, handling of move in End() was stealing Active ID
2015-01-16 10:55:49 +00:00
ocornut
ab8d2782c6
Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
...
Conflicts:
imgui.cpp
imgui.h
2015-01-15 18:07:44 +00:00
ocornut
f61e8e6e26
Tooltip always auto-resize. May look into max-over-xx-seconds policy later.
2015-01-15 18:00:10 +00:00
ocornut
2082487366
Allow SetNextWindowPos() to affect tooltips.
2015-01-15 17:47:53 +00:00
ocornut
584c7ffac8
Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos)
2015-01-15 14:41:22 +00:00
ocornut
2d7a2310fd
Collapsing header also honor FrameRounding
2015-01-15 10:29:51 +00:00
ocornut
62ecdd21a5
Examples: Added a color slider for the background color + tweak first example use of button.s
2015-01-15 09:59:18 +00:00
ocornut
02f0dbca37
ColorEdit3: clicking on color square change edit-mode, removing color-edit mode button by default.
2015-01-15 09:49:12 +00:00
ocornut
8ba93d947c
Added FrameRounding setting (default to 0 for now).
2015-01-15 09:14:44 +00:00
ocornut
3c8f010c29
Fixed TooltipBg color not being honored by tooltip + no minimum tooltip size.
2015-01-14 22:10:48 +00:00
ocornut
4f6643cc0c
Fix missing glyph handling in modified stb_truetype.h (ttf branch)
2015-01-14 22:05:13 +00:00
ocornut
188165a063
Fix stupid crash on fallback glyph handling (ttf branch)
2015-01-14 21:59:39 +00:00
ocornut
08b50cce12
TODO list update
2015-01-14 21:58:30 +00:00
ocornut
04eca0c375
TODO list update
2015-01-14 13:43:41 +00:00
ocornut
a372d67f47
Improve memory reserve policy for Clipboard/ImGuiBuffer
2015-01-14 13:04:33 +00:00
ocornut
3a20671802
Fixed logging to clipboard on architectures where va_list are modified by vsnprintf ( fixed #112 )
2015-01-14 13:01:53 +00:00
ocornut
5322224881
Warning fixes for llvm windows 64-bits
2015-01-13 23:19:11 +00:00
ocornut
e2d8c03e1a
Fixed ImGuiTextBuffer::empty() to ignore the enforced zero-terminator
...
+ removed unnecessary destructor
2015-01-13 23:06:55 +00:00
ocornut
f0b493c217
Fixed style.WindowMinSize not honored properly.
2015-01-13 23:05:20 +00:00
ocornut
6c6d1746d4
Fix missing glyph handling in modified stb_truetype.h
2015-01-13 08:56:02 +00:00
ocornut
f061884dea
Typos and comments
2015-01-11 22:22:46 +00:00
ocornut
0f89e06152
Fixed temporary glyph rectangle allocation using size much too big.
2015-01-11 22:03:03 +00:00
ocornut
e5d0d8334f
Tweak default texture width for large amount of characters.
2015-01-11 21:55:21 +00:00
ocornut
d27b295f4c
Documentation on new font / texture get api
2015-01-11 21:24:12 +00:00
ocornut
0f4d74d614
ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font
...
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
2015-01-11 21:06:57 +00:00
ocornut
241e8086fa
Mde it optional to new() io.Font - however it stills needs to be loaded.
2015-01-11 18:27:05 +00:00
ocornut
51df5874a6
Examples' Says "OpenGL2" vs "OpenGL3" in title bar.
2015-01-11 18:03:40 +00:00
ocornut
a09f426b89
TAB to spaces
2015-01-11 17:56:43 +00:00
ocornut
5ca563b5a5
Speculative fix for warnings for GCC/Clang
2015-01-11 17:22:04 +00:00
ocornut
20bb6270bc
Examples: all supports TextureID in renderer, added LoadFontTexture() function.
2015-01-11 17:17:43 +00:00
ocornut
40f7b67ef1
ImDrawList::AddText() allows changing font
2015-01-11 16:46:39 +00:00
ocornut
cc79b85c28
Added first-pass of Image() based on #73 + demo
2015-01-11 16:30:39 +00:00
ocornut
1a6e7f25e0
ImVector: less hoops in back() / front(), more friendly for debugger and unoptimized builds
...
+ fixed typos
2015-01-11 16:25:57 +00:00
ocornut
c1fe6fe14d
Fixed GetStyleColName() not matching the enum strings for 3 values ( #111 )
2015-01-09 17:19:24 +00:00
ocornut
5dff478dc0
Build fix for GCC/Clang, cannot foward declare a static array?
2015-01-09 09:00:53 +00:00
ocornut
2757e3573a
Comments
2015-01-08 23:53:07 +00:00
ocornut
f77490cb2d
Cleanup extra_fonts/ folder
2015-01-08 23:49:17 +00:00
ocornut
b3a208901a
Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
2015-01-08 23:35:01 +00:00
ocornut
dd8a7655f5
Fixed DirectX11 example.
2015-01-08 18:56:47 +00:00
ocornut
b0ea57e518
Version number
2015-01-07 19:07:43 +00:00
ocornut
4260195159
Revert "Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters"
...
Correct but cause problems because many people don't have 1 BPP PNG loaders
This reverts commit 98a38e24ab .
2015-01-07 18:59:44 +00:00
ocornut
26fdf1655c
Fixed leak on shutdown ( fixes #110 ) + possible uninitialized member.
2015-01-07 14:55:35 +00:00
ocornut
c1251d2994
Examples: Fixed warnings for Clang
2015-01-06 17:43:23 +00:00
ocornut
1c657564ac
Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109
2015-01-06 17:35:36 +00:00
Mikko Mononen
fdc8c0722f
Compile fixes
2015-01-06 19:24:57 +02:00
Mikko Mononen
91684a428b
Merge upstream
2015-01-06 19:15:41 +02:00
Mikko Mononen
d9757bb583
First pass on AA rendered primitives
2015-01-06 19:05:24 +02:00
ocornut
98a38e24ab
Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters
2015-01-05 11:13:02 +00:00
ocornut
0505995193
Very minor code/comments tweaks.
2015-01-04 22:29:53 +00:00
ocornut
4905ec46f1
Fixed hovering of child windows / combo boxes that extend beyond the root window limits.
2015-01-04 22:07:37 +00:00
ocornut
3fe669f547
Failure in LogToFile() treated at an error (assert) in the absence of another type of error handling.
2015-01-04 21:37:49 +00:00
ocornut
22c1d7eded
Renamed some color enums
2015-01-04 19:37:24 +00:00
ocornut
39373b563b
Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI
2015-01-04 19:23:36 +00:00
ocornut
97d34271f8
Fix clipboard pasting into an InputText box not filtering the characters according to input box semantic (number, etc.)
2015-01-04 18:47:08 +00:00
ocornut
a5f4108781
Activating widget bring parent window to front
2015-01-04 18:36:33 +00:00
ocornut
3674d30e90
Fixed clicking on Combo box label.
2015-01-04 18:32:15 +00:00
ocornut
2268b098e0
Avoid marking settings as dirty when window is marked unsaved + minor FocusWindow() optimisation
2015-01-04 18:23:30 +00:00
ocornut
4bccc06933
Dragging outside area of a widget while it is active doesn't trigger hover on other widgets.
2015-01-04 18:12:30 +00:00
ocornut
ee49c2288d
Todo items.
2015-01-03 17:38:10 +00:00
ocornut
34664dc28c
InputText() consume input characters immediately ( fixes #105 )
2015-01-03 17:37:39 +00:00
omar
e4f96147de
Update README.md
2014-12-31 15:55:34 +00:00
ocornut
12225abfe2
Version number (fix)
2014-12-31 10:38:36 +00:00
ocornut
505bd1a66d
Fixed text input filtering for character in the 128-255 range.
2014-12-31 09:49:53 +00:00
omar
c9002620c6
Update README.md
2014-12-30 17:13:04 +00:00
ocornut
f8c58fe328
Fix for Clang
2014-12-30 16:55:32 +00:00
ocornut
74ab555558
Examples: Console:: added support for History callbacks + cleanup to be self contained.
2014-12-30 16:49:39 +00:00
ocornut
da5227fa28
Added comment about defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
2014-12-30 15:44:19 +00:00
ocornut
3b028c7ebf
Fixed InputInt() InputFloat() label not declaring their width, breaking SameLine (bug #100 )
...
+ shallow cleanups
2014-12-30 15:38:28 +00:00
ocornut
2d111ccb55
crc32 on strings is performed in one pass - removed the strlen() call.
2014-12-30 15:18:21 +00:00
ocornut
691ca46978
Version number
2014-12-30 15:10:55 +00:00
ocornut
209be54e49
Version number
2014-12-30 12:21:57 +00:00
ocornut
aa750d538d
Style editor: added an Output button to output colors to clipboard/tty
2014-12-30 12:08:33 +00:00
ocornut
929f127d06
Added SliderInt2(), SliderInt3(), SliderInt4() for consistency
2014-12-30 11:54:04 +00:00
ocornut
60b4389ac1
Empty label consistently remove the inner-padding normally preceeding the label.
2014-12-30 11:41:46 +00:00
ocornut
a950df6655
Tightening default style (saving -2 pixels on each axis per widget)
2014-12-30 10:00:00 +00:00
ocornut
409b1ac6b5
Log output \r\n under Windows so files are readable with Notepad
2014-12-29 20:41:27 +00:00
ocornut
036a153cf4
Log depth padding relative to start depth. Tree node and headers looking better when logged to text. Added LogText().
2014-12-29 20:18:52 +00:00
ocornut
886d954e3d
GetStyleColorName -> GetStyleColName for consistency with type name. Removed ImGuiStyleVar_ColumnsMinSpacing
2014-12-29 19:56:01 +00:00
ocornut
39952d2362
Renamed GetTreeStateStorage() to GetStateStorage(). Columns storing floats instead of fixed point integers
2014-12-29 18:17:54 +00:00
ocornut
1b25fa8169
Added LogFinish() to stop logging at an arbitrary point.
2014-12-29 18:13:41 +00:00
ocornut
0796dc0dc1
Minor fix for cases of malformed .ini file (zero-terminating text file like it was before previous commit).
2014-12-29 18:05:22 +00:00
ocornut
8994f2f1e4
Cleanup. Removed unnecessary calls to sqrtf(). Factoring bits into ImLoadFileToMemory(). Added index of static helpers.
2014-12-29 11:23:03 +00:00
ocornut
e2fbbe0274
Factoring bits out of Begin() into a private CreateNewWindow() funciton
...
(Hopefully to ease a bit the merging work for ProDBG)
2014-12-28 17:54:02 +00:00
ocornut
5b7ed5432e
CalcTextSize() default third parameter to false because it almost never makes sense to use it from the outside (may obsolete it)
2014-12-28 16:17:08 +00:00
ocornut
bf3212c681
Taking notes of issues/todo
2014-12-28 16:09:19 +00:00
ocornut
34728394ec
Fixed clipped ImGui::Combo not registering its size properly (was flickering when scrolling with combo on the edge of clipping region)
2014-12-26 12:38:13 +00:00
ocornut
90351298d1
Renamed second parameter to Begin() to 'bool* p_opened' to be more self-explanatory. Added more comments on the use of Begin().
2014-12-22 13:29:39 +00:00
ocornut
69f3d67d18
Preserve windows position on zero-sized display (minimized).
2014-12-22 02:14:31 +00:00
omar
d6c13128b9
Update README.md - tweaks
2014-12-22 02:07:02 +00:00
ocornut
b3febabc30
OpenGL3 example: fix growing of VBO
2014-12-22 01:47:34 +00:00
ocornut
ac29859f70
Support zero-sized display, now sets default as -1,-1 and assert if display size is negative.
2014-12-22 01:45:13 +00:00
ocornut
a3af51fd4e
Added ImGuiStyleVar_WindowRounding enum for PushStyleVar() API
2014-12-19 12:56:00 +00:00
omar
b09c49180f
Update README.md minor fixes
2014-12-14 10:44:43 +00:00
omar
7e868e2842
Cleanup todo list, removed 3 done items + added 1 new
2014-12-11 10:12:52 +00:00
omar
0056ccce26
Version number
2014-12-10 23:40:25 +00:00
omar
486506e37f
Update README.md
2014-12-10 23:39:48 +00:00
omar
e9e0e36f98
New and better Set[Next]Window(Pos|Size|Collapsed) API.
...
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
2014-12-10 19:22:30 +00:00
omar
3399890a84
Added ImGuiWindowFlags_NoSavedSettings flag + Fixed overlay example app.
2014-12-10 17:13:45 +00:00
omar
2a3bff9a82
Comments
2014-12-10 16:56:11 +00:00
omar
09bacfbe18
OpenGL example: allow resizing window.
2014-12-10 15:27:40 +00:00
omar
cca5f473ca
Clarified comment
2014-12-08 17:18:20 +00:00
omar
6523fb263d
OpenGL3 example: fixed mouse handling.
2014-12-08 17:15:08 +00:00
omar
bdb2344db0
ImGuiStorage helper can store float + added functions to get pointer to data. Exposed ImGui::GetId() - may be misleading?
2014-12-08 17:14:54 +00:00
omar
0a0769227d
Added Travis CI build banner.
2014-12-07 10:17:39 +00:00
omar
6252b26af2
Update README.md
2014-12-07 10:15:34 +00:00
ocornut
987188d437
Fix Clang warning with offsetof() macro? Added -Wall in OpenGL 3 example.
2014-12-07 09:58:45 +00:00
ocornut
71e20680db
Setup Travis CI integration with Clang + -Wall in Makefiles
2014-12-07 09:48:01 +00:00
ocornut
bb20065be0
Setup Travis CI integration
...
Getting there!
2014-12-06 23:30:38 +00:00
ocornut
fec067d033
Setup Travis CI integration
...
More libs needed
2014-12-06 23:27:40 +00:00
ocornut
2eb837ea86
Setup Travis CI integration
...
Different PPA source
2014-12-06 23:23:57 +00:00
ocornut
857a4e364c
Setup Travis CI integration
...
Yes please
2014-12-06 23:21:05 +00:00
ocornut
2599849e9c
Setup Travis CI integration
...
Trying again with a PPA for glfw3-dev
2014-12-06 23:17:30 +00:00
ocornut
da1b8f7e46
Setup Travis CI integration
...
Argh.
2014-12-06 23:06:04 +00:00
ocornut
0687af2ce5
Setup Travis CI integration
...
Failing to get glfw3 for ubuntu, trying osx/gcc
2014-12-06 23:01:41 +00:00
ocornut
1d45478637
Setup Travis CI integration
...
Argh.
2014-12-06 21:06:00 +00:00
ocornut
1bfb59174a
Setup Travis CI integration
...
Apt-get update needed..
2014-12-06 21:04:25 +00:00
ocornut
83575a464f
Setup Travis CI integration
...
Forgot sudo. Removing apt-get update, probably works without.
2014-12-06 21:01:00 +00:00
ocornut
3e83de58b5
Setup Travis CI integration
2014-12-06 20:59:14 +00:00
ocornut
2b0d8447e3
Setup Travis CI integration
...
Testing
2014-12-06 20:56:34 +00:00
ocornut
d553cd96b0
Setup Travis CI integration
...
Testing.
2014-12-06 20:50:27 +00:00
ocornut
30ee2fed2b
Merge branch 'master' of https://github.com/ocornut/imgui
2014-12-06 20:43:13 +00:00
ocornut
036ed3ea93
OpenGL3 example: unregistered mouse callback for mouse click-release faster than frame interval.
2014-12-06 20:43:08 +00:00
omar
123691023b
Merge pull request #94 from emoon/master
...
Clang warning fixes
2014-12-06 12:59:22 +00:00
Daniel Collin
317dab5269
Clang warning fixes
2014-12-06 13:49:46 +01:00
ocornut
e43cd6e97f
Added IMGUI_INCLUDE_IMGUI_USER_H
2014-12-05 23:09:43 +00:00
omar
a5cc2e4161
Fixed InputInt() writing to output when it doesn't need to, which break with large int due to int<>float conversions. Added todo note.
2014-12-05 12:34:14 +00:00
omar
6b16424faf
Comments.
2014-12-04 11:54:49 +00:00
omar
d133831909
In-code FAQ: added comment about reading WantCaptureMouse / WantCaptureKeyboard
2014-12-04 11:42:13 +00:00
omar
2e5b81627f
Examples: DirectX11: moved shader to be close to its usage location,
2014-12-03 18:46:13 +00:00
omar
52b5376d9b
Examples: OpenGL3: cleaned up to match features of OpenGL2 example
2014-12-03 18:40:28 +00:00
omar
b02eed3e49
Examples: adding title to the top of each examples. Cleaning up file headers.
2014-12-03 18:29:46 +00:00
omar
90b4ff13fb
Ignore list.
2014-12-03 18:19:48 +00:00
omar
6c9edb6db0
Examples: removed LICENSE file from MSVC project.
2014-12-03 18:19:05 +00:00
omar
860cf578f5
Added ImGuiWindowFlags_NoScrollWithMouse flag.
...
ButtonBehaviour test hovering of CurrentRootWindow (vs CurrentWindow, different for child-windows). This is intentionally meant to fix grabbing the lower-right resize grip when lower-right corner has a child-window, but may be the overall right-er test. Testing out.
2014-12-03 18:17:10 +00:00
omar
e0dc8ac910
Merge pull request #93 from olivierchatry/master
...
Added OpenGL programmable-pipeline example.
2014-12-03 18:15:42 +00:00
Olivier Chatry
2f176033c6
fixed indentation mix, removed some unused code, updated different callback using the example_opengl code.
2014-12-03 19:11:23 +01:00
Olivier Chatry
a8d2bc69ed
added opengl3 sample, mix from @ocornut and @thelinked
2014-12-03 18:37:07 +01:00
omar
63ff0ad0ff
Examples: OpenGL: fix accessing libraries via ProjectDir instead of SolutionDir
2014-12-03 12:00:03 +00:00
omar
d31623061f
ImVector: private -> protected
2014-12-03 11:56:40 +00:00
ocornut
bd762b559c
DirectX11 example: fixed projection matrix offset.
2014-12-01 09:34:17 +00:00
omar
e6b9950645
Update README.md
...
Credits+link for stb_textedit.h
2014-11-30 18:06:52 +00:00
ocornut
b4fd216bd2
DirectX9/DirectX11 example: fixed window initially showing an hourglass cursor.
2014-11-30 18:02:08 +00:00
ocornut
0730ec7577
Example apps: accumulate mouse wheel to accodomate for slow framerate.
2014-11-30 17:41:08 +00:00
ocornut
0e6f288a2f
DirectX11 example: further tweaks/massaging (-15 lines). Syncing example.
2014-11-30 17:26:44 +00:00
ocornut
7f804d3d64
Tab->Spaces :( visual studio can't even be trusted for that, oh thanks.
2014-11-30 16:56:35 +00:00
ocornut
de44af5227
DirectX11 example: closing all handler/resources in Cleanup.
2014-11-30 16:53:33 +00:00
ocornut
0f29cd7a14
Removed Microsoft IME handler in examples, too confusing. Moved to imgui.cpp instruction block.
2014-11-30 15:54:58 +00:00
ocornut
a5a84a9b69
Tab->Spaces :(
2014-11-30 15:53:47 +00:00
ocornut
197b2763fc
Fixed DirectX11 example Release build include
2014-11-30 15:51:42 +00:00
ocornut
df00fa8113
Fixed DirectX11 example to compile with whatever Visual Studio version user has
2014-11-30 15:33:57 +00:00
ocornut
e835ef1d90
Fix from incorrect change left-over in a31e44b99a
2014-11-30 15:19:39 +00:00
ocornut
ae75553ba1
Ignore list for new examples structure
2014-11-30 15:01:08 +00:00
ocornut
2e576de9ca
Fix comments
2014-11-30 15:00:07 +00:00
ocornut
9e16317382
Added DirectX11 example application (code is too long!)
2014-11-30 14:59:21 +00:00
ocornut
b5acb16378
Examples: created single .sln solution for all example projects.
2014-11-30 12:54:27 +00:00
ocornut
38164a410d
ImStrnicmp tweak
2014-11-30 12:31:43 +00:00
ocornut
214c967df8
Example code: warning fix + comments.
2014-11-30 12:28:21 +00:00
omar
31654958f9
Merge pull request #92 from memononen/master
...
Smoother mouse wheel scrolling
2014-11-30 12:25:21 +00:00
ocornut
a31e44b99a
Fixed Clang -Weverything warnings + TODO list entries
2014-11-30 12:21:50 +00:00
Mikko Mononen
54ea495207
Updated example code.
2014-11-30 12:24:27 +02:00
Mikko Mononen
eb789c0288
Smoother scrolling
...
- changed IO.MouseWheel to float, allows smoother scrolling
2014-11-30 12:20:25 +02:00
ocornut
e9aead09cb
Remove unneeded extra parameter from ImFont::FindGlyph()
2014-11-29 00:04:05 +00:00
ocornut
e4a79e9fc8
Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale)
2014-11-29 00:02:46 +00:00
ocornut
e27eddfbd2
Grammar fix + ocd alignment
2014-11-28 23:10:43 +00:00
ocornut
311a2f8328
New version of IMGUI_ONCE_UPON_A_FRAME helper macro
2014-11-28 23:08:45 +00:00
ocornut
df2ad5e899
Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef
2014-11-28 22:38:41 +00:00
ocornut
07a6ba8aaf
Merge branch 'master' of https://github.com/ocornut/imgui
2014-11-28 22:29:07 +00:00
ocornut
16d6561aba
Increased visibility of check box and radio button with smaller size. + comments
2014-11-28 21:53:31 +00:00
omar
abe45e9976
Moved API Breaking Changes section of the documentation above the programmer's FAQ.
2014-11-26 22:27:48 +00:00
omar
c0999495e7
Fixed move-by-word in InputText() - broken 2 days ago, sorry. stb_ expect a define.
2014-11-26 22:19:46 +00:00
omar
b9118750ae
Removed IMGUI_ONCE_UPON_A_FRAME in favor of ImGuiOnceUponAFrame which is supported by all compilers
2014-11-26 22:16:38 +00:00
omar
7f6453ca70
Update README.md
...
Grammar fix
2014-11-25 15:19:05 +00:00
omar
24a9d32531
Update README.md
2014-11-25 15:17:15 +00:00
ocornut
ec4b510775
Minor tidying & comments
2014-11-24 10:02:39 +00:00
ocornut
1484799b18
Console example: fixing losing text selection when using TAB completion with no match
2014-11-23 23:50:23 +00:00
ocornut
895f93f694
Remove unused variables
2014-11-23 23:36:54 +00:00
ocornut
49defcf083
InputText support for completion/history/custom callback + added fancy completion example in the console demo app
...
Unfortunately quite messy because of the UTF-8 <> wchar confusion going
around. Not well tested for UTF-8 compliance with non-Ascii characters.
2014-11-23 23:35:26 +00:00
omar
e78c47961e
Not word-wrapping on apostrophes
2014-11-21 16:35:35 +00:00
omar
8c4fcf1359
Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first.
2014-11-21 16:29:56 +00:00
omar
2322318cac
PopStyleVar() fix. OOPS
2014-11-21 14:19:26 +00:00
omar
5f8175abaa
Version number
2014-11-21 13:40:38 +00:00
omar
ab4f5e6862
Update README.md
2014-11-21 13:38:09 +00:00
omar
075fe0220e
MouseWheel input is normalized
2014-11-21 13:24:57 +00:00
omar
cf037b4769
PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar
2014-11-21 13:23:22 +00:00
ocornut
97192606a6
Fixed Tab > space
2014-11-20 15:19:55 +00:00
omar
e90984f638
Update README.md about performance
2014-11-20 12:27:05 +00:00
ocornut
366516c154
Added "performance" screenshot
2014-11-20 12:10:53 +00:00
ocornut
a6e0d182b0
Added "performance" screenshot
2014-11-20 12:04:08 +00:00
ocornut
3572b04c69
ShowTestWindow: fixed example app from not displaying when header is collaposed.
2014-11-20 11:54:13 +00:00
ocornut
fd8752df8d
Style editor: colors list inside a scrolling region
2014-11-20 11:33:40 +00:00
ocornut
f1dcd72e9f
General fixes of Columns() api. User has more flexibility in the way to fill cells.
2014-11-20 11:31:55 +00:00
ocornut
2aee4419e3
Fixed compatibility with std::vector if user decide to #define ImVector
2014-11-20 08:15:21 +00:00
ocornut
9f2545e6bb
Fixed comment
2014-11-18 10:01:34 +00:00
ocornut
f3bd033b6d
More fixes for ultra pedantic Clang -Weverything
2014-11-18 09:55:31 +00:00
ocornut
b15532345b
Using sqrtf, cosf, sinf. Made STB_TEXTEDIT_ implemtations static. Tweaks.
2014-11-18 07:51:55 +00:00
omar
15436b46e8
Merge pull request #83 from emoon/master
...
Fixed Clang warnings
2014-11-18 07:40:50 +00:00
Daniel Collin
b01adf16de
Fixed more Clang warnings
2014-11-17 20:37:22 +01:00
Daniel Collin
428c4d4ece
Fixed Clang warnings
2014-11-17 20:35:58 +01:00
omar
172ff0a262
Commenting unnecessary strlen calls that could be removed for speedup
2014-11-17 02:27:26 +09:00
omar
c6f3d0924e
Default 'text_end' parameter for low-level AddText/CalcTextSizeA functions
2014-11-17 02:18:37 +09:00
omar
ac40284536
Fixed punctuation.
2014-11-15 13:29:44 +00:00
ocornut
191e17eaf8
Added IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT
2014-11-15 13:18:25 +00:00
ocornut
616668dac3
OpenGL example: uses offsetof() macros for vertice definition instead of hardcoded offsets
2014-11-15 13:10:15 +00:00
ocornut
36e52167da
OpenGL example: made the render function save/restore OpenGL state properly-ish
2014-11-15 12:56:41 +00:00
ocornut
3f85fe2fe7
Cleanup and TODO list items
2014-11-15 12:00:35 +00:00
ocornut
447cc88e04
Fixed unaligned memory access - fix font loading when building on Emscripten
2014-11-15 11:41:03 +00:00
omar
9c707b6d8f
Added assert to catch font data loading failure in a location that's easier to understand
2014-11-14 11:22:35 +09:00
omar
9b5493d1d9
Added assert to catch users using Begin/End without a first NewFrame
2014-11-14 11:17:59 +09:00
omar
8a65d97bf0
Warning fixes (now testing with Clang)
2014-11-12 16:56:42 +09:00
omar
be93b842c1
Merge pull request #77 from ybunyak/master
...
Fix namespaces for Value() and Color() functions.
2014-11-12 08:48:53 +09:00
Yaroslav Bunyak
7961c53145
Fix namespaces for Value() and Color() functions.
2014-11-12 01:36:34 +02:00
omar
d3bc92a674
Added INDEX to top of imgui.cpp
...
Explicit namespace prefix on all ImGui:: functions.
Fixed some typos.
2014-11-10 10:29:01 +09:00
omar
4205241e86
PushTextWrapPos() defaults to 0.0
2014-11-10 10:23:06 +09:00
omar
c97636aef4
Fixed lines clockwiseness to be consistent with other primitives.
2014-11-10 09:36:01 +09:00
omar
ee3355fe8e
Version number
2014-11-07 17:43:00 +09:00
omar
1e30400f80
Added PushStyleVar(),PopStyleVar() helpers.
...
BeginChild() allows to specify negative sizes to specify "use remaining minus xx".
Added a simple example console into the demo window.
2014-11-07 17:22:38 +09:00
omar
3a64c77826
Renamed IsHovered() to IsItemHovered()
2014-11-07 15:49:14 +09:00
omar
e19f0d370a
Added dummy IMGUI_API definition in front of entry-points for silly DLL action
2014-11-07 15:40:58 +09:00
omar
6c192f3221
Added GetContentRegionMax() supporting columns. Some bug fixes with using columns.
2014-11-07 15:17:04 +09:00
omar
78645a7dba
Added word-wrapping API TextWrapped(), PushTextWrapPos(), PopTextWrapPos()
...
Added word-wrapping sample in the test window.
Added IsItemFocused() to tell if last widget is being focused for keyboard input.
2014-11-07 14:45:56 +09:00
ocornut
74363c5a43
Fixed column using a "funny scale factor" (non power of two) #67
2014-10-26 21:33:34 +00:00
ocornut
0b10cf4bd7
Fixed some typos in comments
2014-10-26 21:31:34 +00:00
ocornut
3d84858755
Made with the NoResize flag can still use auto-fitting. Added SetWindowSize().
2014-10-26 20:07:15 +00:00
ocornut
fad5e45d2c
Minor tweaks
2014-10-26 19:56:57 +00:00
omar
05a3a9b962
Merge pull request #66 from JarrettBillingsley/master
...
Added callback versions of PlotLines/PlotHistogram
2014-10-26 20:53:40 +01:00
Jarrett Billingsley
85eee4a4c5
Added overloads of ImGui::PlotLines and ImGui::PlotHistogram which take a value getter function instead of raw value data, and changed the implementation of the original overloads to use this new implementation.
2014-10-26 12:25:00 -07:00
Jarrett Billingsley
4c4798546e
Merge pull request #1 from ocornut/master
...
GCC warning fix
2014-10-26 12:22:27 -07:00
ocornut
f768579377
GCC warning fix
2014-10-26 18:57:19 +00:00
ocornut
e6eafd6fa8
Fixed warnings for GCC -Wpedantic
2014-10-26 15:08:28 +00:00
omar
1037bacc4b
Version number
2014-10-25 11:15:28 +01:00
omar
89a412690c
Added comment on return value of Begin()
2014-10-25 11:01:20 +01:00
omar
af37fb1ee7
Added GetWindowFont(), GetWindowFontSize() + comments following user's feedback
2014-10-25 11:00:24 +01:00
ocornut
9f05a2bb16
Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin)
2014-10-07 12:15:59 +01:00
ocornut
48a944813c
Moved UserData
2014-10-05 09:11:02 +01:00
ocornut
1d9a4748de
Added a UserData void *pointer so that the callback functions can access user state
...
"Just in case a project has adverse reactions to adding globals or
statics in their own code."
2014-10-05 09:08:57 +01:00
omar
36212b9ad9
Merge pull request #56 from seanmiddleditch/master
...
64-bit fixes
2014-10-04 18:54:43 +02:00
Sean Middleditch
bebadb9012
64-bit fixes
...
`int` values are not the same thing as `size_t` nor `ptrdiff_t`. Convert incorrect uses of `int` to more appropriate types.
Fixes warnings for 64-bit compilations.
2014-10-03 20:24:04 -07:00
ocornut
530e746daa
Renamed IMGUI_INCLUDE_IMGUI_USER_CPP to IMGUI_INCLUDE_IMGUI_USER_INL (more IDE friendly)
2014-10-02 11:56:40 +01:00
ocornut
ce481ec702
SetKeyboardFocusHere() allow for an offset to access sub components + comments
2014-09-30 12:31:35 +01:00
ocornut
f1ea630dd0
SetKeyboardFocusHere() sets focus on next widget instead of previous + works on tabbing-disabled widgets
2014-09-30 12:22:58 +01:00
ocornut
ffc8264e9d
Added SetKeyboardFocusHere() to set focus from code. Fixed tabbing through tab-disabled fields.
2014-09-30 11:57:37 +01:00
ocornut
ec625b7c49
OpenGL/DirextX examples: comments and tweaks.
2014-09-30 10:09:44 +01:00
ocornut
f86286548e
OpenGL example: Tentative fix for missed tap-to-click events on MacBook trackpad
2014-09-30 09:58:02 +01:00