omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
6 years ago |
|
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
f2d577c33f
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
6 years ago |
|
omar
|
ae34241f8b
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
6 years ago |
|
omar
|
6c1ae6cc71
|
Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).
|
6 years ago |
|
omar
|
6d7677534f
|
Internals: SliderBehavior: Using axis indexing.
|
6 years ago |
|
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
7fa3e71abb
|
Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155)
|
6 years ago |
|
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
Konstantin Podsvirov
|
faecf90383
|
SliderAngle: Added optional `format` argument to allow users customize precision and make localization. (#2150)
|
6 years ago |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
31fd6c585a
|
Removed unnecessary ImGui:: qualifiers in internal code.
|
6 years ago |
|
omar
|
e6cc547a94
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
ca753829cb
|
Revert using wchar_t functions (9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
|
6 years ago |
|
omar
|
2eaf5b03df
|
Fixes crash introduced in previous commit 9cf94d5.
|
6 years ago |
|
omar
|
ede3a3b92d
|
Fixes crash introduced in previous commit 9cf94d5.
|
6 years ago |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
9cf94d5dd6
|
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
cf0afb48ac
|
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
|
6 years ago |
|
omar
|
059560d28b
|
ButtonBehavior, ImGuiButtonFlags_FlattenChildren flag can be used from a child window. Would typically affect calling SplitterBehavior() from a child window.
|
6 years ago |
|
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
6 years ago |
|
omar
|
ed3c015f4e
|
Docking: Reorganizing some of the tab-bar selection and window focus related code.
|
6 years ago |
|
omar
|
35d1fb7b34
|
Style: Added style.TabRounding setting.
|
6 years ago |
|
omar
|
c6193d0605
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
6 years ago |
|
omar
|
4053d9d638
|
Docking: Fixed tab order restoring (follow up to 67be485e, broken in 455dc6e2)
|
6 years ago |
|
omar
|
9960ccddb2
|
Docking: Added DockBuilderRemoveNode() + various tweaks. Fixed dragging/undocking dock node from CollapseButton.
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
599d5f185c
|
TabBar: Recover if SelectedTabId doesn't exist anymore.
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
e647f89c33
|
Docking: Added undocking of whole dock node by dragging from the Collapse button. Super useful and works great!
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
35032d41fa
|
Docking: Internals: Transitioning some code toward consistently using ImGuiContext* ctx parameter instead of ImGuiDockContext
|
6 years ago |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
c12da2a607
|
BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.
|
6 years ago |
|
omar
|
ca5dc0c019
|
ColorPicker: Replaced the Separator with a Spacing call. (#2068)
|
6 years ago |
Elias Daler
|
ec04e8bb05
|
Fix MSVC's C4312 warning about casting user texture type to void* in ImageButton (#2080)
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
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)
|
6 years ago |
|
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).
|
6 years ago |
|
omar
|
e2436ca625
|
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
|
6 years ago |