ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
omar2017-08-29 17:27:19 +08:00
550dc09998
Merged from Navigation branch (misc)
omar2017-08-29 17:12:18 +08:00
aef041f948
Merged from Navigation branch
omar2017-08-29 17:09:56 +08:00
c9298c2657
Merged from Navigation branch: f71cdd13b7 Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code. c816e6c742 Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). (#323, #246)
omar2017-08-29 17:09:44 +08:00
a9e1d9aab9
Merge branch 'master' into navigation
omar2017-08-29 16:21:46 +08:00
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
omar2017-08-29 16:13:17 +08:00
1f1e63f705
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. (#787)
omar2017-08-29 16:06:52 +08:00
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. (#787)
omar2017-08-29 16:05:12 +08:00
01d4bf299a
Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (#1296, #76)
omar2017-08-29 15:22:30 +08:00
f0fa17b5e0
ImDrawList: Minor renaming
omar2017-08-29 15:10:03 +08:00
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
omar2017-08-26 14:11:56 +08:00
a02210a455
Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
omar2017-08-26 00:31:17 +08:00
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.
omar2017-08-25 16:43:25 +08:00
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
omar2017-08-25 16:10:14 +08:00
40f608ce9b
Version 1.52 WIP
omar2017-08-25 15:12:12 +08:00
e6ed2f9939
Nav: Tooltip do not appear in navigation focus list. (#1294, #787)
omar2017-08-25 00:06:57 +08:00
82c3116b4f
Demo: Displaying version number in test window.
omar2017-08-24 17:32:03 +08:00
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4) (#707)
omar2017-08-24 17:30:10 +08:00
b0fc30bd19
Merge branch 'master' into navigation
omar2017-08-22 20:49:02 +08:00
7c5556c921
Merge branch 'master' into navigation
omar2017-08-22 20:48:36 +08:00
92efa00bc9
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
omar2017-08-22 20:44:39 +08:00
6ed75d3046
Merge branch 'master' into navigation
omar2017-08-22 20:27:39 +08:00
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
omar2017-08-22 20:25:27 +08:00
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
omar2017-08-22 20:10:02 +08:00
2e35957a81
Undo reordering of ImGuiKey in Nav branch
omar2017-08-22 20:02:52 +08:00
8581050002
Merge branch 'master' into navigation
omar2017-08-22 19:55:59 +08:00
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
omar2017-08-22 19:51:12 +08:00
8e89809078
Merge branch 'master' into navigation
omar2017-08-22 19:48:01 +08:00
2ad2190d47
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
ocornut2016-07-30 10:02:46 +02:00
f3ab5e6252
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) (#787). Thanks @Grouflon
omar2017-08-22 19:43:49 +08:00
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291)
omar2017-08-22 19:26:21 +08:00
ce7f3d4831
Merge branch 'master' into navigation
omar2017-08-22 18:27:29 +08:00
444792f75f
Merge fixes from ,master branch
omar2017-08-22 18:27:23 +08:00
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
ocornut2016-07-31 13:05:13 +02:00
7de68fbe3d
Merge branch 'master' into navigation
omar2017-08-22 18:22:41 +08:00
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
omar2017-08-22 18:13:10 +08:00
9670fe9ca7
Merge branch 'master' into navigation
omar2017-08-22 17:51:20 +08:00
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
omar2017-08-22 17:46:50 +08:00
83e8d10fab
Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. (#125, #913, #893, #1138)
omar2017-08-20 21:08:07 +08:00
7ff1c149b5
Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. (#913, #125)
omar2017-08-20 20:40:25 +08:00
1c83b073c6
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913)
omar2017-08-20 20:37:04 +08:00
e70d49ba1f
Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125)
omar2017-08-20 19:30:57 +08:00
9307631c90
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. (#913, #125). End() calls EndColumns() directly.
omar2017-08-20 19:25:29 +08:00
a511b00226
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913, #125)
omar2017-08-20 19:19:31 +08:00
3bf2af23e6
Columns: Fixed EndColumns() not repositioning the cursor. (#913)
omar2017-08-20 18:44:54 +08:00
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
omar2017-08-20 18:44:48 +08:00
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
omar2017-08-20 17:53:09 +08:00
fd394e1e95
Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
omar2017-08-20 16:39:11 +08:00
1065a7b95b
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
omar2017-08-20 15:38:05 +08:00
91d841dd5f
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
omar2017-08-20 15:28:12 +08:00
3b11e73333
Examples: gitignore added patterns for modern MSVC versions
omar2017-08-20 15:17:37 +08:00
bf0d9c123e
Merge branch 'master' into navigation
omar2017-08-18 00:25:12 +08:00
8be7a60f20
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
omar2017-08-17 21:19:54 +08:00
1086c87767
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
omar2017-08-17 21:13:14 +08:00
4075cc58e9
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)
omar2017-08-17 20:44:44 +08:00
d970957e2d
ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)
omar2017-08-17 19:36:48 +08:00
omar