2b9d8ab91d
Merge branch 'master' into drag_and_drop
omar2017-12-11 16:39:27 +01:00
38bfdb357e
Merge branch 'master' into navigation
omar2017-12-11 16:28:47 +01:00
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
omar2017-12-11 16:22:52 +01:00
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. (#787)
omar2017-12-11 16:19:37 +01:00
6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
omar2017-12-11 10:25:44 +01:00
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
omar2017-12-10 17:57:27 +01:00
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)
omar2017-12-10 17:36:30 +01:00
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
omar2017-12-10 17:27:37 +01:00
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
omar2017-12-10 17:24:10 +01:00
20ba79aa56
Demo: Added "No close" option.
omar2017-12-10 17:02:41 +01:00
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
omar2017-12-10 16:48:18 +01:00
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.
omar2017-12-08 18:28:17 +01:00
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.
omar2017-12-08 17:16:33 +01:00
a6f37287d8
Merge branch 'master' into navigation
omar2017-12-08 15:06:37 +01:00
7ac5f11b29
Standardizing the casing/format of internal window names + Misc comments.
omar2017-12-08 14:52:33 +01:00
befc58771c
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
omar2017-12-08 14:48:25 +01:00
e998c7d3e3
Combo: Moved functions (untouched).
omar2017-12-08 14:45:43 +01:00
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.
omar2017-12-08 14:44:58 +01:00
d9d231dc6b
Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
omar2017-12-08 12:30:58 +01:00
74f42baf3e
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
omar2017-12-08 11:48:18 +01:00
9872297a84
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
omar2017-12-07 22:22:53 +01:00
a4863e8084
Demo: Picker with palette demo supports drag and drop. (#143, #346)
omar2017-12-08 12:49:35 +01:00
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)
omar2017-12-08 12:48:53 +01:00
b6b940c8ee
Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
omar2017-12-08 09:35:23 +01:00
7f2b9ea4c0
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
omar2017-12-07 18:10:37 +01:00
3c9f9a455e
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
omar2017-12-07 16:36:07 +01:00
8959c64b33
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
omar2017-12-07 13:26:56 +01:00
abe5ad3c7a
Demo: Added display for IsMouseDragging() function.
omar2017-12-06 23:38:33 +01:00
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
omar2017-12-06 22:20:08 +01:00
2fc6a82665
Merge branch 'master' into navigation
omar2017-12-06 17:44:40 +01:00
8f41508c52
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
omar2017-12-06 17:42:28 +01:00
2fc9a2e6e7
Fixed nav branch merge issue.
omar2017-12-06 15:20:36 +01:00
beda5fc5a0
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
omar2017-12-06 15:13:23 +01:00
ecacaf7f2d
Lower-right resize grip only appears when hovered. (#822)
omar2017-12-05 23:03:08 +01:00
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822)
omar2017-12-05 22:53:58 +01:00
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).
omar2017-12-05 22:38:02 +01:00
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822)
omar2017-12-05 20:36:35 +01:00
729333293c
Merge branch 'master' into navigation
omar2017-12-05 22:56:35 +01:00
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822)
omar2017-12-05 22:53:58 +01:00
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).
omar2017-12-05 22:38:02 +01:00
2ca4f9e862
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822)
omar2017-12-05 20:36:35 +01:00
364251146b
Merge branch 'master' into navigation
omar2017-12-05 16:15:05 +01:00
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.
omar2017-12-05 16:12:45 +01:00
16d9fa30b2
Merge branch 'master' into drag_and_drop
omar2017-12-05 09:21:07 +01:00
5f7cd7fb1c
Internals: Splitter Behavior doesn't show a border. (#319)
omar2017-11-30 18:02:42 +01:00
be6384eb2a
Style: Tweaked default WindowRounding value from 9 to 7 (#707)
omar2017-11-30 19:06:09 +01:00
aea3fe41b9
Style: Tweaks Dark and Light styles. (#707)
omar2017-11-30 23:07:48 +01:00
6ea744d8f4
Drag and Drop: Added DragSource from color square. Added DragTarget on ColorEdit4 widget. (#143)
omar2017-11-30 16:54:39 +01:00
81cbaef806
Merge branch 'master' into navigation
omar2017-11-29 23:49:17 +01:00
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)
omar2017-11-29 23:47:59 +01:00
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)
omar2017-11-29 23:47:15 +01:00
c36e586cce
Style, Scrolling: Fixed padding and scrolling asymetry where lower/right sides of a window wouldn't use WindowPadding properly + causing minor scrolling glitches.
omar2017-11-29 23:39:23 +01:00
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)
omar2017-11-28 21:04:13 +01:00
f3ec608c19
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
omar2017-11-28 00:32:25 +01:00
omar