1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-22 07:36:35 +00:00
Commit Graph

52 Commits

Author SHA1 Message Date
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
ae30efc0fd Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. () 2018-02-06 19:58:23 +01:00
omar
057807f4a7 Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. () 2018-02-06 19:29:31 +01:00
omar
cea8017e0b Merge branch 'master' into context 2018-02-06 18:04:44 +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. () 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
27980d9688 Merge branch 'master' into context 2018-01-31 16:02:26 +01:00
omar
cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ () 2018-01-31 16:00:07 +01:00
omar
cca9c3e3da Examples: Using Dark theme by default. (). Tweaked demo code. 2018-01-31 00:15:47 +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
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
d3e826c247 Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (, , , , ) 2018-01-21 20:16:55 +01:00
omar
7e7c017b75 Examples: Simplified mouse wheel handling. () 2018-01-20 12:45:31 +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. () 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
f3e510a9bf Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. ()
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
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. () 2018-01-19 09:25:31 +01:00
omar
60d5dc7902 Examples: SDL: Fixed mapping of Insert key (, fix bug introduced in ) 2018-01-18 10:01:36 +01:00
omar
ce95b84825 Added ImGuiKey_Insert for future use. Setup in all example bindings. () 2018-01-08 15:30:39 +01:00
omar
407955d9fb Examples: Using IM_OFFSETOF macro. + Comments 2018-01-05 22:05:02 +01:00
omar
9f8632b131 Examples: Comments about invalid mouse pos. 2017-12-29 15:03:36 +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
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
ef5dd30625 Sisyphus says: tweaked comments about not using old-style OpenGL examples (, etc.) 2017-11-24 09:27:45 +01:00
omar
fba704bf5d Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (, , , , , , , , , , , , , , and more) 2017-11-01 14:24:09 +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. , , , , , , , etc.) 2017-10-28 18:21:44 +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. () 2017-10-25 20:55:15 +02: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
842e88a8e3 Examples: Avoid using ImColor() to not tempt newcomers into looking at it 2017-09-27 15:47:08 +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
7d1f2c0dc5 Examples: GL2: rename functions to include GL2 in name 2017-09-01 16:45:31 +02:00
unknown
cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes 2017-09-01 20:39:12 +12: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
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
166e8f6261 Examples: OpenGL2+GLFW/SDL: Added commented out glUseProgram(0) in main.cpp for visibility () 2017-07-23 15:57:39 +08:00
omar
c3d9e0a6eb Examples: SDL2: Tweaked batch files for Win32. 2017-05-01 15:00:42 +02:00
omar
b3d237a5ce Examples: SDL2: Added build .bat files for win32. 2017-05-01 13:47:59 +02:00
omar
f030087f8e Comments to redirect people to OpenGL3 examples () 2017-04-26 18:27:10 +02:00
ocornut
775ac24d45 Fixed overzealous GCC warnings () + partly undo 8553bab241 2016-11-12 11:14:37 +01:00
sushitao
833ed760ae update cmdline syntax in windows compilation 2016-11-09 14:53:23 +08:00
ocornut
0d3f8807c7 Added a void* user_data parameter to Clipboard function handlers. () 2016-10-15 11:36:43 +02:00
ocornut
bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness () 2016-09-05 23:39:52 +02:00