|
|
@@ -378,7 +378,7 @@ void ImGui::TextAlignedV(float align_x, float size_x, const char* fmt, va_list a
|
|
|
SetTooltip("%.*s", (int)(text_end - text), text);
|
|
|
}
|
|
|
|
|
|
-void ImGui::LabelText(const char* label, const char* fmt, ...)
|
|
|
+void ImGui::LabelText(ImStrv label, const char* fmt, ...)
|
|
|
{
|
|
|
va_list args;
|
|
|
va_start(args, fmt);
|
|
|
@@ -387,7 +387,7 @@ void ImGui::LabelText(const char* label, const char* fmt, ...)
|
|
|
}
|
|
|
|
|
|
// Add a label+text combo aligned to other label+value widgets
|
|
|
-void ImGui::LabelTextV(const char* label, const char* fmt, va_list args)
|
|
|
+void ImGui::LabelTextV(ImStrv label, const char* fmt, va_list args)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -763,7 +763,7 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags flags)
|
|
|
+bool ImGui::ButtonEx(ImStrv label, const ImVec2& size_arg, ImGuiButtonFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -804,13 +804,13 @@ bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::Button(const char* label, const ImVec2& size_arg)
|
|
|
+bool ImGui::Button(ImStrv label, const ImVec2& size_arg)
|
|
|
{
|
|
|
return ButtonEx(label, size_arg, ImGuiButtonFlags_None);
|
|
|
}
|
|
|
|
|
|
// Small buttons fits within text without additional vertical spacing.
|
|
|
-bool ImGui::SmallButton(const char* label)
|
|
|
+bool ImGui::SmallButton(ImStrv label)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
float backup_padding_y = g.Style.FramePadding.y;
|
|
|
@@ -822,7 +822,7 @@ bool ImGui::SmallButton(const char* label)
|
|
|
|
|
|
// Tip: use ImGui::PushID()/PopID() to push indices or pointers in the ID stack.
|
|
|
// Then you can keep 'str_id' empty or the same for all your buttons (instead of creating a string based on a non-string id)
|
|
|
-bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg, ImGuiButtonFlags flags)
|
|
|
+bool ImGui::InvisibleButton(ImStrv str_id, const ImVec2& size_arg, ImGuiButtonFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
@@ -847,7 +847,7 @@ bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg, ImGuiBut
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiButtonFlags flags)
|
|
|
+bool ImGui::ArrowButtonEx(ImStrv str_id, ImGuiDir dir, ImVec2 size, ImGuiButtonFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
@@ -875,7 +875,7 @@ bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiBu
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::ArrowButton(const char* str_id, ImGuiDir dir)
|
|
|
+bool ImGui::ArrowButton(ImStrv str_id, ImGuiDir dir)
|
|
|
{
|
|
|
float sz = GetFrameHeight();
|
|
|
return ArrowButtonEx(str_id, dir, ImVec2(sz, sz), ImGuiButtonFlags_None);
|
|
|
@@ -1176,7 +1176,7 @@ bool ImGui::ImageButtonEx(ImGuiID id, ImTextureRef tex_ref, const ImVec2& image_
|
|
|
|
|
|
// - ImageButton() adds style.FramePadding*2.0f to provided size. This is in order to facilitate fitting an image in a button.
|
|
|
// - ImageButton() draws a background based on regular Button() color + optionally an inner background if specified. (#8165) // FIXME: Maybe that's not the best design?
|
|
|
-bool ImGui::ImageButton(const char* str_id, ImTextureRef tex_ref, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& bg_col, const ImVec4& tint_col)
|
|
|
+bool ImGui::ImageButton(ImStrv str_id, ImTextureRef tex_ref, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& bg_col, const ImVec4& tint_col)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
|
@@ -1208,7 +1208,7 @@ bool ImGui::ImageButton(ImTextureID user_texture_id, const ImVec2& size, const I
|
|
|
*/
|
|
|
#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
|
|
|
-bool ImGui::Checkbox(const char* label, bool* v)
|
|
|
+bool ImGui::Checkbox(ImStrv label, bool* v)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -1284,7 +1284,7 @@ bool ImGui::Checkbox(const char* label, bool* v)
|
|
|
}
|
|
|
|
|
|
template<typename T>
|
|
|
-bool ImGui::CheckboxFlagsT(const char* label, T* flags, T flags_value)
|
|
|
+bool ImGui::CheckboxFlagsT(ImStrv label, T* flags, T flags_value)
|
|
|
{
|
|
|
bool all_on = (*flags & flags_value) == flags_value;
|
|
|
bool any_on = (*flags & flags_value) != 0;
|
|
|
@@ -1310,27 +1310,27 @@ bool ImGui::CheckboxFlagsT(const char* label, T* flags, T flags_value)
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::CheckboxFlags(const char* label, int* flags, int flags_value)
|
|
|
+bool ImGui::CheckboxFlags(ImStrv label, int* flags, int flags_value)
|
|
|
{
|
|
|
return CheckboxFlagsT(label, flags, flags_value);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value)
|
|
|
+bool ImGui::CheckboxFlags(ImStrv label, unsigned int* flags, unsigned int flags_value)
|
|
|
{
|
|
|
return CheckboxFlagsT(label, flags, flags_value);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::CheckboxFlags(const char* label, ImS64* flags, ImS64 flags_value)
|
|
|
+bool ImGui::CheckboxFlags(ImStrv label, ImS64* flags, ImS64 flags_value)
|
|
|
{
|
|
|
return CheckboxFlagsT(label, flags, flags_value);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::CheckboxFlags(const char* label, ImU64* flags, ImU64 flags_value)
|
|
|
+bool ImGui::CheckboxFlags(ImStrv label, ImU64* flags, ImU64 flags_value)
|
|
|
{
|
|
|
return CheckboxFlagsT(label, flags, flags_value);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::RadioButton(const char* label, bool active)
|
|
|
+bool ImGui::RadioButton(ImStrv label, bool active)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -1385,7 +1385,7 @@ bool ImGui::RadioButton(const char* label, bool active)
|
|
|
}
|
|
|
|
|
|
// FIXME: This would work nicely if it was a public template, e.g. 'template<T> RadioButton(const char* label, T* v, T v_button)', but I'm not sure how we would expose it..
|
|
|
-bool ImGui::RadioButton(const char* label, int* v, int v_button)
|
|
|
+bool ImGui::RadioButton(ImStrv label, int* v, int v_button)
|
|
|
{
|
|
|
const bool pressed = RadioButton(label, *v == v_button);
|
|
|
if (pressed)
|
|
|
@@ -1394,7 +1394,7 @@ bool ImGui::RadioButton(const char* label, int* v, int v_button)
|
|
|
}
|
|
|
|
|
|
// size_arg (for each axis) < 0.0f: align to end, 0.0f: auto, > 0.0f: specified size
|
|
|
-void ImGui::ProgressBar(float fraction, const ImVec2& size_arg, const char* overlay)
|
|
|
+void ImGui::ProgressBar(float fraction, const ImVec2& size_arg, ImStrv overlay)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -1480,7 +1480,7 @@ void ImGui::Bullet()
|
|
|
// FIXME-STYLE: we delayed adding as there is a larger plan to revamp the styling system.
|
|
|
// Because of this we currently don't provide many styling options for this widget
|
|
|
// (e.g. hovered/active colors are automatically inferred from a single color).
|
|
|
-bool ImGui::TextLink(const char* label)
|
|
|
+bool ImGui::TextLink(ImStrv label)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -1532,7 +1532,7 @@ bool ImGui::TextLink(const char* label)
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TextLinkOpenURL(const char* label, const char* url)
|
|
|
+bool ImGui::TextLinkOpenURL(ImStrv label, ImStrv url)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
if (url == NULL)
|
|
|
@@ -1745,7 +1745,7 @@ void ImGui::SeparatorTextEx(ImGuiID id, const char* label, const char* label_end
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void ImGui::SeparatorText(const char* label)
|
|
|
+void ImGui::SeparatorText(ImStrv label)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -1895,7 +1895,7 @@ static float CalcMaxPopupHeightFromItemCount(int items_count)
|
|
|
return (g.FontSize + g.Style.ItemSpacing.y) * items_count - g.Style.ItemSpacing.y + (g.Style.WindowPadding.y * 2);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboFlags flags)
|
|
|
+bool ImGui::BeginCombo(ImStrv label, ImStrv preview_value, ImGuiComboFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
@@ -2123,7 +2123,7 @@ static const char* Items_SingleStringGetter(void* data, int idx)
|
|
|
}
|
|
|
|
|
|
// Old API, prefer using BeginCombo() nowadays if you can.
|
|
|
-bool ImGui::Combo(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int popup_max_height_in_items)
|
|
|
+bool ImGui::Combo(ImStrv label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int popup_max_height_in_items)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
|
|
|
@@ -2171,14 +2171,14 @@ bool ImGui::Combo(const char* label, int* current_item, const char* (*getter)(vo
|
|
|
}
|
|
|
|
|
|
// Combo box helper allowing to pass an array of strings.
|
|
|
-bool ImGui::Combo(const char* label, int* current_item, const char* const items[], int items_count, int height_in_items)
|
|
|
+bool ImGui::Combo(ImStrv label, int* current_item, const char* const items[], int items_count, int height_in_items)
|
|
|
{
|
|
|
const bool value_changed = Combo(label, current_item, Items_ArrayGetter, (void*)items, items_count, height_in_items);
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
// Combo box helper allowing to pass all items in a single string literal holding multiple zero-terminated items "item1\0item2\0"
|
|
|
-bool ImGui::Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int height_in_items)
|
|
|
+bool ImGui::Combo(ImStrv label, int* current_item, const char* items_separated_by_zeros, int height_in_items)
|
|
|
{
|
|
|
int items_count = 0;
|
|
|
const char* p = items_separated_by_zeros; // FIXME-OPT: Avoid computing this, or at least only when combo is open
|
|
|
@@ -2666,7 +2666,7 @@ bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v
|
|
|
|
|
|
// Note: p_data, p_min and p_max are _pointers_ to a memory address holding the data. For a Drag widget, p_min and p_max are optional.
|
|
|
// Read code of e.g. DragFloat(), DragInt() etc. or examples in 'Demo->Widgets->Data Types' to understand how to use this function directly.
|
|
|
-bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragScalar(ImStrv label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -2765,7 +2765,7 @@ bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* p_data,
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragScalarN(ImStrv label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -2800,28 +2800,28 @@ bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* p_data
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragFloat(const char* label, float* v, float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragFloat(ImStrv label, float* v, float v_speed, float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalar(label, ImGuiDataType_Float, v, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragFloat2(const char* label, float v[2], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragFloat2(ImStrv label, float v[2], float v_speed, float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalarN(label, ImGuiDataType_Float, v, 2, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragFloat3(const char* label, float v[3], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragFloat3(ImStrv label, float v[3], float v_speed, float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalarN(label, ImGuiDataType_Float, v, 3, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragFloat4(const char* label, float v[4], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragFloat4(ImStrv label, float v[4], float v_speed, float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalarN(label, ImGuiDataType_Float, v, 4, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
// NB: You likely want to specify the ImGuiSliderFlags_AlwaysClamp when using this.
|
|
|
-bool ImGui::DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed, float v_min, float v_max, const char* format, const char* format_max, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragFloatRange2(ImStrv label, float* v_current_min, float* v_current_max, float v_speed, float v_min, float v_max, ImStrv format, ImStrv format_max, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -2854,28 +2854,28 @@ bool ImGui::DragFloatRange2(const char* label, float* v_current_min, float* v_cu
|
|
|
}
|
|
|
|
|
|
// NB: v_speed is float to allow adjusting the drag speed with more precision
|
|
|
-bool ImGui::DragInt(const char* label, int* v, float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragInt(ImStrv label, int* v, float v_speed, int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalar(label, ImGuiDataType_S32, v, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragInt2(const char* label, int v[2], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragInt2(ImStrv label, int v[2], float v_speed, int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalarN(label, ImGuiDataType_S32, v, 2, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragInt3(const char* label, int v[3], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragInt3(ImStrv label, int v[3], float v_speed, int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalarN(label, ImGuiDataType_S32, v, 3, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::DragInt4(const char* label, int v[4], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragInt4(ImStrv label, int v[4], float v_speed, int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return DragScalarN(label, ImGuiDataType_S32, v, 4, v_speed, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
// NB: You likely want to specify the ImGuiSliderFlags_AlwaysClamp when using this.
|
|
|
-bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed, int v_min, int v_max, const char* format, const char* format_max, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::DragIntRange2(ImStrv label, int* v_current_min, int* v_current_max, float v_speed, int v_min, int v_max, ImStrv format, ImStrv format_max, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -3270,7 +3270,7 @@ bool ImGui::SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type
|
|
|
|
|
|
// Note: p_data, p_min and p_max are _pointers_ to a memory address holding the data. For a slider, they are all required.
|
|
|
// Read code of e.g. SliderFloat(), SliderInt() etc. or examples in 'Demo->Widgets->Data Types' to understand how to use this function directly.
|
|
|
-bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderScalar(ImStrv label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -3357,7 +3357,7 @@ bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* p_dat
|
|
|
}
|
|
|
|
|
|
// Add multiple sliders on 1 line for compact edition of multiple components
|
|
|
-bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderScalarN(ImStrv label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -3392,27 +3392,27 @@ bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, i
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderFloat(ImStrv label, float* v, float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalar(label, ImGuiDataType_Float, v, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderFloat2(ImStrv label, float v[2], float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalarN(label, ImGuiDataType_Float, v, 2, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderFloat3(ImStrv label, float v[3], float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalarN(label, ImGuiDataType_Float, v, 3, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderFloat4(ImStrv label, float v[4], float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalarN(label, ImGuiDataType_Float, v, 4, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderAngle(const char* label, float* v_rad, float v_degrees_min, float v_degrees_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderAngle(ImStrv label, float* v_rad, float v_degrees_min, float v_degrees_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
if (format == NULL)
|
|
|
format = "%.0f deg";
|
|
|
@@ -3423,27 +3423,27 @@ bool ImGui::SliderAngle(const char* label, float* v_rad, float v_degrees_min, fl
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderInt(const char* label, int* v, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderInt(ImStrv label, int* v, int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalar(label, ImGuiDataType_S32, v, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderInt2(ImStrv label, int v[2], int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalarN(label, ImGuiDataType_S32, v, 2, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderInt3(ImStrv label, int v[3], int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalarN(label, ImGuiDataType_S32, v, 3, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::SliderInt4(ImStrv label, int v[4], int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return SliderScalarN(label, ImGuiDataType_S32, v, 4, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::VSliderScalar(ImStrv label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -3503,12 +3503,12 @@ bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType d
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::VSliderFloat(ImStrv label, const ImVec2& size, float* v, float v_min, float v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return VSliderScalar(label, size, ImGuiDataType_Float, v, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format, ImGuiSliderFlags flags)
|
|
|
+bool ImGui::VSliderInt(ImStrv label, const ImVec2& size, int* v, int v_min, int v_max, ImStrv format, ImGuiSliderFlags flags)
|
|
|
{
|
|
|
return VSliderScalar(label, size, ImGuiDataType_S32, v, &v_min, &v_max, format, flags);
|
|
|
}
|
|
|
@@ -3663,7 +3663,7 @@ int ImParseFormatPrecision(const char* fmt, int default_precision)
|
|
|
// FIXME: Facilitate using this in variety of other situations.
|
|
|
// FIXME: Among other things, setting ImGuiItemFlags_AllowDuplicateId in LastItemData is currently correct but
|
|
|
// the expected relationship between TempInputXXX functions and LastItemData is a little fishy.
|
|
|
-bool ImGui::TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, int buf_size, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::TempInputText(const ImRect& bb, ImGuiID id, ImStrv label, char* buf, int buf_size, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
// On the first frame, g.TempInputTextId == 0, then on subsequent frames it becomes == id.
|
|
|
// We clear ActiveID on the first frame to allow the InputText() taking it back.
|
|
|
@@ -3687,7 +3687,7 @@ bool ImGui::TempInputText(const ImRect& bb, ImGuiID id, const char* label, char*
|
|
|
// Note that Drag/Slider functions are only forwarding the min/max values clamping values if the ImGuiSliderFlags_AlwaysClamp flag is set!
|
|
|
// This is intended: this way we allow CTRL+Click manual input to set a value out of bounds, for maximum flexibility.
|
|
|
// However this may not be ideal for all uses, as some user code may break on out of bound values.
|
|
|
-bool ImGui::TempInputScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min, const void* p_clamp_max)
|
|
|
+bool ImGui::TempInputScalar(const ImRect& bb, ImGuiID id, ImStrv label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min, const void* p_clamp_max)
|
|
|
{
|
|
|
// FIXME: May need to clarify display behavior if format doesn't contain %.
|
|
|
// "%d" -> "%d" / "There are %d items" -> "%d" / "items" -> "%d" (fallback). Also see #6405
|
|
|
@@ -3738,7 +3738,7 @@ void ImGui::SetNextItemRefVal(ImGuiDataType data_type, void* p_data)
|
|
|
|
|
|
// Note: p_data, p_step, p_step_fast are _pointers_ to a memory address holding the data. For an Input widget, p_step and p_step_fast are optional.
|
|
|
// Read code of e.g. InputFloat(), InputInt() etc. or examples in 'Demo->Widgets->Data Types' to understand how to use this function directly.
|
|
|
-bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_step, const void* p_step_fast, const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputScalar(ImStrv label, ImGuiDataType data_type, void* p_data, const void* p_step, const void* p_step_fast, ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -3822,7 +3822,7 @@ bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* p_data
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_step, const void* p_step_fast, const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputScalarN(ImStrv label, ImGuiDataType data_type, void* p_data, int components, const void* p_step, const void* p_step_fast, ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -3857,49 +3857,49 @@ bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* p_dat
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputFloat(const char* label, float* v, float step, float step_fast, const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputFloat(ImStrv label, float* v, float step, float step_fast, ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalar(label, ImGuiDataType_Float, (void*)v, (void*)(step > 0.0f ? &step : NULL), (void*)(step_fast > 0.0f ? &step_fast : NULL), format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputFloat2(const char* label, float v[2], const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputFloat2(ImStrv label, float v[2], ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalarN(label, ImGuiDataType_Float, v, 2, NULL, NULL, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputFloat3(const char* label, float v[3], const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputFloat3(ImStrv label, float v[3], ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalarN(label, ImGuiDataType_Float, v, 3, NULL, NULL, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputFloat4(const char* label, float v[4], const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputFloat4(ImStrv label, float v[4], ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalarN(label, ImGuiDataType_Float, v, 4, NULL, NULL, format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputInt(const char* label, int* v, int step, int step_fast, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputInt(ImStrv label, int* v, int step, int step_fast, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
// Hexadecimal input provided as a convenience but the flag name is awkward. Typically you'd use InputText() to parse your own data, if you want to handle prefixes.
|
|
|
const char* format = (flags & ImGuiInputTextFlags_CharsHexadecimal) ? "%08X" : "%d";
|
|
|
return InputScalar(label, ImGuiDataType_S32, (void*)v, (void*)(step > 0 ? &step : NULL), (void*)(step_fast > 0 ? &step_fast : NULL), format, flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputInt2(const char* label, int v[2], ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputInt2(ImStrv label, int v[2], ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalarN(label, ImGuiDataType_S32, v, 2, NULL, NULL, "%d", flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputInt3(const char* label, int v[3], ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputInt3(ImStrv label, int v[3], ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalarN(label, ImGuiDataType_S32, v, 3, NULL, NULL, "%d", flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputInt4(const char* label, int v[4], ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputInt4(ImStrv label, int v[4], ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalarN(label, ImGuiDataType_S32, v, 4, NULL, NULL, "%d", flags);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputDouble(const char* label, double* v, double step, double step_fast, const char* format, ImGuiInputTextFlags flags)
|
|
|
+bool ImGui::InputDouble(ImStrv label, double* v, double step, double step_fast, ImStrv format, ImGuiInputTextFlags flags)
|
|
|
{
|
|
|
return InputScalar(label, ImGuiDataType_Double, (void*)v, (void*)(step > 0.0 ? &step : NULL), (void*)(step_fast > 0.0 ? &step_fast : NULL), format, flags);
|
|
|
}
|
|
|
@@ -3920,18 +3920,18 @@ namespace ImStb
|
|
|
#include "imstb_textedit.h"
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
|
|
|
+bool ImGui::InputText(ImStrv label, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
|
|
|
{
|
|
|
IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline)); // call InputTextMultiline()
|
|
|
return InputTextEx(label, NULL, buf, (int)buf_size, ImVec2(0, 0), flags, callback, user_data);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
|
|
|
+bool ImGui::InputTextMultiline(ImStrv label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
|
|
|
{
|
|
|
return InputTextEx(label, NULL, buf, (int)buf_size, size, flags | ImGuiInputTextFlags_Multiline, callback, user_data);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
|
|
|
+bool ImGui::InputTextWithHint(ImStrv label, ImStrv hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)
|
|
|
{
|
|
|
IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline)); // call InputTextMultiline() or InputTextEx() manually if you need multi-line + hint.
|
|
|
return InputTextEx(label, hint, buf, (int)buf_size, ImVec2(0, 0), flags, callback, user_data);
|
|
|
@@ -4615,7 +4615,7 @@ static ImVec2 InputTextLineIndexGetPosOffset(ImGuiContext& g, ImGuiInputTextStat
|
|
|
// - If you want to use ImGui::InputText() with std::string, see misc/cpp/imgui_stdlib.h
|
|
|
// (FIXME: Rather confusing and messy function, among the worse part of our codebase, expecting to rewrite a V2 at some point.. Partly because we are
|
|
|
// doing UTF8 > U16 > UTF8 conversions on the go to easily interface with stb_textedit. Ideally should stay in UTF-8 all the time. See https://github.com/nothings/stb/issues/188)
|
|
|
-bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* callback_user_data)
|
|
|
+bool ImGui::InputTextEx(ImStrv label, ImStrv hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* callback_user_data)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -5651,7 +5651,7 @@ void ImGui::DebugNodeInputTextState(ImGuiInputTextState* state)
|
|
|
// - ColorPickerOptionsPopup() [Internal]
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
|
|
-bool ImGui::ColorEdit3(const char* label, float col[3], ImGuiColorEditFlags flags)
|
|
|
+bool ImGui::ColorEdit3(ImStrv label, float col[3], ImGuiColorEditFlags flags)
|
|
|
{
|
|
|
return ColorEdit4(label, col, flags | ImGuiColorEditFlags_NoAlpha);
|
|
|
}
|
|
|
@@ -5687,7 +5687,7 @@ static void ColorEditRestoreHS(const float* col, float* H, float* S, float* V)
|
|
|
// Edit colors components (each component in 0.0f..1.0f range).
|
|
|
// See enum ImGuiColorEditFlags_ for available options. e.g. Only access 3 floats if ImGuiColorEditFlags_NoAlpha flag is set.
|
|
|
// With typical options: Left-click on color square to open color picker. Right-click to open option menu. CTRL+Click over input fields to edit them and TAB to go to next item.
|
|
|
-bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags)
|
|
|
+bool ImGui::ColorEdit4(ImStrv label, float col[4], ImGuiColorEditFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -5935,7 +5935,7 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
|
|
|
return value_changed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::ColorPicker3(const char* label, float col[3], ImGuiColorEditFlags flags)
|
|
|
+bool ImGui::ColorPicker3(ImStrv label, float col[3], ImGuiColorEditFlags flags)
|
|
|
{
|
|
|
float col4[4] = { col[0], col[1], col[2], 1.0f };
|
|
|
if (!ColorPicker4(label, col4, flags | ImGuiColorEditFlags_NoAlpha))
|
|
|
@@ -5958,7 +5958,7 @@ static void RenderArrowsForVerticalBar(ImDrawList* draw_list, ImVec2 pos, ImVec2
|
|
|
// (In C++ the 'float col[4]' notation for a function argument is equivalent to 'float* col', we only specify a size to facilitate understanding of the code.)
|
|
|
// FIXME: we adjust the big color square height based on item width, which may cause a flickering feedback loop (if automatic height makes a vertical scrollbar appears, affecting automatic width..)
|
|
|
// FIXME: this is trying to be aware of style.Alpha but not fully correct. Also, the color wheel will have overlapping glitches with (style.Alpha < 1.0)
|
|
|
-bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags flags, const float* ref_col)
|
|
|
+bool ImGui::ColorPicker4(ImStrv label, float col[4], ImGuiColorEditFlags flags, const float* ref_col)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
@@ -6331,7 +6331,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
|
|
|
// FIXME: May want to display/ignore the alpha component in the color display? Yet show it in the tooltip.
|
|
|
// 'desc_id' is not called 'label' because we don't display it next to the button, but only in the tooltip.
|
|
|
// Note that 'col' may be encoded in HSV if ImGuiColorEditFlags_InputHSV is set.
|
|
|
-bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags, const ImVec2& size_arg)
|
|
|
+bool ImGui::ColorButton(ImStrv desc_id, const ImVec4& col, ImGuiColorEditFlags flags, const ImVec2& size_arg)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -6434,7 +6434,7 @@ void ImGui::SetColorEditOptions(ImGuiColorEditFlags flags)
|
|
|
}
|
|
|
|
|
|
// Note: only access 3 floats if ImGuiColorEditFlags_NoAlpha flag is set.
|
|
|
-void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags flags)
|
|
|
+void ImGui::ColorTooltip(ImStrv text, const float* col, ImGuiColorEditFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
|
|
|
@@ -6581,7 +6581,7 @@ void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags fl
|
|
|
// - CollapsingHeader()
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
|
|
-bool ImGui::TreeNode(const char* str_id, const char* fmt, ...)
|
|
|
+bool ImGui::TreeNode(ImStrv str_id, const char* fmt, ...)
|
|
|
{
|
|
|
va_list args;
|
|
|
va_start(args, fmt);
|
|
|
@@ -6599,7 +6599,7 @@ bool ImGui::TreeNode(const void* ptr_id, const char* fmt, ...)
|
|
|
return is_open;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TreeNode(const char* label)
|
|
|
+bool ImGui::TreeNode(ImStrv label)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -6608,7 +6608,7 @@ bool ImGui::TreeNode(const char* label)
|
|
|
return TreeNodeBehavior(id, ImGuiTreeNodeFlags_None, label, NULL);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TreeNodeV(const char* str_id, const char* fmt, va_list args)
|
|
|
+bool ImGui::TreeNodeV(ImStrv str_id, const char* fmt, va_list args)
|
|
|
{
|
|
|
return TreeNodeExV(str_id, 0, fmt, args);
|
|
|
}
|
|
|
@@ -6618,7 +6618,7 @@ bool ImGui::TreeNodeV(const void* ptr_id, const char* fmt, va_list args)
|
|
|
return TreeNodeExV(ptr_id, 0, fmt, args);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TreeNodeEx(const char* label, ImGuiTreeNodeFlags flags)
|
|
|
+bool ImGui::TreeNodeEx(ImStrv label, ImGuiTreeNodeFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -6627,7 +6627,7 @@ bool ImGui::TreeNodeEx(const char* label, ImGuiTreeNodeFlags flags)
|
|
|
return TreeNodeBehavior(id, flags, label, NULL);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TreeNodeEx(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, ...)
|
|
|
+bool ImGui::TreeNodeEx(ImStrv str_id, ImGuiTreeNodeFlags flags, const char* fmt, ...)
|
|
|
{
|
|
|
va_list args;
|
|
|
va_start(args, fmt);
|
|
|
@@ -6645,7 +6645,7 @@ bool ImGui::TreeNodeEx(const void* ptr_id, ImGuiTreeNodeFlags flags, const char*
|
|
|
return is_open;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TreeNodeExV(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args)
|
|
|
+bool ImGui::TreeNodeExV(ImStrv str_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -7093,7 +7093,7 @@ void ImGui::TreeNodeDrawLineToTreePop(const ImGuiTreeNodeStackData* data)
|
|
|
TablePopColumnChannel();
|
|
|
}
|
|
|
|
|
|
-void ImGui::TreePush(const char* str_id)
|
|
|
+void ImGui::TreePush(ImStrv str_id)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
Indent();
|
|
|
@@ -7180,7 +7180,7 @@ void ImGui::SetNextItemStorageID(ImGuiID storage_id)
|
|
|
|
|
|
// CollapsingHeader returns true when opened but do not indent nor push into the ID stack (because of the ImGuiTreeNodeFlags_NoTreePushOnOpen flag).
|
|
|
// This is basically the same as calling TreeNodeEx(label, ImGuiTreeNodeFlags_CollapsingHeader). You can remove the _NoTreePushOnOpen flag if you want behavior closer to normal TreeNode().
|
|
|
-bool ImGui::CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags)
|
|
|
+bool ImGui::CollapsingHeader(ImStrv label, ImGuiTreeNodeFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -7193,7 +7193,7 @@ bool ImGui::CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags)
|
|
|
// p_visible != NULL && *p_visible == true : show a small close button on the corner of the header, clicking the button will set *p_visible = false
|
|
|
// p_visible != NULL && *p_visible == false : do not show the header at all
|
|
|
// Do not mistake this with the Open state of the header itself, which you can adjust with SetNextItemOpen() or ImGuiTreeNodeFlags_DefaultOpen.
|
|
|
-bool ImGui::CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFlags flags)
|
|
|
+bool ImGui::CollapsingHeader(ImStrv label, bool* p_visible, ImGuiTreeNodeFlags flags)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -7236,7 +7236,7 @@ bool ImGui::CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFl
|
|
|
// But you need to make sure the ID is unique, e.g. enclose calls in PushID/PopID or use ##unique_id.
|
|
|
// With this scheme, ImGuiSelectableFlags_SpanAllColumns and ImGuiSelectableFlags_AllowOverlap are also frequently used flags.
|
|
|
// FIXME: Selectable() with (size.x == 0.0f) and (SelectableTextAlign.x > 0.0f) followed by SameLine() is currently not supported.
|
|
|
-bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags flags, const ImVec2& size_arg)
|
|
|
+bool ImGui::Selectable(ImStrv label, bool selected, ImGuiSelectableFlags flags, const ImVec2& size_arg)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -7418,7 +7418,7 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
|
|
|
return pressed; //-V1020
|
|
|
}
|
|
|
|
|
|
-bool ImGui::Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags, const ImVec2& size_arg)
|
|
|
+bool ImGui::Selectable(ImStrv label, bool* p_selected, ImGuiSelectableFlags flags, const ImVec2& size_arg)
|
|
|
{
|
|
|
if (Selectable(label, *p_selected, flags, size_arg))
|
|
|
{
|
|
|
@@ -8566,7 +8566,7 @@ void ImGuiSelectionExternalStorage::ApplyRequests(ImGuiMultiSelectIO* ms_io)
|
|
|
// If you don't need a label you can pretty much directly use ImGui::BeginChild() with ImGuiChildFlags_FrameStyle.
|
|
|
// Tip: To have a list filling the entire window width, use size.x = -FLT_MIN and pass an non-visible label e.g. "##empty"
|
|
|
// Tip: If your vertical size is calculated from an item count (e.g. 10 * item_height) consider adding a fractional part to facilitate seeing scrolling boundaries (e.g. 10.5f * item_height).
|
|
|
-bool ImGui::BeginListBox(const char* label, const ImVec2& size_arg)
|
|
|
+bool ImGui::BeginListBox(ImStrv label, const ImVec2& size_arg)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
@@ -8618,7 +8618,7 @@ void ImGui::EndListBox()
|
|
|
EndGroup(); // This is only required to be able to do IsItemXXX query on the whole ListBox including label
|
|
|
}
|
|
|
|
|
|
-bool ImGui::ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_items)
|
|
|
+bool ImGui::ListBox(ImStrv label, int* current_item, const char* const items[], int items_count, int height_items)
|
|
|
{
|
|
|
const bool value_changed = ListBox(label, current_item, Items_ArrayGetter, (void*)items, items_count, height_items);
|
|
|
return value_changed;
|
|
|
@@ -8626,7 +8626,7 @@ bool ImGui::ListBox(const char* label, int* current_item, const char* const item
|
|
|
|
|
|
// This is merely a helper around BeginListBox(), EndListBox().
|
|
|
// Considering using those directly to submit custom data or store selection differently.
|
|
|
-bool ImGui::ListBox(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int height_in_items)
|
|
|
+bool ImGui::ListBox(ImStrv label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int height_in_items)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
|
|
|
@@ -8684,7 +8684,7 @@ bool ImGui::ListBox(const char* label, int* current_item, const char* (*getter)(
|
|
|
// - others https://github.com/ocornut/imgui/wiki/Useful-Extensions
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
|
|
-int ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, const ImVec2& size_arg)
|
|
|
+int ImGui::PlotEx(ImGuiPlotType plot_type, ImStrv label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, ImStrv overlay_text, float scale_min, float scale_max, const ImVec2& size_arg)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
@@ -8815,24 +8815,24 @@ static float Plot_ArrayGetter(void* data, int idx)
|
|
|
return v;
|
|
|
}
|
|
|
|
|
|
-void ImGui::PlotLines(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
|
|
|
+void ImGui::PlotLines(ImStrv label, const float* values, int values_count, int values_offset, ImStrv overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
|
|
|
{
|
|
|
ImGuiPlotArrayGetterData data(values, stride);
|
|
|
PlotEx(ImGuiPlotType_Lines, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
|
|
|
}
|
|
|
|
|
|
-void ImGui::PlotLines(const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size)
|
|
|
+void ImGui::PlotLines(ImStrv label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, ImStrv overlay_text, float scale_min, float scale_max, ImVec2 graph_size)
|
|
|
{
|
|
|
PlotEx(ImGuiPlotType_Lines, label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
|
|
|
}
|
|
|
|
|
|
-void ImGui::PlotHistogram(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
|
|
|
+void ImGui::PlotHistogram(ImStrv label, const float* values, int values_count, int values_offset, ImStrv overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
|
|
|
{
|
|
|
ImGuiPlotArrayGetterData data(values, stride);
|
|
|
PlotEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
|
|
|
}
|
|
|
|
|
|
-void ImGui::PlotHistogram(const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size)
|
|
|
+void ImGui::PlotHistogram(ImStrv label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, ImStrv overlay_text, float scale_min, float scale_max, ImVec2 graph_size)
|
|
|
{
|
|
|
PlotEx(ImGuiPlotType_Histogram, label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
|
|
|
}
|
|
|
@@ -8844,22 +8844,22 @@ void ImGui::PlotHistogram(const char* label, float (*values_getter)(void* data,
|
|
|
// - Value()
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
|
|
-void ImGui::Value(const char* prefix, bool b)
|
|
|
+void ImGui::Value(ImStrv prefix, bool b)
|
|
|
{
|
|
|
Text("%s: %s", prefix, (b ? "true" : "false"));
|
|
|
}
|
|
|
|
|
|
-void ImGui::Value(const char* prefix, int v)
|
|
|
+void ImGui::Value(ImStrv prefix, int v)
|
|
|
{
|
|
|
Text("%s: %d", prefix, v);
|
|
|
}
|
|
|
|
|
|
-void ImGui::Value(const char* prefix, unsigned int v)
|
|
|
+void ImGui::Value(ImStrv prefix, unsigned int v)
|
|
|
{
|
|
|
Text("%s: %d", prefix, v);
|
|
|
}
|
|
|
|
|
|
-void ImGui::Value(const char* prefix, float v, const char* float_format)
|
|
|
+void ImGui::Value(ImStrv prefix, float v, ImStrv float_format)
|
|
|
{
|
|
|
if (float_format)
|
|
|
{
|
|
|
@@ -9022,7 +9022,7 @@ void ImGui::EndMenuBar()
|
|
|
// Important: calling order matters!
|
|
|
// FIXME: Somehow overlapping with docking tech.
|
|
|
// FIXME: The "rect-cut" aspect of this could be formalized into a lower-level helper (rect-cut: https://halt.software/dead-simple-layouts)
|
|
|
-bool ImGui::BeginViewportSideBar(const char* name, ImGuiViewport* viewport_p, ImGuiDir dir, float axis_size, ImGuiWindowFlags window_flags)
|
|
|
+bool ImGui::BeginViewportSideBar(ImStrv name, ImGuiViewport* viewport_p, ImGuiDir dir, float axis_size, ImGuiWindowFlags window_flags)
|
|
|
{
|
|
|
IM_ASSERT(dir != ImGuiDir_None);
|
|
|
|
|
|
@@ -9126,7 +9126,7 @@ static bool IsRootOfOpenMenuSet()
|
|
|
return upper_popup->Window && (upper_popup->Window->Flags & ImGuiWindowFlags_ChildMenu) && ImGui::IsWindowChildOf(upper_popup->Window, window, true);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::BeginMenuEx(const char* label, const char* icon, bool enabled)
|
|
|
+bool ImGui::BeginMenuEx(ImStrv label, ImStrv icon, bool enabled)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -9338,7 +9338,7 @@ bool ImGui::BeginMenuEx(const char* label, const char* icon, bool enabled)
|
|
|
return menu_is_open;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::BeginMenu(const char* label, bool enabled)
|
|
|
+bool ImGui::BeginMenu(ImStrv label, bool enabled)
|
|
|
{
|
|
|
return BeginMenuEx(label, NULL, enabled);
|
|
|
}
|
|
|
@@ -9361,7 +9361,7 @@ void ImGui::EndMenu()
|
|
|
EndPopup();
|
|
|
}
|
|
|
|
|
|
-bool ImGui::MenuItemEx(const char* label, const char* icon, const char* shortcut, bool selected, bool enabled)
|
|
|
+bool ImGui::MenuItemEx(ImStrv label, ImStrv icon, ImStrv shortcut, bool selected, bool enabled)
|
|
|
{
|
|
|
ImGuiWindow* window = GetCurrentWindow();
|
|
|
if (window->SkipItems)
|
|
|
@@ -9438,12 +9438,12 @@ bool ImGui::MenuItemEx(const char* label, const char* icon, const char* shortcut
|
|
|
return pressed;
|
|
|
}
|
|
|
|
|
|
-bool ImGui::MenuItem(const char* label, const char* shortcut, bool selected, bool enabled)
|
|
|
+bool ImGui::MenuItem(ImStrv label, ImStrv shortcut, bool selected, bool enabled)
|
|
|
{
|
|
|
return MenuItemEx(label, NULL, shortcut, selected, enabled);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::MenuItem(const char* label, const char* shortcut, bool* p_selected, bool enabled)
|
|
|
+bool ImGui::MenuItem(ImStrv label, ImStrv shortcut, bool* p_selected, bool enabled)
|
|
|
{
|
|
|
if (MenuItemEx(label, NULL, shortcut, p_selected ? *p_selected : false, enabled))
|
|
|
{
|
|
|
@@ -9492,7 +9492,7 @@ struct ImGuiTabBarSection
|
|
|
namespace ImGui
|
|
|
{
|
|
|
static void TabBarLayout(ImGuiTabBar* tab_bar);
|
|
|
- static ImU32 TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label, ImGuiWindow* docked_window);
|
|
|
+ static ImU32 TabBarCalcTabID(ImGuiTabBar* tab_bar, ImStrv label, ImGuiWindow* docked_window);
|
|
|
static float TabBarCalcMaxTabWidth();
|
|
|
static float TabBarScrollClamp(ImGuiTabBar* tab_bar, float scrolling);
|
|
|
static void TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiID tab_id, ImGuiTabBarSection* sections);
|
|
|
@@ -9557,7 +9557,7 @@ void ImGui::TabBarRemove(ImGuiTabBar* tab_bar)
|
|
|
g.TabBars.Remove(tab_bar->ID, tab_bar);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::BeginTabBar(const char* str_id, ImGuiTabBarFlags flags)
|
|
|
+bool ImGui::BeginTabBar(ImStrv str_id, ImGuiTabBarFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
|
@@ -9948,7 +9948,7 @@ static void ImGui::TabBarLayout(ImGuiTabBar* tab_bar)
|
|
|
}
|
|
|
|
|
|
// Dockable windows uses Name/ID in the global namespace. Non-dockable items use the ID stack.
|
|
|
-static ImU32 ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label, ImGuiWindow* docked_window)
|
|
|
+static ImU32 ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, ImStrv label, ImGuiWindow* docked_window)
|
|
|
{
|
|
|
IM_ASSERT(docked_window == NULL); // master branch only
|
|
|
IM_UNUSED(docked_window);
|
|
|
@@ -10279,7 +10279,7 @@ static ImGuiTabItem* ImGui::TabBarTabListPopupButton(ImGuiTabBar* tab_bar)
|
|
|
// - TabItemLabelAndCloseButton() [Internal]
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
|
|
-bool ImGui::BeginTabItem(const char* label, bool* p_open, ImGuiTabItemFlags flags)
|
|
|
+bool ImGui::BeginTabItem(ImStrv label, bool* p_open, ImGuiTabItemFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
|
@@ -10322,7 +10322,7 @@ void ImGui::EndTabItem()
|
|
|
PopID();
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TabItemButton(const char* label, ImGuiTabItemFlags flags)
|
|
|
+bool ImGui::TabItemButton(ImStrv label, ImGuiTabItemFlags flags)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
|
@@ -10338,7 +10338,7 @@ bool ImGui::TabItemButton(const char* label, ImGuiTabItemFlags flags)
|
|
|
return TabItemEx(tab_bar, label, NULL, flags | ImGuiTabItemFlags_Button | ImGuiTabItemFlags_NoReorder, NULL);
|
|
|
}
|
|
|
|
|
|
-void ImGui::TabItemSpacing(const char* str_id, ImGuiTabItemFlags flags, float width)
|
|
|
+void ImGui::TabItemSpacing(ImStrv str_id, ImGuiTabItemFlags flags, float width)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
|
@@ -10355,7 +10355,7 @@ void ImGui::TabItemSpacing(const char* str_id, ImGuiTabItemFlags flags, float
|
|
|
TabItemEx(tab_bar, str_id, NULL, flags | ImGuiTabItemFlags_Button | ImGuiTabItemFlags_NoReorder | ImGuiTabItemFlags_Invisible, NULL);
|
|
|
}
|
|
|
|
|
|
-bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags, ImGuiWindow* docked_window)
|
|
|
+bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, ImStrv label, bool* p_open, ImGuiTabItemFlags flags, ImGuiWindow* docked_window)
|
|
|
{
|
|
|
// Layout whole tab bar if not already done
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
@@ -10605,7 +10605,7 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open,
|
|
|
// [Public] This is call is 100% optional but it allows to remove some one-frame glitches when a tab has been unexpectedly removed.
|
|
|
// To use it to need to call the function SetTabItemClosed() between BeginTabBar() and EndTabBar().
|
|
|
// Tabs closed by the close button will automatically be flagged to avoid this issue.
|
|
|
-void ImGui::SetTabItemClosed(const char* label)
|
|
|
+void ImGui::SetTabItemClosed(ImStrv label)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
bool is_within_manual_tab_bar = g.CurrentTabBar && !(g.CurrentTabBar->Flags & ImGuiTabBarFlags_DockNode);
|
|
|
@@ -10618,7 +10618,7 @@ void ImGui::SetTabItemClosed(const char* label)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-ImVec2 ImGui::TabItemCalcSize(const char* label, bool has_close_button_or_unsaved_marker)
|
|
|
+ImVec2 ImGui::TabItemCalcSize(ImStrv label, bool has_close_button_or_unsaved_marker)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImVec2 label_size = CalcTextSize(label, NULL, true);
|
|
|
@@ -10663,7 +10663,7 @@ void ImGui::TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabI
|
|
|
|
|
|
// Render text label (with custom clipping) + Unsaved Document marker + Close Button logic
|
|
|
// We tend to lock style.FramePadding for a given tab-bar, hence the 'frame_padding' parameter.
|
|
|
-void ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id, bool is_contents_visible, bool* out_just_closed, bool* out_text_clipped)
|
|
|
+void ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, ImStrv label, ImGuiID tab_id, ImGuiID close_button_id, bool is_contents_visible, bool* out_just_closed, bool* out_text_clipped)
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImVec2 label_size = CalcTextSize(label, NULL, true);
|
|
|
@@ -10762,5 +10762,4 @@ void ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb,
|
|
|
*out_just_closed = close_button_pressed;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
#endif // #ifndef IMGUI_DISABLE
|
Rokas Kupstys