Commit Graph

4945 Commits (fd201a90f13b54730427d2ed3763f1e27d733bb0)
 

Author SHA1 Message Date
omar 7ae71e4984 Settings: Internals: Added FindSettingsHandler()
omar 35eb5c5c99 Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
omar 963259d128 Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
omar 63712d5f5c Merge branch 'master' into drag_and_drop
omar 9191b17218 Merge branch 'master' into navigation
omar 4a43632163 Build fix
omar 1a8a7c9d17 Settings: Import old style .ini file
omar c8b5b569da Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
omar e5ebe42207 Settings: Make ImGuiWindow settings always first in the list.
omar 4c4f1b0224 ImVector: Added ImVector::push_front helper.
omar f3ec608c19 Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
omar e000ee0116 Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). ()
omar 7e2d0d734c Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
omar d552cabd15 Settings: Internal renaming of structure and fields names.
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.
omar ade09b9e3c Settings: Basic internal refactor to have functions for saving from/to memory (not exposed)
omar 532f564fd3 ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
omar 0f955b818d Fixed DroidSans font link ()
omar d9c5d72962 ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
omar 46e994de4e Nav: Do not clear last navigation id stored in a hidden child window. ()
omar 4e3c7f1557 Nav: Exposed NavInitWindow() in imgui_internal ()
omar f5c47faee8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar ef5dd30625 Sisyphus says: tweaked comments about not using old-style OpenGL examples (, etc.)
omar 6bd3b45b34 Sisyphus says: tweaked comments about not using old-style OpenGL examples (, etc.)
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.
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.
omar 06a32a2b00
Merge pull request from elect86/patch-3
Update imgui_draw.cpp, fixed light colors order
Giuseppe Barbieri 1b2ec35b8d
Update imgui_draw.cpp
omar b618629d99 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
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.
omar aafa6cece5 Tweak expression to be less weird (how did that ever happen?)
omar 3141df1459
Merge pull request from elect86/patch-2
Tweak
Giuseppe Barbieri 21b456e567
Update imgui.cpp
omar 68b26b4867 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 176d8fbe74 Fixed unreferenced variable warnings.
omar 302757447a Internals: Added SplitterBehavior(). ()
omar 195abc3d17 Begin: Fix border size latch when rounding uses Child or Popup value. ()
omar 2543807e56 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
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).
omar 31683cfe34 ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ()
omar 3c5e64db78 Demo: Tweaked Image() code.
omar 7f447c8270 Color picker: Tweak vertex shading code, since we aren't shading between PrimReserve and PrimVert the code can be expressed more naturally. ()
omar ba095f81a5 Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
omar 8c0f2e4946 Added comment to help people dealing with 58345b11e1 breakage ()
omar e996286c38 Todo list update
thedmd 79f07f6ff0 Add AddImageRounded() to ImDrawList
thedmd 8b2d449b16 Add ShadeVertsLinearUV()
omar dc2768503f Fix for drag and drop branch.
omar 92212b17aa Merge branch 'master' into drag_and_drop
omar 9848a7023b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp