Merge branch 'master_164' into viewport_164

# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp
This commit is contained in:
omar
2018-08-31 10:28:21 +02:00
7 changed files with 109 additions and 86 deletions

View File

@ -1,22 +1,26 @@
// dear imgui, v1.64 WIP
// dear imgui, v1.64
// (widgets code)
// Index of this file:
// - Widgets: Text, etc.
// - Widgets: Button, Image, Checkbox, RadioButton, ProgressBar, Bullet, etc.
// - Widgets: ComboBox
// - Data Type and Data Formatting Helpers
// - Widgets: DragScalar, DragFloat, DragInt, etc.
// - Widgets: SliderScalar, SliderFloat, SliderInt, etc.
// - Widgets: InputScalar, InputFloat, InputInt, etc.
// - Widgets: InputText, InputTextMultiline
// - Widgets: ColorEdit, ColorPicker, ColorButton, etc.
// - Widgets: TreeNode, TreePush, TreePop, etc.
// - Widgets: Selectable
// - Widgets: ListBox
// - Widgets: PlotLines, PlotHistogram
// - Widgets: Value
// - Widgets: MenuItem, BeginMenu, EndMenu, etc.
/*
Index of this file:
- Widgets: Text, etc.
- Widgets: Button, Image, Checkbox, RadioButton, ProgressBar, Bullet, etc.
- Widgets: ComboBox
- Data Type and Data Formatting Helpers
- Widgets: DragScalar, DragFloat, DragInt, etc.
- Widgets: SliderScalar, SliderFloat, SliderInt, etc.
- Widgets: InputScalar, InputFloat, InputInt, etc.
- Widgets: InputText, InputTextMultiline
- Widgets: ColorEdit, ColorPicker, ColorButton, etc.
- Widgets: TreeNode, TreePush, TreePop, etc.
- Widgets: Selectable
- Widgets: ListBox
- Widgets: PlotLines, PlotHistogram
- Widgets: Value
- Widgets: MenuItem, BeginMenu, EndMenu, etc.
*/
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS
@ -96,10 +100,6 @@ static bool SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataT
}
//-------------------------------------------------------------------------
// SHARED UTILITIES
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
// WIDGETS: Text
// - TextUnformatted()