4126 Commits (3bd3693fb799e1d6000663072cfea1bc82627ae0)
 

Author SHA1 Message Date
omar d552cabd15 Settings: Internal renaming of structure and fields names. 7 years ago
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.
7 years ago
omar ade09b9e3c Settings: Basic internal refactor to have functions for saving from/to memory (not exposed) 7 years ago
omar 532f564fd3 ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve(). 7 years ago
omar 0f955b818d Fixed DroidSans font link (#1460) 7 years ago
omar d9c5d72962 ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch. 7 years ago
omar 46e994de4e Nav: Do not clear last navigation id stored in a hidden child window. (#787) 7 years ago
omar 4e3c7f1557 Nav: Exposed NavInitWindow() in imgui_internal (#787) 7 years ago
omar f5c47faee8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar ef5dd30625 Sisyphus says: tweaked comments about not using old-style OpenGL examples (#1459, #1394 etc.) 7 years ago
omar 6bd3b45b34 Sisyphus says: tweaked comments about not using old-style OpenGL examples (#1459, #1394 etc.) 7 years ago
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. 7 years ago
omar 06a32a2b00
Merge pull request #1455 from elect86/patch-3
Update imgui_draw.cpp, fixed light colors order
7 years ago
Giuseppe Barbieri 1b2ec35b8d
Update imgui_draw.cpp 7 years ago
omar b618629d99 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
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. 7 years ago
omar aafa6cece5 Tweak expression to be less weird (how did that ever happen?) 7 years ago
omar 3141df1459
Merge pull request #1454 from elect86/patch-2
Tweak
7 years ago
Giuseppe Barbieri 21b456e567
Update imgui.cpp 7 years ago
omar 68b26b4867 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 176d8fbe74 Fixed unreferenced variable warnings. 7 years ago
omar 302757447a Internals: Added SplitterBehavior(). (#319) 7 years ago
omar 195abc3d17 Begin: Fix border size latch when rounding uses Child or Popup value. (#707) 7 years ago
omar 2543807e56 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
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). 7 years ago
omar 31683cfe34 ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. (#845) 7 years ago
omar 3c5e64db78 Demo: Tweaked Image() code. 7 years ago
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) 7 years ago
omar ba095f81a5 Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image 7 years ago
omar 8c0f2e4946 Added comment to help people dealing with 58345b11e1 breakage (#707) 7 years ago
omar e996286c38 Todo list update 7 years ago
thedmd 79f07f6ff0 Add AddImageRounded() to ImDrawList 7 years ago
thedmd 8b2d449b16 Add ShadeVertsLinearUV() 7 years ago
omar dc2768503f Fix for drag and drop branch. 7 years ago
omar 92212b17aa Merge branch 'master' into drag_and_drop 7 years ago
omar 9848a7023b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
7 years ago
omar 28a31997b7 Style Editor: Simplified settings also show PopupBorderSize as a checkbox. (#707, #1019) 7 years ago
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) 7 years ago
omar c433bc971f Reorder fields for consistency. 7 years ago
omar f7fe824805 Style: Tweaked border settings to homogenize a little how they look over different backgrounds. (#707) 7 years ago
omar 39137ccc3e Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. (#707) 7 years ago
Jason Wilkins 022f8c2342 fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph 7 years ago
omar 9886b09a0a Minor tweak, removed extraneous empty destructor. 7 years ago
Jason Wilkins e605f21797 TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*) 7 years ago
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.) 7 years ago
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). 7 years ago
omar 9289e8055c
Merge pull request #1445 from franciscod/uninitialized_o3_werror
ImFontAtlas: Fix maybe-uninitialized warning.
7 years ago
omar 4cdd998be8 Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (#1450, #1451) 7 years ago
omar d323e8cca2 Fixed Style merge for nav branch (#707, #787) 7 years ago
omar d211a0e338 Merge branch 'master' into navigation (with style breakable)
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
7 years ago