03720acaff
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-12 10:11:14 +01:00
9be3319653
Tweaks, comments around ImFontAtlas
...
Removed unsigned int from API
2015-05-12 09:08:47 +01:00
9e307d60e3
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-11 21:45:13 +01:00
515e0c6122
Cleanup, merged duplicate code into a function
2015-05-11 21:44:50 +01:00
317744489f
WIP Menus: sub-menu arrow alignment take account of extension by other widgets ( #126 )
2015-05-11 20:58:07 +01:00
5082182790
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
2015-05-11 20:39:19 +01:00
ba7a4fc034
WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type ( #126 )
2015-05-11 20:34:52 +01:00
7fb704d308
WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) ( #126 )
...
May remove the ImGuiWindowFlags_Menu alltogether
2015-05-11 19:52:02 +01:00
79198fd6a5
Default item width for AlwaysAutoResize windows expressed as a factor of font height
2015-05-11 19:47:01 +01:00
34aad73fd8
Added ImGuiCol_TextDisabled
2015-05-11 19:36:32 +01:00
141ac8beab
Tweaks
2015-05-11 18:28:30 +01:00
33a2fd368a
Merge pull request #218 from paperManu/inputNFlags
...
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
2015-05-11 16:54:12 +01:00
b3faed610d
Renamed flags to extra_flags in last commit
2015-05-11 11:40:08 -04:00
fcd08ed8d4
BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126 )
2015-05-11 15:57:02 +01:00
94b7c9e307
Input text flags added to InputFloatN and InputIntN
2015-05-11 10:15:22 -04:00
cd2ec7868c
Merge pull request #217 from Pagghiu/bugfix
...
Example fix PopStyleVar on Vertical Slider to avoid assertion
2015-05-11 14:12:23 +01:00
99a1a85f1f
Example fix PopStyleVar on Vertical Slider to avoid assertion
...
Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize
2015-05-11 14:45:49 +02:00
4a41ce9414
InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to #214 ) + tidying
2015-05-11 09:29:10 +01:00
c2c43928a9
Untabifiy
2015-05-11 09:26:53 +01:00
8ac9036db3
Merge pull request #214 from ghassanpl/upstream
...
InputText(): make sure letter-key shortcuts have ONLY the control key pressed
2015-05-11 09:26:00 +01:00
4913668ea4
Fixed implicit conversion of NULL constant to bool ( fix #216 )
2015-05-11 09:23:29 +01:00
bb2d3a8b41
* make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows)
2015-05-10 22:41:28 +02:00
6c1084eaa1
Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts #207
2015-05-09 10:27:03 +01:00
f293bec97c
Added style.ScrollbarRounding #212
2015-05-09 10:13:56 +01:00
d23709ce35
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-09 10:02:48 +01:00
9fe654c6e4
Assert on modifiers stack size mismatch between Begni()/End() pairs #204
...
Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error.
2015-05-09 09:59:46 +01:00
debe6522bb
Examples: test for tooltip over popup.
2015-05-07 19:00:17 +01:00
33e8fb85cf
Allow stacking popups, not really useful yet (wip #126 )
2015-05-07 18:43:08 +01:00
dd2a578012
Added ImGuiSetCond_Appearing to test the hidden->visible transition.
2015-05-07 18:39:23 +01:00
f46557d2d6
MenuItem() draft for popups, with Selected option (wip #126 )
2015-05-07 17:21:48 +01:00
c36172ebef
Tweak RenderCheckMark()
2015-05-07 17:11:32 +01:00
85b8967291
Added RenderCheckMark() helper following the font size
...
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
2015-05-07 17:06:07 +01:00
13c3f11c66
Comments ( #209 )
2015-05-07 11:36:16 +01:00
fbbe7fee53
Fix "Debug" window stealing focus/popup #208 #209 @thevaber
2015-05-07 11:24:51 +01:00
25d8c1af91
Removed inline marker #210
2015-05-07 10:48:05 +01:00
e7ffcea33d
Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same).
2015-05-03 14:26:47 +01:00
b1b23d6ca9
Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that)
2015-05-03 13:52:53 +01:00
0ca7926b94
Popup auto-border doesn't spread to its childs #197
2015-05-03 13:04:43 +01:00
a3a10d4a3c
Popup have borders by default #197 attenuated border alpha in default theme
2015-05-03 12:17:53 +01:00
47e875314b
Plot: overlay label clipped within frame when bigger than frame
2015-05-03 11:32:39 +01:00
f00662a5ad
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-05-02 22:20:48 +01:00
08fd6a7e7d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-05-02 22:20:14 +01:00
d84b5737a6
Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size.
...
Big change, needed reorder of Begin(). May trigger new bugs.
2015-05-02 18:22:46 +01:00
99e315d2b2
Fix for width of child windows with scrollbar (broken 376a6a5af0)
2015-05-02 18:14:24 +01:00
221f36e116
Comments, tweaks, metrics window tweak
2015-05-02 17:54:25 +01:00
a3560b274e
Tidying up Begin(): using local copy of 'flags' for brevity
2015-05-02 17:45:54 +01:00
6ca4b31bf8
Fixed popup resizing (broken 376a6a5af0)
2015-05-02 15:54:35 +01:00
a906738ba7
Renamed Visible->Active internally
2015-05-02 13:20:50 +01:00
1b5795c96d
InputText: fixed incorrect edit state after text buffer is modified by user through callback #206
2015-05-02 12:45:53 +01:00
81bf614821
Fix window size after collapsing (broken 376a6a5af0)
2015-05-02 12:35:34 +01:00
