Commit Graph

3163 Commits (7f447c8270e2baaa9dc08f98a3b4ecba42de28e8)
 

Author SHA1 Message Date
ocornut 138e292c4b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
ocornut ff5378bd66 InputText() last active preserve scrolling position. Reset scroll if widget size becomes bigger than contents.
ocornut d1aca79f4e InputText() update its width in case of resize initiated programmatically
ocornut 693bd56db2 InputText() removed the odd ~ characters when clipping. Tweaks and fixes of clipping.
ocornut 6e5130ddf4 ShowTestWindow: Added Wdigets Alignment demo under Layout section
ocornut 129339adb0 Removed 'Accessed' flag from ImGuiWindow so GetCurrentWindow() compiles to a simpler accessor
ocornut 11025b3160 Implicit "Debug" window hide itself based on cursor extend instead of the 'Accessed' flag.
ocornut d953f8d99a ShowTestWindow: Graph checkbox under the label, also demo using BeginGroup/EndGroup()
ocornut 2f0fb2bc34 IsItemhovered() include label and behave consistently ()
ocornut 314b87dfaf InputFloat(): fixed label alignment if total widget width forcefully bigger than space available
omar c151f35751 Merge pull request from jsimmons/master
Remove spurious assert
Josh Simmons 6425b8c1cf Remove spurious assert
Remove nop assert that causes warnings on Clang.
ocornut 2a04c2a7bb Fix warnings
ocornut 13caf21018 Use fabs() instead of abs() to ensure we use floating point.
ocornut 7a2da7cd02 Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens)
ocornut 62e8661a37 Fixed assignment order in Begin() making auto-fit size effectively lag by one frame
Also disabling "clamp into view" while windows are auto-fitting
omar 9a6aebeb96 Merge pull request from biller23/patch-1
Examples: typo in ImGui_ImplGlFwGL3_KeyCallback() forward-declaration.
biller23 2f4271a2b3 typo ImGui_ImplGlfwGL3_KeyCallback()
ocornut d45d1d1bca Documentation tweaks and fixes
ocornut ed0f0dbe87 ImDrawList::AddText() takes a const ImFont*
omar 4e245f0bfb Update README.md
Link to Synergy sources
ocornut bc88ed0cb9 Fixed bounding measurement of empty groups (fix )
ocornut e14c7e5510 ShowTestWindow(): Added simple dragging widget example.
ocornut dcaafffe0e Added CalcItemRectClosestPoint() helper.
ocornut 9f1b407def ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper.
ocornut 7d26e85b05 IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly().
omar 6f150d8800 Merge pull request from adamdmoss/boxmax
GetItemBoxMax: fix obsolete function copy-n-paste bug
Adam D. Moss 1de735ba7c GetItemBoxMax: fix obsolete function copy-n-paste bug
ocornut e10d648a28 Added ImGui::GetItemActiveDragDelta() helpers for drag operations
ocornut 215b0065e3 Version number 1.37 WIP
ocornut 7665b8e5e7 Version number
ocornut d8026e4d84 Added VSliderInt()
ocornut 2a9a2918f8 ShowTestWindow(): more examples of SameLine() usage
ocornut 9c489a081c ShowTestWindow(): added vertical sliders examples, tweaks.
ocornut be83c07957 Changed mentions of 'box' to be 'rect'
ocornut 7e6112bf26 Changed remaining mentions of 'aabb' to be 'rect'
ocornut 302316c6cf Renamed internal type ImGuiAabb to ImRect
ocornut 7e297945c3 Added BeginGroup() / EndGroup() layout tools ()
ocornut da4bfe3289 Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering
ocornut 2e63bf1d16 Button() doesn't add frame padding an explicit size
ocornut 30bc952ac3 Maintaining DC.CursorMaxPos instead of SizeContentsCurrent, simpler, faster and easier to understand.
ocornut fd7f50d269 Various fixes related to vertical alignment of text after widget of various sizes. Added demos. Toward
Also fixed LabelText() height.
ocornut 3bd5597cee Moved text vertical centering out of ItemSize() for the moment, in TextUnformatted() it's only user
ocornut bbaf7e2eee Internal tweaks
ocornut fe2809fecc Changed default Border and Column border colors to be most subtle, less MS-DOS
ocornut 7e00a41f1b Speculative warning fix
ocornut cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
ocornut 04358c301e Removed extraneous spaces
omar d4c0ecea0e Merge pull request from adamdmoss/master
Examples: OpenGL: if content window doesn't have focus, tell ImGui we don't have a mouse position.
Adam D. Moss f2ff88b03a opengl3+opengl example: if content window doesn't have focus, tell ImGui we don't have a mouse position. e.g. avoids tooltips popping up in imgui app when you're interacting with a different app window that overlaps it.