omar
|
b618629d99
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-22 12:34:59 +01:00 |
|
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.
|
2017-11-22 12:33:59 +01:00 |
|
omar
|
aafa6cece5
|
Tweak expression to be less weird (how did that ever happen?)
|
2017-11-22 11:26:16 +01:00 |
|
omar
|
3141df1459
|
Merge pull request #1454 from elect86/patch-2
Tweak
|
2017-11-22 11:24:20 +01:00 |
|
Giuseppe Barbieri
|
21b456e567
|
Update imgui.cpp
|
2017-11-22 11:19:52 +01:00 |
|
omar
|
68b26b4867
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-22 11:04:00 +01:00 |
|
omar
|
176d8fbe74
|
Fixed unreferenced variable warnings.
|
2017-11-22 11:02:42 +01:00 |
|
omar
|
302757447a
|
Internals: Added SplitterBehavior(). (#319)
|
2017-11-20 19:41:17 +01:00 |
|
omar
|
195abc3d17
|
Begin: Fix border size latch when rounding uses Child or Popup value. (#707)
|
2017-11-20 15:19:54 +01:00 |
|
omar
|
2543807e56
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-11-20 13:54:06 +01:00 |
|
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).
|
2017-11-20 13:53:16 +01:00 |
|
omar
|
31683cfe34
|
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. (#845)
|
2017-11-20 13:31:40 +01:00 |
|
omar
|
3c5e64db78
|
Demo: Tweaked Image() code.
|
2017-11-20 13:30:25 +01:00 |
|
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)
|
2017-11-20 13:16:57 +01:00 |
|
omar
|
ba095f81a5
|
Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
|
2017-11-20 13:07:14 +01:00 |
|
omar
|
8c0f2e4946
|
Added comment to help people dealing with 58345b11e1 breakage (#707)
|
2017-11-20 13:05:50 +01:00 |
|
omar
|
e996286c38
|
Todo list update
|
2017-11-20 12:40:38 +01:00 |
|
thedmd
|
79f07f6ff0
|
Add AddImageRounded() to ImDrawList
|
2017-11-19 21:56:46 +01:00 |
|
thedmd
|
8b2d449b16
|
Add ShadeVertsLinearUV()
|
2017-11-19 21:56:36 +01:00 |
|
omar
|
dc2768503f
|
Fix for drag and drop branch.
|
2017-11-19 16:24:17 +01:00 |
|
omar
|
92212b17aa
|
Merge branch 'master' into drag_and_drop
|
2017-11-19 16:23:37 +01:00 |
|
omar
|
9848a7023b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-11-19 16:21:21 +01:00 |
|
omar
|
28a31997b7
|
Style Editor: Simplified settings also show PopupBorderSize as a checkbox. (#707, #1019)
|
2017-11-19 16:03:42 +01:00 |
|
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)
|
2017-11-19 15:56:51 +01:00 |
|
omar
|
c433bc971f
|
Reorder fields for consistency.
|
2017-11-19 14:58:10 +01:00 |
|
omar
|
f7fe824805
|
Style: Tweaked border settings to homogenize a little how they look over different backgrounds. (#707)
|
2017-11-19 13:55:38 +01:00 |
|
omar
|
39137ccc3e
|
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. (#707)
|
2017-11-19 13:52:40 +01:00 |
|
Jason Wilkins
|
022f8c2342
|
fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph
|
2017-11-19 12:44:23 +01:00 |
|
omar
|
9886b09a0a
|
Minor tweak, removed extraneous empty destructor.
|
2017-11-19 12:42:17 +01:00 |
|
Jason Wilkins
|
e605f21797
|
TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
|
2017-11-19 12:36:14 +01:00 |
|
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.)
|
2017-11-19 12:06:45 +01:00 |
|
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).
|
2017-11-19 12:00:07 +01:00 |
|
omar
|
9289e8055c
|
Merge pull request #1445 from franciscod/uninitialized_o3_werror
ImFontAtlas: Fix maybe-uninitialized warning.
|
2017-11-19 00:53:35 +01:00 |
|
omar
|
4cdd998be8
|
Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (#1450, #1451)
|
2017-11-19 00:49:23 +01:00 |
|
omar
|
d323e8cca2
|
Fixed Style merge for nav branch (#707, #787)
|
2017-11-19 00:47:00 +01:00 |
|
omar
|
d211a0e338
|
Merge branch 'master' into navigation (with style breakable)
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
|
2017-11-19 00:39:37 +01:00 |
|
omar
|
4022ada843
|
Merge branch 'master' into drag_and_drop
|
2017-11-19 00:36:32 +01:00 |
|
omar
|
4daf377c9b
|
Added comment about TextUnformatted(). (#1450)
|
2017-11-19 00:32:47 +01:00 |
|
omar
|
8a7f03cbf9
|
Combo: Offset popup position by border size so that a double border isn't so visible. (#707)
|
2017-11-19 00:29:59 +01:00 |
|
omar
|
d7af1a218e
|
Style: Added PopupRounding setting. (#1112)
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
067605052d
|
Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. (#823)
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
6f7b1bf2e1
|
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
0e4f1df1a4
|
Style: Made changes to Classic style (!!!). Tweaked Dark style. (#707)
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
0a61b7195c
|
Style: Added a default StyleColorsLight(). (#707)
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
e7e81b265d
|
Demo: Tweaks.
|
2017-11-18 23:44:16 +01:00 |
|
omar
|
58345b11e1
|
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. (#707)
|
2017-11-18 23:44:16 +01:00 |
|
omar
|
1c41603b31
|
Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. (fix #1211)
|
2017-11-18 23:44:16 +01:00 |
|
omar
|
c1b5eab868
|
Style Editor: Sneakily adding a combo box to change colors (#707)
|
2017-11-18 23:18:18 +01:00 |
|
omar
|
331eac511e
|
Style: Dark: Tweaks + setting BorderShadow correctly.
|
2017-11-18 19:08:52 +01:00 |
|
omar
|
29e0078b66
|
Internals: Window minor internal renaming + added WindowRounding latch.
|
2017-11-18 19:06:11 +01:00 |
|